Warnings purge: src/arch/i386, src/core/disk.c, ramdisk, autoboot

6 files changed, 4 insertions, 235 deletions

diff --git a/src/arch/i386/core/video_subr.c b/src/arch/i386/core/video_subr.c
index 7f3b96bf6..63e07d5af 100644
--- a/src/arch/i386/core/video_subr.c
+++ b/src/arch/i386/core/video_subr.c
@@ -33,7 +33,7 @@ static void video_init(void)
 {
 	static int inited=0;
 
-	vidmem = (unsigned char *)phys_to_virt(VIDBUFFER);
+	vidmem = (char *)phys_to_virt(VIDBUFFER);
 
 	if (!inited) {
 		video_line = 0;
diff --git a/src/arch/i386/drivers/bus/bios_disks.c b/src/arch/i386/drivers/bus/bios_disks.c
deleted file mode 100644
index 99c8957d3..000000000
--- a/src/arch/i386/drivers/bus/bios_disks.c
+++ /dev/null
@@ -1,204 +0,0 @@
-#include "realmode.h"
-#include "console.h"
-#include "disk.h"
-#include "bios_disks.h"
-
-#warning "This file is obsolete"
-#if 0
-
-#define CF ( 1 << 0 )
-#define BIOS_DISK_NONE 0
-
-/*
- * Reset the disk system using INT 13,0.  Forces both hard disks and
- * floppy disks to seek back to track 0.
- *
- */
-static void bios_disk_init ( void ) {
-	REAL_EXEC ( rm_bios_disk_init,
-		    "sti\n\t"
-		    "xorw %%ax,%%ax\n\t"
-		    "movb $0x80,%%dl\n\t"
-		    "int $0x13\n\t"
-		    "cli\n\t",
-		    0,
-		    OUT_CONSTRAINTS (),
-		    IN_CONSTRAINTS (),
-   		    CLOBBER ( "eax", "ebx", "ecx", "edx",
-			      "ebp", "esi", "edi" ) );
-}
-
-/*
- * Read a single sector from a disk using INT 13,2.
- *
- * Returns the BIOS status code (%ah) - 0 indicates success.
- * Automatically retries up to three times to allow time for floppy
- * disks to spin up, calling bios_disk_init() after each failure.
- *
- */
-static unsigned int bios_disk_read ( struct bios_disk_device *bios_disk,
-				     unsigned int cylinder,
-				     unsigned int head,
-				     unsigned int sector,
-				     struct bios_disk_sector *buf ) {
-	uint16_t basemem_buf, ax, flags;
-	unsigned int status, discard_c, discard_d;
-	int retry = 3;
-
-	basemem_buf = BASEMEM_PARAMETER_INIT ( *buf );
-	do {
-		REAL_EXEC ( rm_bios_disk_read,
-			    "sti\n\t"
-			    "movw $0x0201, %%ax\n\t" /* Read a single sector */
-			    "int $0x13\n\t"
-			    "pushfw\n\t"
-			    "popw %%bx\n\t"
-			    "cli\n\t",
-			    4,
-			    OUT_CONSTRAINTS ( "=a" ( ax ), "=b" ( flags ),
-					      "=c" ( discard_c ),
-					      "=d" ( discard_d ) ),
-			    IN_CONSTRAINTS ( "c" ( ( (cylinder & 0xff) << 8 ) |
-						   ( (cylinder >> 8) & 0x3 ) |
-						   sector ),
-					     "d" ( ( head << 8 ) |
-						   bios_disk->drive ),
-					     "b" ( basemem_buf ) ),
-			    CLOBBER ( "ebp", "esi", "edi" ) );
-		status = ( flags & CF ) ? ( ax >> 8 ) : 0;
-	} while ( ( status != 0 ) && ( bios_disk_init(), retry-- ) );
-	BASEMEM_PARAMETER_DONE ( *buf );
-
-	return status;
-}
-
-/*
- * Increment a bus_loc structure to the next possible BIOS disk
- * location.  Leave the structure zeroed and return 0 if there are no
- * more valid locations.
- *
- */
-static int bios_disk_next_location ( struct bus_loc *bus_loc ) {
-	struct bios_disk_loc *bios_disk_loc
-		= ( struct bios_disk_loc * ) bus_loc;
-	
-	/*
-	 * Ensure that there is sufficient space in the shared bus
-	 * structures for a struct bios_disk_loc and a struct
-	 * bios_disk_dev, as mandated by bus.h.
-	 *
-	 */
-	BUS_LOC_CHECK ( struct bios_disk_loc );
-	BUS_DEV_CHECK ( struct bios_disk_device );
-
-	return ( ++bios_disk_loc->drive );
-}
-
-/*
- * Fill in parameters for a BIOS disk device based on drive number
- *
- */
-static int bios_disk_fill_device ( struct bus_dev *bus_dev,
-				   struct bus_loc *bus_loc ) {
-	struct bios_disk_loc *bios_disk_loc
-		= ( struct bios_disk_loc * ) bus_loc;
-	struct bios_disk_device *bios_disk
-		= ( struct bios_disk_device * ) bus_dev;
-	uint16_t flags;
-
-	/* Store drive in struct bios_disk_device */
-	bios_disk->drive = bios_disk_loc->drive;
-       
-	REAL_EXEC ( rm_bios_disk_exists,
-		    "sti\n\t"
-		    "movb $0x15, %%ah\n\t"
-		    "int $0x13\n\t"
-		    "pushfw\n\t"
-		    "popw %%dx\n\t"
-		    "movb %%ah, %%al\n\t"
-		    "cli\n\t",
-		    2,
-		    OUT_CONSTRAINTS ( "=a" ( bios_disk->type ),
-				      "=d" ( flags ) ),
-		    IN_CONSTRAINTS ( "d" ( bios_disk->drive ) ),
-		    CLOBBER ( "ebx", "ecx", "esi", "edi", "ebp" ) );
-
-	if ( ( flags & CF ) || ( bios_disk->type == BIOS_DISK_NONE ) )
-		return 0;
-
-	DBG ( "BIOS disk found valid drive %hhx\n", bios_disk->drive );
-	return 1;
-}
-
-/*
- * Test whether or not a driver is capable of driving the device.
- *
- */
-static int bios_disk_check_driver ( struct bus_dev *bus_dev,
-				    struct device_driver *device_driver ) {
-	struct bios_disk_device *bios_disk
-		= ( struct bios_disk_device * ) bus_dev;
-	struct bios_disk_driver *driver
-		= ( struct bios_disk_driver * ) device_driver->bus_driver_info;
-
-	/* Compare against driver's valid ID range */
-	if ( ( bios_disk->drive >= driver->min_drive ) &&
-	     ( bios_disk->drive <= driver->max_drive ) ) {
-		driver->fill_drive_name ( bios_disk->name, bios_disk->drive );
-		DBG ( "BIOS disk found drive %hhx (\"%s\") "
-		      "matching driver %s\n",
-		      bios_disk->drive, bios_disk->name,
-		      driver->name );
-		return 1;
-	}
-
-	return 0;
-}
-
-/*
- * Describe a BIOS disk device
- *
- */
-static char * bios_disk_describe_device ( struct bus_dev *bus_dev ) {
-	struct bios_disk_device *bios_disk
-		= ( struct bios_disk_device * ) bus_dev;
-	static char bios_disk_description[] = "BIOS disk 00";
-
-	sprintf ( bios_disk_description + 10, "%hhx", bios_disk->drive );
-	return bios_disk_description;
-}
-
-/*
- * Name a BIOS disk device
- *
- */
-static const char * bios_disk_name_device ( struct bus_dev *bus_dev ) {
-	struct bios_disk_device *bios_disk
-		= ( struct bios_disk_device * ) bus_dev;
-	
-	return bios_disk->name;
-}
-
-/*
- * BIOS disk bus operations table
- *
- */
-struct bus_driver bios_disk_driver __bus_driver = {
-	.name			= "BIOS DISK",
-	.next_location		= bios_disk_next_location,
-	.fill_device		= bios_disk_fill_device,
-	.check_driver		= bios_disk_check_driver,
-	.describe_device	= bios_disk_describe_device,
-	.name_device		= bios_disk_name_device,
-};
-
-/*
- * Fill in a disk structure
- *
- */
-void bios_disk_fill_disk ( struct disk *disk __unused,
-			   struct bios_disk_device *bios_disk __unused ) {
-
-}
-
-#endif
diff --git a/src/arch/i386/drivers/disk/floppy.c b/src/arch/i386/drivers/disk/floppy.c
deleted file mode 100644
index 0582ca18f..000000000
--- a/src/arch/i386/drivers/disk/floppy.c
+++ /dev/null
@@ -1,27 +0,0 @@
-#include "console.h"
-#include "disk.h"
-#include "bios_disks.h"
-
-static void fill_floppy_name ( char *buf, uint8_t drive ) {
-	sprintf ( buf, "fd%d", drive );
-}
-
-static struct disk_operations floppy_operations = {
-
-};
-
-static int floppy_probe ( struct disk *disk,
-			  struct bios_disk_device *bios_disk ) {
-	
-	return 1;
-}
-
-static void floppy_disable ( struct disk *disk,
-			     struct bios_disk_device *bios_disk ) {
-	
-}
-
-BIOS_DISK_DRIVER ( floppy_driver, fill_floppy_name, 0x00, 0x7f );
-
-DRIVER ( "floppy", disk_driver, bios_disk_driver, floppy_driver,
-	 floppy_probe, floppy_disable );
diff --git a/src/arch/i386/firmware/pcbios/bios_console.c b/src/arch/i386/firmware/pcbios/bios_console.c
index 9ad0a72cc..dcb0462a9 100644
--- a/src/arch/i386/firmware/pcbios/bios_console.c
+++ b/src/arch/i386/firmware/pcbios/bios_console.c
@@ -233,7 +233,7 @@ static const char * scancode_to_ansi_seq ( unsigned int scancode ) {
 static int bios_getchar ( void ) {
 	uint16_t keypress;
 	unsigned int character;
-	char *ansi_seq;
+	const char *ansi_seq;
 
 	/* If we are mid-sequence, pass out the next byte */
 	if ( ( character = *ansi_input ) ) {
diff --git a/src/arch/i386/prefix/bImageprefix.S b/src/arch/i386/prefix/bImageprefix.S
index d46482ebe..7d746ede3 100644
--- a/src/arch/i386/prefix/bImageprefix.S
+++ b/src/arch/i386/prefix/bImageprefix.S
@@ -436,7 +436,7 @@ a20_done:
 	orb	$CR0_PE, %al
 	movl	%eax, %cr0
 
-	DATA32 ljmp %ds:(code32 - setup_code)
+	DATA32 ljmp *%ds:(code32 - setup_code)
 code32:
 	.long	0x100000
 	.word	__BOOT_CS, 0
diff --git a/src/arch/i386/prefix/int19exit.c b/src/arch/i386/prefix/int19exit.c
index e1333926c..1c7147bdc 100644
--- a/src/arch/i386/prefix/int19exit.c
+++ b/src/arch/i386/prefix/int19exit.c
@@ -25,7 +25,7 @@
  * @bug Not yet implemented
  *
  */
-void exit_via_int19 ( struct i386_all_regs *ix86 ) {
+void exit_via_int19 ( __unused struct i386_all_regs *ix86 ) {
 	bochsbp();
 	/* Placeholder */
 }