From 50a7139bbebc1df8600a82e82ad0502f8c8265fc Mon Sep 17 00:00:00 2001 From: Per <Per Lindgren> Date: Tue, 28 Feb 2017 16:26:51 +0000 Subject: [PATCH] bugfix --- README.md | 2 +- d7020e_srp Debug oldgdb.launch | 2 +- src/main.c | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 5ef8f60..521b0de 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # SRP lab in d7020e - +--- ## Install Open terminal diff --git a/d7020e_srp Debug oldgdb.launch b/d7020e_srp Debug oldgdb.launch index d4f762d..e3c351b 100644 --- a/d7020e_srp Debug oldgdb.launch +++ b/d7020e_srp Debug oldgdb.launch @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8" standalone="no"?> <launchConfiguration type="ilg.gnuarmeclipse.debug.gdbjtag.openocd.launchConfigurationType"> -<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.PERIPHERALS" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <peripherals/> "/> +<stringAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.PERIPHERALS" value="<?xml version="1.0" encoding="UTF-8" standalone="no"?> <peripherals> <peripheral name="SYSCFG"/> </peripherals> "/> <booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.doContinue" value="true"/> <booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.doDebugInRam" value="false"/> <booleanAttribute key="ilg.gnuarmeclipse.debug.gdbjtag.openocd.doFirstReset" value="true"/> diff --git a/src/main.c b/src/main.c index be522ca..2ea8db6 100644 --- a/src/main.c +++ b/src/main.c @@ -69,9 +69,9 @@ TASK(j2) { /* enable in assignment c TASK(j3) { trace_printf("j3_enter\n"); - LOCK(r1); - trace_printf("j3_r1_locked\n"); - UNLOCK(r1); + LOCK(r2); + trace_printf("j3_r2_locked\n"); + UNLOCK(r2); JOB_REQUEST(j1); trace_printf("j3_exit\n"); } @@ -123,9 +123,9 @@ add a third task at priority 3 TASK(j3) { trace_printf("j3_enter\n"); - LOCK(r1); - trace_printf("j3_r1_locked\n"); - UNLOCK(r1); + LOCK(r2); + trace_printf("j3_r2_locked\n"); + UNLOCK(r2); JOB_REQUEST(j1); trace_printf("j3_exit\n"); } -- GitLab