From 384f8e80fa55b1a704674a4ee19192328ec90abe Mon Sep 17 00:00:00 2001 From: Zach Eveland Date: Thu, 8 Sep 2011 09:12:30 -0400 Subject: removed all bootloader mass storage and MSC references --- bootloaders/diskloader/src/DiskLoader.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'bootloaders/diskloader/src/DiskLoader.cpp') diff --git a/bootloaders/diskloader/src/DiskLoader.cpp b/bootloaders/diskloader/src/DiskLoader.cpp index 9ecbc4b..34a9c94 100644 --- a/bootloaders/diskloader/src/DiskLoader.cpp +++ b/bootloaders/diskloader/src/DiskLoader.cpp @@ -112,8 +112,6 @@ const u8 _consts[] = void USBInit(void); -extern u8 _sector3[512]; - int main(void) __attribute__ ((naked)); // STK500v1 main loop, very similar to optiboot in protocol and implementation @@ -125,16 +123,12 @@ int main() BOARD_INIT(); USBInit(); -#ifdef WRITABLE_DIRECTORY - _sector3[0] = 0; -#endif - _inSync = STK_INSYNC; _ok = STK_OK; -#ifndef MSC_ENABLED + if (pgm_read_word(0) != -1) _ejected = 1; -#endif + for(;;) { u8* packet = _flashbuf; @@ -153,9 +147,7 @@ int main() if (c == cmd || c == 0) break; } -#ifndef MSC_ENABLED _timeout = 0; -#endif // Read params Recv(CDC_RX,packet,len); -- cgit v1.2.3-18-g5258