[i386] Change [u]int32_t to [unsigned] int, rather than [unsigned] long

This brings us in to line with Linux definitions, and also simplifies
adding x86_64 support since both platforms have 2-byte shorts, 4-byte
ints and 8-byte long longs.

9 files changed, 14 insertions, 14 deletions

diff --git a/src/arch/i386/core/dumpregs.c b/src/arch/i386/core/dumpregs.c
index a2777a0b..82dc2184 100644
--- a/src/arch/i386/core/dumpregs.c
+++ b/src/arch/i386/core/dumpregs.c
@@ -12,8 +12,8 @@ void __asmcall _dump_regs ( struct i386_all_regs *ix86 ) {
 			      "addr32 leal 4(%%esp), %%esp\n\t"
 			      "ret\n\t" ) : : );
 
-	printf ( "EAX=%08lx EBX=%08lx ECX=%08lx EDX=%08lx\n"
-		 "ESI=%08lx EDI=%08lx EBP=%08lx ESP=%08lx\n"
+	printf ( "EAX=%08x EBX=%08x ECX=%08x EDX=%08x\n"
+		 "ESI=%08x EDI=%08x EBP=%08x ESP=%08x\n"
 		 "CS=%04x SS=%04x DS=%04x ES=%04x FS=%04x GS=%04x\n",
 		 ix86->regs.eax, ix86->regs.ebx, ix86->regs.ecx,
 		 ix86->regs.edx, ix86->regs.esi, ix86->regs.edi,
diff --git a/src/arch/i386/drivers/net/undinet.c b/src/arch/i386/drivers/net/undinet.c
index 229fde02..f9df3438 100644
--- a/src/arch/i386/drivers/net/undinet.c
+++ b/src/arch/i386/drivers/net/undinet.c
@@ -701,7 +701,7 @@ int undinet_probe ( struct undi_device *undi ) {
 				   &undi_iface,
 				   sizeof ( undi_iface ) ) ) != 0 )
 		goto err_undi_get_iface_info;
-	DBGC ( undinic, "UNDINIC %p has type %s and link speed %ld\n",
+	DBGC ( undinic, "UNDINIC %p has type %s and link speed %d\n",
 	       undinic, undi_iface.IfaceType, undi_iface.LinkSpeed );
 	if ( strncmp ( ( ( char * ) undi_iface.IfaceType ), "Etherboot",
 		       sizeof ( undi_iface.IfaceType ) ) == 0 ) {
diff --git a/src/arch/i386/drivers/net/undirom.c b/src/arch/i386/drivers/net/undirom.c
index d40fcd35..e5782781 100644
--- a/src/arch/i386/drivers/net/undirom.c
+++ b/src/arch/i386/drivers/net/undirom.c
@@ -52,7 +52,7 @@ static int undirom_parse_pxeromid ( struct undi_rom *undirom,
 			 sizeof ( undi_rom_id ) );
 	if ( undi_rom_id.Signature != UNDI_ROM_ID_SIGNATURE ) {
 		DBGC ( undirom, "UNDIROM %p has bad PXE ROM ID signature "
-		       "%08lx\n", undirom, undi_rom_id.Signature );
+		       "%08x\n", undirom, undi_rom_id.Signature );
 		return -EINVAL;
 	}
 
@@ -94,7 +94,7 @@ static int undirom_parse_pcirheader ( struct undi_rom *undirom,
 			 sizeof ( pcir_header ) );
 	if ( pcir_header.signature != PCIR_SIGNATURE ) {
 		DBGC ( undirom, "UNDIROM %p has bad PCI expansion header "
-		       "signature %08lx\n", undirom, pcir_header.signature );
+		       "signature %08x\n", undirom, pcir_header.signature );
 		return -EINVAL;
 	}
 
diff --git a/src/arch/i386/firmware/pcbios/memmap.c b/src/arch/i386/firmware/pcbios/memmap.c
index 2e9627c0..3546dc6f 100644
--- a/src/arch/i386/firmware/pcbios/memmap.c
+++ b/src/arch/i386/firmware/pcbios/memmap.c
@@ -210,7 +210,7 @@ static int meme820 ( struct memory_map *memmap ) {
 			if ( e820buf.attrs & E820_ATTR_NONVOLATILE )
 				DBG ( ", non-volatile" );
 			if ( e820buf.attrs & E820_ATTR_UNKNOWN )
-				DBG ( ", other [%08lx]", e820buf.attrs );
+				DBG ( ", other [%08x]", e820buf.attrs );
 			DBG ( ")" );
 		}
 		DBG ( "\n" );
diff --git a/src/arch/i386/image/bzimage.c b/src/arch/i386/image/bzimage.c
index e6fd854f..47d46ca4 100644
--- a/src/arch/i386/image/bzimage.c
+++ b/src/arch/i386/image/bzimage.c
@@ -400,7 +400,7 @@ static int bzimage_load_header ( struct image *image,
 	copy_from_user ( bzhdr, image->data, BZI_HDR_OFFSET,
 			 sizeof ( *bzhdr ) );
 	if ( bzhdr->header != BZI_SIGNATURE ) {
-		DBGC ( image, "bzImage %p bad signature %08lx\n",
+		DBGC ( image, "bzImage %p bad signature %08x\n",
 		       image, bzhdr->header );
 		return -ENOEXEC;
 	}
diff --git a/src/arch/i386/image/multiboot.c b/src/arch/i386/image/multiboot.c
index 49adf951..52bb10f6 100644
--- a/src/arch/i386/image/multiboot.c
+++ b/src/arch/i386/image/multiboot.c
@@ -220,7 +220,7 @@ multiboot_build_module_list ( struct image *image,
 
 	/* Dump module configuration */
 	for ( i = 0 ; i < count ; i++ ) {
-		DBGC ( image, "MULTIBOOT %p module %d is [%lx,%lx)\n",
+		DBGC ( image, "MULTIBOOT %p module %d is [%x,%x)\n",
 		       image, i, modules[i].mod_start,
 		       modules[i].mod_end );
 	}
@@ -418,7 +418,7 @@ static int multiboot_load ( struct image *image ) {
 		       image );
 		return rc;
 	}
-	DBGC ( image, "MULTIBOOT %p found header with flags %08lx\n",
+	DBGC ( image, "MULTIBOOT %p found header with flags %08x\n",
 	       image, hdr.mb.flags );
 
 	/* This is a multiboot image, valid or otherwise */
@@ -427,7 +427,7 @@ static int multiboot_load ( struct image *image ) {
 
 	/* Abort if we detect flags that we cannot support */
 	if ( hdr.mb.flags & MB_UNSUPPORTED_FLAGS ) {
-		DBGC ( image, "MULTIBOOT %p flags %08lx not supported\n",
+		DBGC ( image, "MULTIBOOT %p flags %08x not supported\n",
 		       image, ( hdr.mb.flags & MB_UNSUPPORTED_FLAGS ) );
 		return -ENOTSUP;
 	}
diff --git a/src/arch/i386/include/bits/stdint.h b/src/arch/i386/include/bits/stdint.h
index a2947cda..1c9706c1 100644
--- a/src/arch/i386/include/bits/stdint.h
+++ b/src/arch/i386/include/bits/stdint.h
@@ -7,12 +7,12 @@ typedef signed long		off_t;
 
 typedef unsigned char		uint8_t;
 typedef unsigned short		uint16_t;
-typedef unsigned long		uint32_t;
+typedef unsigned int		uint32_t;
 typedef unsigned long long	uint64_t;
 
 typedef signed char		int8_t;
 typedef signed short		int16_t;
-typedef signed long		int32_t;
+typedef signed int		int32_t;
 typedef signed long long	int64_t;
 
 typedef unsigned long		physaddr_t;
diff --git a/src/arch/i386/include/gdbmach.h b/src/arch/i386/include/gdbmach.h
index 1a38ccd1..794dab19 100644
--- a/src/arch/i386/include/gdbmach.h
+++ b/src/arch/i386/include/gdbmach.h
@@ -12,7 +12,7 @@
 
 #include <stdint.h>
 
-typedef uint32_t gdbreg_t;
+typedef unsigned long gdbreg_t;
 
 /* The register snapshot, this must be in sync with interrupt handler and the
  * GDB protocol. */
diff --git a/src/arch/i386/interface/pxe/pxe_tftp.c b/src/arch/i386/interface/pxe/pxe_tftp.c
index f5e76206..97077d37 100644
--- a/src/arch/i386/interface/pxe/pxe_tftp.c
+++ b/src/arch/i386/interface/pxe/pxe_tftp.c
@@ -485,7 +485,7 @@ PXENV_EXIT_t pxenv_tftp_read_file ( struct s_PXENV_TFTP_READ_FILE
 				    *tftp_read_file ) {
 	int rc;
 
-	DBG ( "PXENV_TFTP_READ_FILE to %08lx+%lx", tftp_read_file->Buffer,
+	DBG ( "PXENV_TFTP_READ_FILE to %08x+%x", tftp_read_file->Buffer,
 	      tftp_read_file->BufferSize );
 
 	/* Open TFTP file */