[ioapi] Remove old io.h file and switch all users over to <gpxe/io.h>

src/arch/i386/core/i386_timer.c

@@ -14,7 +14,7 @@
 #include <stddef.h>
 #include <bits/timer2.h>
 #include <gpxe/timer.h>
-#include <io.h>
+#include <gpxe/io.h>
 
 /* Timers tick over at this rate */
 #define TIMER2_TICK_RATE	1193180U

src/arch/i386/core/relocate.c

@@ -1,4 +1,4 @@
-#include <io.h>
+#include <gpxe/io.h>
 #include <registers.h>
 #include <gpxe/memmap.h>
 

src/arch/i386/core/video_subr.c

@@ -7,7 +7,7 @@
 
 #include "stddef.h"
 #include "string.h"
-#include "io.h"
+#include <gpxe/io.h>
 #include "console.h"
 #include <gpxe/init.h>
 #include "vga.h"

src/arch/i386/drivers/timer_rdtsc.c

@@ -5,7 +5,7 @@
 #include <stdio.h>
 #include <bits/cpu.h>
 #include <bits/timer2.h>
-#include <io.h>
+#include <gpxe/io.h>
 
 
 #define rdtsc(low,high) \

src/arch/i386/firmware/pcbios/gateA20.c

@@ -48,9 +48,9 @@ static void empty_8042 ( void ) {
 	time = currticks() + TICKS_PER_SEC;	/* max wait of 1 second */
 	while ( ( inb ( K_CMD ) & ( K_IBUF_FUL | K_OBUF_FUL ) ) &&
 		currticks() < time ) {
-		SLOW_DOWN_IO;
-		( void ) inb ( K_RDWR );
-		SLOW_DOWN_IO;
+		iodelay();
+		( void ) inb_p ( K_RDWR );
+		iodelay();
 	}
 }
 
@@ -77,7 +77,7 @@ static int gateA20_is_set ( int retries ) {
 		/* Avoid false negatives */
 		test_pattern++;
 
-		SLOW_DOWN_IO;
+		iodelay();
 
 		/* Always retry at least once, to avoid false negatives */
 	} while ( retries-- >= 0 );
@@ -145,9 +145,9 @@ void gateA20_set ( void ) {
 			scp_a = inb ( SCP_A );
 			scp_a &= ~0x01; /* Avoid triggering a reset */
 			scp_a |= 0x02; /* Enable A20 */
-			SLOW_DOWN_IO;
+			iodelay();
 			outb ( scp_a, SCP_A );
-			SLOW_DOWN_IO;
+			iodelay();
 			if ( gateA20_is_set ( A20_SCPA_RETRIES ) ) {
 				DBG ( "Enabled gate A20 using "
 				      "Fast Gate A20\n" );

src/arch/i386/include/pcidirect.h

@@ -2,7 +2,7 @@
 #define _PCIDIRECT_H
 
 #include <stdint.h>
-#include <io.h>
+#include <gpxe/io.h>
 
 /** @file
  *

src/arch/i386/include/realmode.h

@@ -5,7 +5,7 @@
 
 #include "stdint.h"
 #include "registers.h"
-#include "io.h"
+#include <gpxe/io.h>
 
 /*
  * Data structures and type definitions

src/core/debug.c

@@ -1,7 +1,7 @@
 #include <stdio.h>
 #include <stdint.h>
 #include <stdarg.h>
-#include <io.h>
+#include <gpxe/io.h>
 #include <console.h>
 
 void pause ( void ) {

src/core/malloc.c

@@ -20,7 +20,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <strings.h>
-#include <io.h>
+#include <gpxe/io.h>
 #include <gpxe/list.h>
 #include <gpxe/init.h>
 #include <gpxe/malloc.h>

src/core/pc_kbd.c

@@ -10,7 +10,7 @@
  *		yhlu@tyan.com
  */
 
-#include "io.h"
+#include <gpxe/io.h>
 #include "console.h"
 
 static char key_map[][128] = {

src/core/serial.c

@@ -13,7 +13,7 @@
 
 #include "stddef.h"
 #include <gpxe/init.h>
-#include "io.h"
+#include <gpxe/io.h>
 #include <unistd.h>
 #include <gpxe/serial.h>
 #include "config/serial.h"

src/drivers/bus/eisa.c

@@ -3,7 +3,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <errno.h>
-#include <io.h>
+#include <gpxe/io.h>
 #include <unistd.h>
 #include <gpxe/eisa.h>