From bedb87c1e7cc9741c57c299d81d6e24c5e9c59c5 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Sat, 2 Jan 2010 13:35:55 +0000
Subject: git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@1495
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 demos/GNU-Linux-GCC/main.c  | 16 ++++++++--------
 demos/Win32-MinGW/halconf.h |  2 +-
 demos/Win32-MinGW/main.c    | 16 ++++++++--------
 3 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'demos')

diff --git a/demos/GNU-Linux-GCC/main.c b/demos/GNU-Linux-GCC/main.c
index 4153b219a..113b94de6 100644
--- a/demos/GNU-Linux-GCC/main.c
+++ b/demos/GNU-Linux-GCC/main.c
@@ -96,7 +96,7 @@ static void termination_handler(eventid_t id) {
     chThdSleepMilliseconds(10);
     cputs("Init: shell on SD1 terminated");
     chSysLock();
-    chOQResetI(&SD1.d2.oqueue);
+    chOQResetI(&SD1.sd.oqueue);
     chSysUnlock();
   }
   if (shelltp2 && chThdTerminated(shelltp2)) {
@@ -105,7 +105,7 @@ static void termination_handler(eventid_t id) {
     chThdSleepMilliseconds(10);
     cputs("Init: shell on SD2 terminated");
     chSysLock();
-    chOQResetI(&SD2.d2.oqueue);
+    chOQResetI(&SD2.sd.oqueue);
     chSysUnlock();
   }
 }
@@ -128,7 +128,7 @@ static void sd1_handler(eventid_t id) {
   if (flags & SD_DISCONNECTED) {
     cputs("Init: disconnection on SD1");
     chSysLock();
-    chIQResetI(&SD1.d2.iqueue);
+    chIQResetI(&SD1.sd.iqueue);
     chSysUnlock();
   }
 }
@@ -151,7 +151,7 @@ static void sd2_handler(eventid_t id) {
   if (flags & SD_DISCONNECTED) {
     cputs("Init: disconnection on SD2");
     chSysLock();
-    chIQResetI(&SD2.d2.iqueue);
+    chIQResetI(&SD2.sd.iqueue);
     chSysUnlock();
   }
 }
@@ -202,10 +202,10 @@ int main(void) {
   cputs("Shell service started on SD1, SD2");
   cputs("  - Listening for connections on SD1");
   (void) sdGetAndClearFlags(&SD1);
-  chEvtRegister(&SD1.d2.sevent, &sd1fel, 1);
+  chEvtRegister(&SD1.sd.sevent, &sd1fel, 1);
   cputs("  - Listening for connections on SD2");
   (void) sdGetAndClearFlags(&SD2);
-  chEvtRegister(&SD2.d2.sevent, &sd2fel, 2);
+  chEvtRegister(&SD2.sd.sevent, &sd2fel, 2);
 
   /*
    * Events servicing loop.
@@ -216,7 +216,7 @@ int main(void) {
   /*
    * Clean simulator exit.
    */
-  chEvtUnregister(&SD1.d2.sevent, &sd1fel);
-  chEvtUnregister(&SD2.d2.sevent, &sd2fel);
+  chEvtUnregister(&SD1.sd.sevent, &sd1fel);
+  chEvtUnregister(&SD2.sd.sevent, &sd2fel);
   return 0;
 }
diff --git a/demos/Win32-MinGW/halconf.h b/demos/Win32-MinGW/halconf.h
index 58d49966f..f80ceafb0 100644
--- a/demos/Win32-MinGW/halconf.h
+++ b/demos/Win32-MinGW/halconf.h
@@ -38,7 +38,7 @@
  * settings file. This file can be used to include platform specific
  * header files or to override the low level drivers settings.
  */
-#include "mcuconf.h"
+/*#include "mcuconf.h"*/
 
 /*===========================================================================*/
 /* PAL driver related settings.                                              */
diff --git a/demos/Win32-MinGW/main.c b/demos/Win32-MinGW/main.c
index 009ec4a89..8acfda91d 100644
--- a/demos/Win32-MinGW/main.c
+++ b/demos/Win32-MinGW/main.c
@@ -94,7 +94,7 @@ static void termination_handler(eventid_t id) {
     chThdSleepMilliseconds(10);
     cputs("Init: shell on SD1 terminated");
     chSysLock();
-    chOQResetI(&SD1.d2.oqueue);
+    chOQResetI(&SD1.sd.oqueue);
     chSysUnlock();
   }
   if (shelltp2 && chThdTerminated(shelltp2)) {
@@ -103,7 +103,7 @@ static void termination_handler(eventid_t id) {
     chThdSleepMilliseconds(10);
     cputs("Init: shell on SD2 terminated");
     chSysLock();
-    chOQResetI(&SD2.d2.oqueue);
+    chOQResetI(&SD2.sd.oqueue);
     chSysUnlock();
   }
 }
@@ -125,7 +125,7 @@ static void sd1_handler(eventid_t id) {
   if (flags & SD_DISCONNECTED) {
     cputs("Init: disconnection on SD1");
     chSysLock();
-    chIQResetI(&SD1.d2.iqueue);
+    chIQResetI(&SD1.sd.iqueue);
     chSysUnlock();
   }
 }
@@ -147,7 +147,7 @@ static void sd2_handler(eventid_t id) {
   if (flags & SD_DISCONNECTED) {
     cputs("Init: disconnection on SD2");
     chSysLock();
-    chIQResetI(&SD2.d2.iqueue);
+    chIQResetI(&SD2.sd.iqueue);
     chSysUnlock();
   }
 }
@@ -198,10 +198,10 @@ int main(void) {
   cputs("Shell service started on SD1, SD2");
   cputs("  - Listening for connections on SD1");
   (void) sdGetAndClearFlags(&SD1);
-  chEvtRegister(&SD1.d2.sevent, &sd1fel, 1);
+  chEvtRegister(&SD1.sd.sevent, &sd1fel, 1);
   cputs("  - Listening for connections on SD2");
   (void) sdGetAndClearFlags(&SD2);
-  chEvtRegister(&SD2.d2.sevent, &sd2fel, 2);
+  chEvtRegister(&SD2.sd.sevent, &sd2fel, 2);
 
   /*
    * Events servicing loop.
@@ -212,7 +212,7 @@ int main(void) {
   /*
    * Clean simulator exit.
    */
-  chEvtUnregister(&SD1.d2.sevent, &sd1fel);
-  chEvtUnregister(&SD2.d2.sevent, &sd2fel);
+  chEvtUnregister(&SD1.sd.sevent, &sd1fel);
+  chEvtUnregister(&SD2.sd.sevent, &sd2fel);
   return 0;
 }
-- 
cgit v1.2.3