diff options
| -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 | ||||
| -rw-r--r-- | src/drivers/net/e1000.c | 1 | ||||
| -rw-r--r-- | src/drivers/net/tg3.c | 1 | ||||
| -rw-r--r-- | src/include/etherboot.h | 1 |
7 files changed, 0 insertions, 26 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(); } } diff --git a/src/drivers/net/e1000.c b/src/drivers/net/e1000.c index d89deb7a8..3ec7991fb 100644 --- a/src/drivers/net/e1000.c +++ b/src/drivers/net/e1000.c @@ -3536,7 +3536,6 @@ e1000_transmit (struct nic *nic, const char *d, /* Destination */ E1000_WRITE_REG (&hw, TDT, tx_tail); while (!(txp->upper.data & E1000_TXD_STAT_DD)) { udelay(10); /* give the nic a chance to write to the register */ - poll_interruptions(); } DEBUGFUNC("send end"); } diff --git a/src/drivers/net/tg3.c b/src/drivers/net/tg3.c index 6aad8718f..1901f68fb 100644 --- a/src/drivers/net/tg3.c +++ b/src/drivers/net/tg3.c @@ -3153,7 +3153,6 @@ static void tg3_transmit(struct nic *nic, const char *dst_addr, while((tp->hw_status->idx[0].tx_consumer != entry) && (tp->hw_status->idx[0].tx_consumer != PREV_TX(entry))) { mdelay(10); /* give the nick a chance */ - poll_interruptions(); if (++i > 500) { /* timeout 5s for transmit */ printf("transmit timed out\n"); tg3_halt(tp); diff --git a/src/include/etherboot.h b/src/include/etherboot.h index 10abef1ec..e5a181536 100644 --- a/src/include/etherboot.h +++ b/src/include/etherboot.h @@ -222,7 +222,6 @@ extern int load_block P((unsigned char *, unsigned int, unsigned int, int )); extern void twiddle P((void)); extern void sleep P((int secs)); extern void interruptible_sleep P((int secs)); -extern void poll_interruptions P((void)); extern int strcasecmp P((const char *a, const char *b)); extern char *substr P((const char *a, const char *b)); |