diff options
| author | Michael Brown | 2006-08-15 00:29:51 +0200 |
|---|---|---|
| committer | Michael Brown | 2006-08-15 00:29:51 +0200 |
| commit | 97439cb6ebb49fad9855cc975cc80fb3eb8db13b (patch) | |
| tree | ce5375cd5e3ac7b2fa6109fd2725293db224665f /src/core | |
| parent | Bug fixes to the HTTP protocol code (diff) | |
| download | ipxe-97439cb6ebb49fad9855cc975cc80fb3eb8db13b.tar.gz ipxe-97439cb6ebb49fad9855cc975cc80fb3eb8db13b.tar.xz ipxe-97439cb6ebb49fad9855cc975cc80fb3eb8db13b.zip | |
Kill off poll_interruptions(); it is lethal when we're acting as a PXE
stack or INT 13 emulator etc.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/misc.c | 15 | ||||
| -rw-r--r-- | src/core/nic.c | 5 | ||||
| -rw-r--r-- | src/core/pcmcia.c | 1 | ||||
| -rw-r--r-- | src/core/timer.c | 2 |
4 files changed, 0 insertions, 23 deletions
diff --git a/src/core/misc.c b/src/core/misc.c index d987f8569..77b22659d 100644 --- a/src/core/misc.c +++ b/src/core/misc.c @@ -73,20 +73,6 @@ int32_t random(void) } /************************************************************************** -POLL INTERRUPTIONS -**************************************************************************/ -void poll_interruptions(void) -{ - int ch; - if ( ! as_main_program ) return; - /* If an interruption has occured restart etherboot */ - if (iskey() && (ch = getchar(), (ch == K_ESC) || (ch == K_EOF) || (ch == K_INTR))) { - int state = (ch != K_INTR)? -1 : -3; - longjmp(restart_etherboot, state); - } -} - -/************************************************************************** SLEEP **************************************************************************/ void sleep(int secs) @@ -94,7 +80,6 @@ void sleep(int secs) unsigned long tmo; for (tmo = currticks()+secs*TICKS_PER_SEC; currticks() < tmo; ) { - poll_interruptions(); } } diff --git a/src/core/nic.c b/src/core/nic.c index 0382ced2d..1debd06c7 100644 --- a/src/core/nic.c +++ b/src/core/nic.c @@ -883,11 +883,6 @@ int await_reply(reply_t reply, int ival, void *ptr, long timeout) if (result == 0) { /* We don't have anything */ - /* Check for abort key only if the Rx queue is empty - - * as long as we have something to process, don't - * assume that something failed. It is unlikely that - * we have no processing time left between packets. */ - poll_interruptions(); /* Do the timeout after at least a full queue walk. */ if ((timeout == 0) || (currticks() > time)) { break; diff --git a/src/core/pcmcia.c b/src/core/pcmcia.c index b4faceaf5..c15fe9cc8 100644 --- a/src/core/pcmcia.c +++ b/src/core/pcmcia.c @@ -48,7 +48,6 @@ struct driver_interact_t driver[] = { void sleepticks(int numticks ) { u_int tmo; for (tmo = currticks()+numticks; currticks() < tmo; ) { - poll_interruptions(); } return; } diff --git a/src/core/timer.c b/src/core/timer.c index d4d38ad5f..73dfa8ba2 100644 --- a/src/core/timer.c +++ b/src/core/timer.c @@ -17,7 +17,6 @@ void mdelay(unsigned int msecs) unsigned int i; for(i = 0; i < msecs; i++) { udelay(1000); - poll_interruptions(); } } @@ -25,6 +24,5 @@ void waiton_timer2(unsigned int ticks) { load_timer2(ticks); while(timer2_running()) { - poll_interruptions(); } } |
