aboutsummaryrefslogtreecommitdiff
path: root/demo_functionality.c
diff options
context:
space:
mode:
authorvetch <vetch97@gmail.com>2019-12-17 17:16:40 +0100
committervetch <vetch97@gmail.com>2019-12-17 17:16:40 +0100
commit5cb10bcc7d0c6d4159103f05ba228a09ca365fac (patch)
treed248f2a519e7b2b4707b6889a971165c75c4af48 /demo_functionality.c
parent90d208f074626521118984902ca8d3ebfd17e62f (diff)
parent7dbdf1ee0a064e9b2c5fedd7bd4e2b67f0532b09 (diff)
downloadrpi-MMU-example-5cb10bcc7d0c6d4159103f05ba228a09ca365fac.tar.gz
rpi-MMU-example-5cb10bcc7d0c6d4159103f05ba228a09ca365fac.zip
Merge branch 'bob' of https://repo.or.cz/RPi-MMU-example into alice
# Conflicts: # kernel.c
Diffstat (limited to 'demo_functionality.c')
-rw-r--r--demo_functionality.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/demo_functionality.c b/demo_functionality.c
index d4b86db..691cdb1 100644
--- a/demo_functionality.c
+++ b/demo_functionality.c
@@ -25,11 +25,11 @@ void demo_paging_support(void)
uart_puts(paging);
}
-void demo_mode_to_system(void)
+void demo_current_mode(void)
{
// get content of current program status register to check the current
- // processor mode
+ // processor mode (should be system, as we set it in boot.S)
PSR_t CPSR = read_CPSR();
char *mode_name;
@@ -50,9 +50,6 @@ void demo_mode_to_system(void)
uart_puts("current mode: ");
uart_puts(mode_name);
-
- uart_puts("setting mode to system (PL1)...\r\n");
- set_system_mode();
}
extern char