ctdo
/
crashtest-r0ket
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add global usbMSCenabled flag. 

Make ISPandReset honor this flag by disabling MSC first
This commit is contained in:
Stefan `Sec` Zehl 2011-06-27 01:35:32 +02:00
parent 050df7db06
commit bb4b0f1b9c
4 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
firmware/basic/basic.h
View File

@ -143,4 +143,7 @@ uint8_t getInput(void);
uint32_t GetUUID32(void); uint32_t GetUUID32(void);
uint16_t GetUUID16(void); uint16_t GetUUID16(void);
// for core/iap/iap.c (no official definition)
void iap_entry(uint32_t param_tab[], uint32_t result_tab[]);
#endif #endif

10
firmware/basic/reinvoke_isp.c
View File

@ -1,5 +1,7 @@
#include "lpc134x.h" #include "lpc134x.h"
#include "sysdefs.h" #include "sysdefs.h"
#include "basic/basic.h"
#include "usb/usbmsc.h"
/* Missing from core */ /* Missing from core */
@ -73,7 +75,11 @@ void EnableWatchdog(uint32_t ms){
}; };
void ISPandReset(int delay){ void ISPandReset(int delay){
EnableWatchdog(1000*delay); if(usbMSCenabled){
ReinvokeISP(); usbMSCOff();
delayms(500);
};
EnableWatchdog(1000*delay);
ReinvokeISP();
}; };

3
firmware/usb/usbmsc.c
View File

@ -12,6 +12,7 @@
USB_DEV_INFO DeviceInfo; USB_DEV_INFO DeviceInfo;
MSC_DEVICE_INFO MscDevInfo; MSC_DEVICE_INFO MscDevInfo;
ROM ** rom = (ROM **)0x1fff1ff8; ROM ** rom = (ROM **)0x1fff1ff8;
char usbMSCenabled=0;
void usbMSCWrite(uint32_t offset, uint8_t src[], uint32_t length) { void usbMSCWrite(uint32_t offset, uint8_t src[], uint32_t length) {
dataflash_random_write(src, offset, length); dataflash_random_write(src, offset, length);
@ -84,6 +85,7 @@ void usbMSCInit(void) {
(*rom)->pUSBD->init(&DeviceInfo); /* USB Initialization */ (*rom)->pUSBD->init(&DeviceInfo); /* USB Initialization */
(*rom)->pUSBD->connect(true); /* USB Connect */ (*rom)->pUSBD->connect(true); /* USB Connect */
usbMSCenabled=1;
} }
#ifdef CFG_USBMSC #ifdef CFG_USBMSC
@ -94,5 +96,6 @@ void USB_IRQHandler() {
void usbMSCOff(void) { void usbMSCOff(void) {
(*rom)->pUSBD->connect(false); /* USB Disconnect */ (*rom)->pUSBD->connect(false); /* USB Disconnect */
usbMSCenabled=0;
} }

1
firmware/usb/usbmsc.h
View File

@ -39,6 +39,7 @@
#include "projectconfig.h" #include "projectconfig.h"
extern char usbMSCenabled;
void usbMSCWrite(uint32_t offset, uint8_t src[], uint32_t length); void usbMSCWrite(uint32_t offset, uint8_t src[], uint32_t length);
void usbMSCRead(uint32_t offset, uint8_t dst[], uint32_t length); void usbMSCRead(uint32_t offset, uint8_t dst[], uint32_t length);
void usbMSCInit(void); void usbMSCInit(void);