diff options
| author |   jasper <jasper@openbsd.org> | 2013-06-05 02:42:29 +0000 |
|---|---|---|
| committer | jasper <jasper@openbsd.org> | 2013-06-05 02:42:29 +0000 |
| commit | 43b54e51d6599906d07772f347f2ba2cb67cb932 (patch) | |
| tree | e4d7a3d5dfda441de920b66b3141825138ceb2bf | |
| parent | When running sshd -D, close stderr unless we have explicitly requesting (diff) | |
| download | wireguard-openbsd-43b54e51d6599906d07772f347f2ba2cb67cb932.tar.xz wireguard-openbsd-43b54e51d6599906d07772f347f2ba2cb67cb932.zip | |
remove ugly hack we couldn't figure out what it was used for, only that it
broke printing characters to the early console.
discussed with pirofti@ and uebayasi@
ok uebayasi@
| -rw-r--r-- | sys/arch/octeon/stand/boot/uart.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/sys/arch/octeon/stand/boot/uart.c b/sys/arch/octeon/stand/boot/uart.c index 79970e51060..78e9ba5f9c8 100644 --- a/sys/arch/octeon/stand/boot/uart.c +++ b/sys/arch/octeon/stand/boot/uart.c @@ -1,4 +1,4 @@ -/* $OpenBSD: uart.c,v 1.1 2013/06/05 01:02:29 jasper Exp $ */ +/* $OpenBSD: uart.c,v 1.2 2013/06/05 02:42:29 jasper Exp $ */ /* * Copyright (c) 2001-2004 Opsycon AB (www.opsycon.se / www.opsycon.com) @@ -47,7 +47,6 @@ #define OCTEON_MIO_UART0_DLH 0x8001180000000888ull #define USR_TXFIFO_NOTFULL 2 -static int delay_changed = 1; int cn30xxuart_delay(void); void cn30xxuart_wait_txhr_empty(int); @@ -59,10 +58,7 @@ cn30xxuart_delay(void) { int divisor; u_char lcr; - static int d = 0; - if (!delay_changed) return d; - delay_changed = 0; lcr = (u_char)*(uint64_t*)OCTEON_MIO_UART0_LCR; *(uint64_t*)OCTEON_MIO_UART0_LCR = lcr | LCR_DLAB; divisor = (int)(*(uint64_t*)OCTEON_MIO_UART0_DLL | |