start merging R_0.8.6.1 (jtag load bug fix)

2014-12-26 09:07:22 +00:00
parent dce24ff7c7
commit 732956830f
2 changed files with 188 additions and 188 deletions
--- a/BaS_gcc.files
+++ b/BaS_gcc.files
@@ -261,8 +261,6 @@ tos/jtagwait/include/MCF5475_USB.h
 tos/jtagwait/include/MCF5475_XLB.h
 tos/jtagwait/include/MCF5475.h
 tos/jtagwait/include/driver_vec.h
-tos/jtagwait/sources/bas_printf.c
-tos/jtagwait/sources/bas_string.c
 tos/jtagwait/sources/printf_helper.S
 tos/bascook/Makefile
 tos/bascook/sources/bascook.c
@@ -271,3 +269,5 @@ usb/usb_hub.c
 include/usb_hub.h
 tos/Makefile
 usb/usb_kbd.c
+tos/jtagwait/sources/bas_printf.c
+tos/jtagwait/sources/bas_string.c
--- a/include/driver_vec.h
+++ b/include/driver_vec.h
@@ -38,7 +38,7 @@ enum driver_type
        VIDEO_DRIVER,
        PCI_DRIVER,
        MMU_DRIVER,
-	END_OF_DRIVERS,		/* marks end of driver list */
+        END_OF_DRIVERS = 0xffffffff,		/* marks end of driver list */
 };

 struct generic_driver_interface