* Code cleanup:

  - remove trailing white space, trailing empty lines, C++ comments, etc.
  - split cmd_boot.c (separate cmd_bdinfo.c and cmd_load.c)

* Patches by Kenneth Johansson, 25 Jun 2003:
  - major rework of command structure
    (work done mostly by Michal Cendrowski and Joakim Kristiansen)

1 files changed, 42 insertions, 44 deletions

diff --git a/lib_i386/video_bios.c b/lib_i386/video_bios.c
index d9709b9e12..45f78e22fa 100644
--- a/lib_i386/video_bios.c
+++ b/lib_i386/video_bios.c
@@ -21,13 +21,13 @@
  * MA 02111-1307 USA
  */
 
-#include <common.h> 
-#include <pci.h> 
-#include <malloc.h> 
-#include <asm/ptrace.h> 
-#include <asm/realmode.h> 
-#include <asm/io.h> 
-#include <asm/pci.h> 
+#include <common.h>
+#include <pci.h>
+#include <malloc.h>
+#include <asm/ptrace.h>
+#include <asm/realmode.h>
+#include <asm/io.h>
+#include <asm/pci.h>
 
 #undef PCI_BIOS_DEBUG
 #undef VGA_BIOS_DEBUG
@@ -41,7 +41,7 @@
 #ifdef CONFIG_PCI
 
 #ifdef PCI_BIOS_DEBUG
-#define RELOC_16(seg, off) *(u32*)(seg << 4 | (u32)&off) 
+#define RELOC_16(seg, off) *(u32*)(seg << 4 | (u32)&off)
 extern u32 num_pci_bios_present;
 extern u32 num_pci_bios_find_device;
 extern u32 num_pci_bios_find_class;
@@ -62,7 +62,7 @@ void print_bios_bios_stat(void)
 	printf("pci_bios_present:                %d\n", RELOC_16(0xf000, num_pci_bios_present));
 	printf("pci_bios_find_device:            %d\n", RELOC_16(0xf000, num_pci_bios_find_device));
 	printf("pci_bios_find_class:             %d\n", RELOC_16(0xf000, num_pci_bios_find_class));
-	printf("pci_bios_generate_special_cycle: %d\n", RELOC_16(0xf000, num_pci_bios_generate_special_cycle));	
+	printf("pci_bios_generate_special_cycle: %d\n", RELOC_16(0xf000, num_pci_bios_generate_special_cycle));
 	printf("pci_bios_read_cfg_byte:          %d\n", RELOC_16(0xf000, num_pci_bios_read_cfg_byte));
 	printf("pci_bios_read_cfg_word:          %d\n", RELOC_16(0xf000, num_pci_bios_read_cfg_word));
 	printf("pci_bios_read_cfg_dword:         %d\n", RELOC_16(0xf000, num_pci_bios_read_cfg_dword));
@@ -84,52 +84,52 @@ void print_bios_bios_stat(void)
 static u32 probe_pci_video(void)
 {
 	pci_dev_t devbusfn;
-	
-	if ((devbusfn = pci_find_class(PCI_CLASS_VIDEO, 
-				       PCI_CLASS_VIDEO_STD, 
+
+	if ((devbusfn = pci_find_class(PCI_CLASS_VIDEO,
+				       PCI_CLASS_VIDEO_STD,
 				       PCI_CLASS_VIDEO_PROG_IF_VGA, 0)) != -1) {
 		u32 old;
 		u32 addr;
-		
+
 		/* PCI video device detected */
-		printf("Found PCI VGA device at %02x.%02x.%x\n", 
+		printf("Found PCI VGA device at %02x.%02x.%x\n",
 		       PCI_BUS(devbusfn), PCI_DEV(devbusfn), PCI_FUNC(devbusfn));
-		
+
 		/* Enable I/O decoding as well, PCI viudeo boards
 		 * support I/O accesses, but they provide no
 		 * bar register for this since the ports are fixed.
 		 */
 		pci_write_config_word(devbusfn, PCI_COMMAND, PCI_COMMAND_MEMORY | PCI_COMMAND_IO | PCI_COMMAND_MASTER);
-		
+
 		/* Test the ROM decoder, do the device support a rom? */
-		pci_read_config_dword(devbusfn, PCI_ROM_ADDRESS, &old);		
+		pci_read_config_dword(devbusfn, PCI_ROM_ADDRESS, &old);
 		pci_write_config_dword(devbusfn, PCI_ROM_ADDRESS, PCI_ROM_ADDRESS_MASK);
 		pci_read_config_dword(devbusfn, PCI_ROM_ADDRESS, &addr);
 		pci_write_config_dword(devbusfn, PCI_ROM_ADDRESS, old);
-				
+
 		if (!addr) {
 			printf("PCI VGA have no ROM?\n");
 			return 0;
 		}
-		
+
 		/* device have a rom */
-		if (pci_shadow_rom(devbusfn, (void*)0xc0000)) { 
+		if (pci_shadow_rom(devbusfn, (void*)0xc0000)) {
 			printf("Shadowing of PCI VGA BIOS failed\n");
 			return 0;
 		}
-		
+
 		/* Now enable lagacy VGA port access */
 		if (pci_enable_legacy_video_ports(pci_bus_to_hose(PCI_BUS(devbusfn)))) {
 			printf("PCI VGA enable failed\n");
 			return 0;
 		}
-				
-	
+
+
 		/* return the pci device info, that we'll need later */
-		return PCI_BUS(devbusfn) << 8 | 
+		return PCI_BUS(devbusfn) << 8 |
 			PCI_DEV(devbusfn) << 3 | (PCI_FUNC(devbusfn)&7);
 	}
-	
+
 	return 0;
 }
 
@@ -139,8 +139,8 @@ static u32 probe_pci_video(void)
 static int probe_isa_video(void)
 {
 	u32 ptr;
-	char *buf;	
-	
+	char *buf;
+
 	if (0 == (ptr = isa_map_rom(0xc0000, 0x8000))) {
 		return -1;
 	}
@@ -153,14 +153,14 @@ static int probe_isa_video(void)
 		isa_unmap_rom(ptr);
 		return -1;
 	}
-	
+
 	/* shadow the rom */
 	memcpy(buf, (void*)ptr, 0x8000);
 	isa_unmap_rom(ptr);
 	memcpy((void*)0xc0000, buf, 0x8000);
-	
+
 	free(buf);
-	
+
 	return 0;
 }
 
@@ -169,20 +169,20 @@ int video_bios_init(void)
 	struct pt_regs regs;
 
 	/* clear the video bios area in case we warmbooted */
-	memset((void*)0xc0000, 0, 0x8000);	
+	memset((void*)0xc0000, 0, 0x8000);
 	memset(&regs, 0, sizeof(struct pt_regs));
-	
+
 	if (probe_isa_video()) {
 		/* No ISA board found, try the PCI bus */
 		regs.eax = probe_pci_video();
 	}
-	
+
 	/* Did we succeed in mapping any video bios */
 	if (readw(0xc0000) == 0xaa55) {
 	        int size;
 		int i;
 		u8 sum;
-		
+
 		PRINTF("Found video bios signature\n");
 		size = 512*readb(0xc0002);
 		PRINTF("size %d\n", size);
@@ -194,28 +194,26 @@ int video_bios_init(void)
 		if (sum) {
 			return 1;
 		}
-		
+
 		/* some video bioses (ATI Mach64) seem to think that
 		 * the original int 10 handler is always at
 		 * 0xf000:0xf065 , place an iret instruction there
 		 */
 		writeb(0xcf, 0xff065);
-		
+
 		regs.esp = 0x8000;
 		regs.xss = 0x2000;
 		enter_realmode(0xc000, 3, &regs, &regs);
 		PRINTF("INT 0x10 vector after:  %04x:%04x\n",
-		       readw(0x42), readw(0x40)); 
+		       readw(0x42), readw(0x40));
 		PRINTF("BIOS returned %scarry\n", regs.eflags & 1?"":"NOT ");
-#ifdef PCI_BIOS_DEBUG		
+#ifdef PCI_BIOS_DEBUG
 		print_bios_bios_stat();
-#endif		
+#endif
 		return (regs.eflags & 1);
-		
+
 	}
-	
-	return 1;
-	
-}
 
+	return 1;
 
+}