From c0b3c5e8b247737cb0009143a99014cc580b51bf Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sat, 14 Sep 2013 10:00:36 +0000
Subject: git-svn-id:
 svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6304
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 demos/rt/RT-STM32F407-DISCOVERY-MEMS/Makefile |  6 +++++-
 demos/rt/RT-STM32F407-DISCOVERY-MEMS/main.c   | 17 +++++++++--------
 demos/rt/RT-STM32F407-DISCOVERY-MEMS/usbcfg.c |  4 ++--
 3 files changed, 16 insertions(+), 11 deletions(-)

(limited to 'demos/rt')

diff --git a/demos/rt/RT-STM32F407-DISCOVERY-MEMS/Makefile b/demos/rt/RT-STM32F407-DISCOVERY-MEMS/Makefile
index 6d6c54232..6a1e61aa3 100644
--- a/demos/rt/RT-STM32F407-DISCOVERY-MEMS/Makefile
+++ b/demos/rt/RT-STM32F407-DISCOVERY-MEMS/Makefile
@@ -96,7 +96,10 @@ CSRC = $(PORTSRC) \
        $(OSALSRC) \
        $(PLATFORMSRC) \
        $(BOARDSRC) \
-       main.c
+       $(CHIBIOS)/os/various/devices_lib/accel/lis302dl.c \
+       $(CHIBIOS)/os/various/shell.c \
+       $(CHIBIOS)/os/various/chprintf.c \
+       usbcfg.c main.c
 
 # C++ sources that can be compiled in ARM or THUMB mode depending on the global
 # setting.
@@ -127,6 +130,7 @@ ASMSRC = $(PORTASM)
 
 INCDIR = $(PORTINC) $(KERNINC) $(TESTINC) \
          $(HALINC) $(OSALINC) $(PLATFORMINC) $(BOARDINC) \
+         $(CHIBIOS)/os/various/devices_lib/accel \
          $(CHIBIOS)/os/various
 
 #
diff --git a/demos/rt/RT-STM32F407-DISCOVERY-MEMS/main.c b/demos/rt/RT-STM32F407-DISCOVERY-MEMS/main.c
index c71f2f1ee..f3f6a0e86 100644
--- a/demos/rt/RT-STM32F407-DISCOVERY-MEMS/main.c
+++ b/demos/rt/RT-STM32F407-DISCOVERY-MEMS/main.c
@@ -31,8 +31,8 @@ SerialUSBDriver SDU1;
 /* Command line related.                                                     */
 /*===========================================================================*/
 
-#define SHELL_WA_SIZE   THD_WA_SIZE(2048)
-#define TEST_WA_SIZE    THD_WA_SIZE(256)
+#define SHELL_WA_SIZE   THD_WORKING_AREA_SIZE(2048)
+#define TEST_WA_SIZE    THD_WORKING_AREA_SIZE(256)
 
 static void cmd_mem(BaseSequentialStream *chp, int argc, char *argv[]) {
   size_t n, size;
@@ -49,7 +49,7 @@ static void cmd_mem(BaseSequentialStream *chp, int argc, char *argv[]) {
 }
 
 static void cmd_threads(BaseSequentialStream *chp, int argc, char *argv[]) {
-  static const char *states[] = {CH_THD_STATE_NAMES};
+  static const char *states[] = {CH_STATE_NAMES};
   thread_t *tp;
 
   (void)argv;
@@ -62,7 +62,8 @@ static void cmd_threads(BaseSequentialStream *chp, int argc, char *argv[]) {
   do {
     chprintf(chp, "%.8lx %.8lx %4lu %4lu %9s\r\n",
              (uint32_t)tp, (uint32_t)tp->p_ctx.r13,
-             (uint32_t)tp->p_prio, (uint32_t)(tp->p_refs - 1));
+             (uint32_t)tp->p_prio, (uint32_t)(tp->p_refs - 1),
+             states[tp->p_state]);
     tp = chRegNextThread(tp);
   } while (tp != NULL);
 }
@@ -150,8 +151,8 @@ static const SPIConfig spi2cfg = {
  * This is a periodic thread that reads accelerometer and outputs
  * result to SPI2 and PWM.
  */
-static WORKING_AREA(waThread1, 128);
-static msg_t Thread1(void *arg) {
+static THD_WORKING_AREA(waThread1, 128);
+static THD_FUNCTION(Thread1, arg) {
   static int8_t xbuf[4], ybuf[4];   /* Last accelerometer data.*/
   systime_t time;                   /* Next deadline.*/
 
@@ -164,7 +165,7 @@ static msg_t Thread1(void *arg) {
   lis302dlWriteRegister(&SPID1, LIS302DL_CTRL_REG3, 0x00);
 
   /* Reader thread loop.*/
-  time = chTimeNow();
+  time = chVTGetSystemTime();
   while (TRUE) {
     int32_t x, y;
     unsigned i;
@@ -314,7 +315,7 @@ int main(void) {
     }
     else {
       /* If the previous shell exited.*/
-      if (chThdTerminated(shelltp)) {
+      if (chThdTerminatedX(shelltp)) {
         /* Recovers memory of the previous shell.*/
         chThdRelease(shelltp);
         shelltp = NULL;
diff --git a/demos/rt/RT-STM32F407-DISCOVERY-MEMS/usbcfg.c b/demos/rt/RT-STM32F407-DISCOVERY-MEMS/usbcfg.c
index 24955b881..cc943edd2 100644
--- a/demos/rt/RT-STM32F407-DISCOVERY-MEMS/usbcfg.c
+++ b/demos/rt/RT-STM32F407-DISCOVERY-MEMS/usbcfg.c
@@ -270,7 +270,7 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
   case USB_EVENT_ADDRESS:
     return;
   case USB_EVENT_CONFIGURED:
-    chSysLockFromIsr();
+    chSysLockFromISR();
 
     /* Enables the endpoints specified into the configuration.
        Note, this callback is invoked from an ISR so I-Class functions
@@ -281,7 +281,7 @@ static void usb_event(USBDriver *usbp, usbevent_t event) {
     /* Resetting the state of the CDC subsystem.*/
     sduConfigureHookI(&SDU1);
 
-    chSysUnlockFromIsr();
+    chSysUnlockFromISR();
     return;
   case USB_EVENT_SUSPEND:
     return;
-- 
cgit v1.2.3