start merging R_0.8.6.1 (jtag load bug fix)

This commit is contained in:
Markus Fröschle
2014-12-26 09:07:22 +00:00
parent dce24ff7c7
commit 732956830f
2 changed files with 188 additions and 188 deletions

View File

@@ -261,8 +261,6 @@ tos/jtagwait/include/MCF5475_USB.h
tos/jtagwait/include/MCF5475_XLB.h tos/jtagwait/include/MCF5475_XLB.h
tos/jtagwait/include/MCF5475.h tos/jtagwait/include/MCF5475.h
tos/jtagwait/include/driver_vec.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/jtagwait/sources/printf_helper.S
tos/bascook/Makefile tos/bascook/Makefile
tos/bascook/sources/bascook.c tos/bascook/sources/bascook.c
@@ -271,3 +269,5 @@ usb/usb_hub.c
include/usb_hub.h include/usb_hub.h
tos/Makefile tos/Makefile
usb/usb_kbd.c usb/usb_kbd.c
tos/jtagwait/sources/bas_printf.c
tos/jtagwait/sources/bas_string.c

View File

@@ -38,7 +38,7 @@ enum driver_type
VIDEO_DRIVER, VIDEO_DRIVER,
PCI_DRIVER, PCI_DRIVER,
MMU_DRIVER, MMU_DRIVER,
END_OF_DRIVERS, /* marks end of driver list */ END_OF_DRIVERS = 0xffffffff, /* marks end of driver list */
}; };
struct generic_driver_interface struct generic_driver_interface