From 487dc5be562be223512ed22b008c24db63463655 Mon Sep 17 00:00:00 2001
From: Michael Brown
Date: Mon, 9 Jul 2007 01:10:32 +0100
Subject: Fix up iscsiboot missing prototype warnings

---
 src/include/usr/iscsiboot.h |  6 ++++++
 src/tests/iscsiboot.c       | 45 --------------------------------------------
 src/usr/autoboot.c          |  1 +
 src/usr/iscsiboot.c         | 46 +++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 53 insertions(+), 45 deletions(-)
 create mode 100644 src/include/usr/iscsiboot.h
 delete mode 100644 src/tests/iscsiboot.c
 create mode 100644 src/usr/iscsiboot.c

diff --git a/src/include/usr/iscsiboot.h b/src/include/usr/iscsiboot.h
new file mode 100644
index 000000000..b17951d56
--- /dev/null
+++ b/src/include/usr/iscsiboot.h
@@ -0,0 +1,6 @@
+#ifndef _USR_ISCSIBOOT_H
+#define _USR_ISCSIBOOT_H
+
+extern int iscsiboot ( const char *root_path );
+
+#endif /* _USR_ISCSIBOOT_H */
diff --git a/src/tests/iscsiboot.c b/src/tests/iscsiboot.c
deleted file mode 100644
index 9331357d7..000000000
--- a/src/tests/iscsiboot.c
+++ /dev/null
@@ -1,45 +0,0 @@
-#include <stdint.h>
-#include <string.h>
-#include <stdio.h>
-#include <gpxe/iscsi.h>
-#include <gpxe/dhcp.h>
-#include <int13.h>
-
-int iscsiboot ( const char *root_path ) {
-	struct scsi_device scsi;
-	struct int13_drive drive;
-	int rc;
-
-	memset ( &scsi, 0, sizeof ( scsi ) );
-	memset ( &drive, 0, sizeof ( drive ) );
-
-	printf ( "iSCSI booting from %s\n", root_path );
-
-	if ( ( rc = iscsi_attach ( &scsi, root_path ) ) != 0 ) {
-		printf ( "Could not attach iSCSI device: %s\n",
-			 strerror ( rc ) );
-		goto error_attach;
-	}
-	if ( ( rc = init_scsidev ( &scsi ) ) != 0 ) {
-		printf ( "Could not initialise iSCSI device: %s\n",
-			 strerror ( rc ) );
-		goto error_init;
-	}
-
-	drive.drive = find_global_dhcp_num_option ( DHCP_EB_BIOS_DRIVE );
-	drive.blockdev = &scsi.blockdev;
-
-	register_int13_drive ( &drive );
-	printf ( "Registered as BIOS drive %#02x\n", drive.drive );
-	printf ( "Booting from BIOS drive %#02x\n", drive.drive );
-	rc = int13_boot ( drive.drive );
-	printf ( "Boot failed\n" );
-
-	printf ( "Unregistering BIOS drive %#02x\n", drive.drive );
-	unregister_int13_drive ( &drive );
-
- error_init:
-	iscsi_detach ( &scsi );
- error_attach:
-	return rc;
-}
diff --git a/src/usr/autoboot.c b/src/usr/autoboot.c
index 277e8b09e..97b9a4067 100644
--- a/src/usr/autoboot.c
+++ b/src/usr/autoboot.c
@@ -26,6 +26,7 @@
 #include <usr/route.h>
 #include <usr/dhcpmgmt.h>
 #include <usr/imgmgmt.h>
+#include <usr/iscsiboot.h>
 #include <usr/autoboot.h>
 
 /** @file
diff --git a/src/usr/iscsiboot.c b/src/usr/iscsiboot.c
new file mode 100644
index 000000000..f3910f149
--- /dev/null
+++ b/src/usr/iscsiboot.c
@@ -0,0 +1,46 @@
+#include <stdint.h>
+#include <string.h>
+#include <stdio.h>
+#include <gpxe/iscsi.h>
+#include <gpxe/dhcp.h>
+#include <int13.h>
+#include <usr/iscsiboot.h>
+
+int iscsiboot ( const char *root_path ) {
+	struct scsi_device scsi;
+	struct int13_drive drive;
+	int rc;
+
+	memset ( &scsi, 0, sizeof ( scsi ) );
+	memset ( &drive, 0, sizeof ( drive ) );
+
+	printf ( "iSCSI booting from %s\n", root_path );
+
+	if ( ( rc = iscsi_attach ( &scsi, root_path ) ) != 0 ) {
+		printf ( "Could not attach iSCSI device: %s\n",
+			 strerror ( rc ) );
+		goto error_attach;
+	}
+	if ( ( rc = init_scsidev ( &scsi ) ) != 0 ) {
+		printf ( "Could not initialise iSCSI device: %s\n",
+			 strerror ( rc ) );
+		goto error_init;
+	}
+
+	drive.drive = find_global_dhcp_num_option ( DHCP_EB_BIOS_DRIVE );
+	drive.blockdev = &scsi.blockdev;
+
+	register_int13_drive ( &drive );
+	printf ( "Registered as BIOS drive %#02x\n", drive.drive );
+	printf ( "Booting from BIOS drive %#02x\n", drive.drive );
+	rc = int13_boot ( drive.drive );
+	printf ( "Boot failed\n" );
+
+	printf ( "Unregistering BIOS drive %#02x\n", drive.drive );
+	unregister_int13_drive ( &drive );
+
+ error_init:
+	iscsi_detach ( &scsi );
+ error_attach:
+	return rc;
+}
-- 
cgit v1.2.3-55-g7522