[tuxdroid-svn] r1178 - firmware/fuxusb/trunk/src

[Paul_R <c2m...@c2...>]

Author: Paul_R
Date: 2008-05-20 14:25:48 +0200 (Tue, 20 May 2008)
New Revision: 1178

Modified:
   firmware/fuxusb/trunk/src/global.h
   firmware/fuxusb/trunk/src/misc.c
   firmware/fuxusb/trunk/src/misc.h
   firmware/fuxusb/trunk/src/usb_commands.c
Log:
* Removed the wait_reset function, and replace it by a define in global.h


Modified: firmware/fuxusb/trunk/src/global.h
===================================================================
--- firmware/fuxusb/trunk/src/global.h	2008-05-20 10:07:01 UTC (rev 1177)
+++ firmware/fuxusb/trunk/src/global.h	2008-05-20 12:25:48 UTC (rev 1178)
@@ -168,4 +168,11 @@
 extern code revision_t  info_revision;
 extern code author_t    info_author;
 
+
+#define wait_reset() \
+{\
+WDTRST = 0x1E; \
+WDTRST = 0xE1; \
+while(1); \
+}
 #endif // _GLOBAL_H_

Modified: firmware/fuxusb/trunk/src/misc.c
===================================================================
--- firmware/fuxusb/trunk/src/misc.c	2008-05-20 10:07:01 UTC (rev 1177)
+++ firmware/fuxusb/trunk/src/misc.c	2008-05-20 12:25:48 UTC (rev 1178)
@@ -66,17 +66,3 @@
             usb_sof_counter = 0;
    }
 }
-
-
-/**
- * \brief Reset the dongle.
- * This function configure the watchdog timer and wait the timer OVF.
- * \ingroup misc
- */
-void wait_reset(void)
-{
-    /* Configure watchdog reset */
-    WDTRST = 0x1E; 
-    WDTRST = 0xE1;
-    while(1);
-}

Modified: firmware/fuxusb/trunk/src/misc.h
===================================================================
--- firmware/fuxusb/trunk/src/misc.h	2008-05-20 10:07:01 UTC (rev 1177)
+++ firmware/fuxusb/trunk/src/misc.h	2008-05-20 12:25:48 UTC (rev 1178)
@@ -29,6 +29,5 @@
 
 
 void led_behavior(void);
-void wait_reset(void);
 
 #endif // _MISC_H_

Modified: firmware/fuxusb/trunk/src/usb_commands.c
===================================================================
--- firmware/fuxusb/trunk/src/usb_commands.c	2008-05-20 10:07:01 UTC (rev 1177)
+++ firmware/fuxusb/trunk/src/usb_commands.c	2008-05-20 12:25:48 UTC (rev 1178)
@@ -32,7 +32,6 @@
 #include "spi_task.h"
 #include "bootloader.h"
 #include "fifo_stt.h"
-#include "misc.h"
 #include "rf.h"
 #include "lib_mcu\fa-usb\flash_api.h" 
 #include "lib_mcu\usb\usb_drv.h"