sys64738
/
mspdebug
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix Ctrl+C handling under Cygwin.

This commit is contained in:
Daniel Beer 2012-10-04 14:45:57 +12:00
parent 8a70a931bb
commit e4f582b0d7
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/fet_core.c
View File

@ -547,8 +547,6 @@ device_status_t fet_poll(device_t dev_base)
{ {
struct fet_device *dev = (struct fet_device *)dev_base; struct fet_device *dev = (struct fet_device *)dev_base;
ctrlc_reset();
if (fet_proto_xfer(&dev->proto, C_STATE, NULL, 0, 1, 0) < 0) { if (fet_proto_xfer(&dev->proto, C_STATE, NULL, 0, 1, 0) < 0) {
printc_err("fet: polling failed\n"); printc_err("fet: polling failed\n");
power_end(dev); power_end(dev);
@ -624,6 +622,7 @@ int fet_ctl(device_t dev_base, device_ctl_t action)
return -1; return -1;
} }
ctrlc_reset();
return 0; return 0;
case DEVICE_CTL_HALT: case DEVICE_CTL_HALT:

6
util/util.c
View File

@ -124,6 +124,12 @@ void ctrlc_reset(void)
int ctrlc_check(void) int ctrlc_check(void)
{ {
#ifdef __CYGWIN__
/* Cygwin's signal emulation seems to require the process to
* block.
*/
delay_ms(1);
#endif
return ctrlc_flag; return ctrlc_flag;
} }
#endif #endif