From c02b4fc9db3c3c1e263027382697b566127f66bb Mon Sep 17 00:00:00 2001 From: Stefan Reinauer Date: Mon, 22 Mar 2010 11:42:32 +0000 Subject: printk_foo -> printk(BIOS_FOO, ...) Signed-off-by: Stefan Reinauer Acked-by: Ronald G. Minnich git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5266 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1 --- src/northbridge/via/vx800/examples/chipset_init.c | 60 +++++++++++------------ src/northbridge/via/vx800/examples/romstage.c | 6 +-- src/northbridge/via/vx800/northbridge.c | 6 +-- src/northbridge/via/vx800/vga.c | 14 +++--- src/northbridge/via/vx800/vgabios.c | 50 +++++++++---------- src/northbridge/via/vx800/vx800_ide.c | 6 +-- src/northbridge/via/vx800/vx800_lpc.c | 27 +++++----- 7 files changed, 83 insertions(+), 86 deletions(-) (limited to 'src/northbridge/via/vx800') diff --git a/src/northbridge/via/vx800/examples/chipset_init.c b/src/northbridge/via/vx800/examples/chipset_init.c index c04da9cbc8..08d3c95048 100644 --- a/src/northbridge/via/vx800/examples/chipset_init.c +++ b/src/northbridge/via/vx800/examples/chipset_init.c @@ -261,7 +261,7 @@ void AcpiInit(void) // Get SB Revision sbchiprev = pci_rawread_config8(rawdevice, 0xf6); - printk_debug("SB chip revision =%x\n", sbchiprev); + printk(BIOS_DEBUG, "SB chip revision =%x\n", sbchiprev); // Fill Register Table via_pci_inittable(sbchiprev, mSbStage1InitTbl); @@ -279,7 +279,7 @@ void Stage2NbInit(void) u32 subid = 0; rawdevice = PCI_RAWDEV(0, 0, 4); nbchiprev = pci_rawread_config8(rawdevice, 0xf6); - printk_debug("NB chip revision =%x\n", nbchiprev); + printk(BIOS_DEBUG, "NB chip revision =%x\n", nbchiprev); via_pci_inittable(nbchiprev, mNbStage2InitTable); @@ -414,7 +414,7 @@ void InitEHCI(u8 Number, u8 bEnable) // Get Chipset Revision EHCIRevision = pci_rawread_config8(PCI_RAWDEV(0, 0x10, 4), 0xF6); - printk_debug("EHCI Revision =%x\n", EHCIRevision); + printk(BIOS_DEBUG, "EHCI Revision =%x\n", EHCIRevision); via_pci_inittable(EHCIRevision, mEHCIInitTable); } } @@ -567,7 +567,7 @@ void Stage2SbInit(void) rawdevice = PCI_RAWDEV(0, 11, 0); sbchiprev = pci_rawread_config8(rawdevice, 0xf6); - printk_debug("SB chip revision =%x\n", sbchiprev); + printk(BIOS_DEBUG, "SB chip revision =%x\n", sbchiprev); //SBBasicInit via_pci_inittable(sbchiprev, mBusControllerInitTable); @@ -592,7 +592,7 @@ void Stage2SbInit(void) void init_VIA_chipset(void) { - printk_debug("In: init_VIA_chipset\n"); + printk(BIOS_DEBUG, "In: init_VIA_chipset\n"); //1.nbstage1 is done in raminit. //2.sbstage1 AcpiInit(); @@ -604,7 +604,7 @@ void init_VIA_chipset(void) //5.open hdac pci_rawmodify_config32(PCI_RAWDEV(0, 0x11, 7), 0xd1, 0, 0x04); - printk_debug("End: init_VIA_chipset\n"); + printk(BIOS_DEBUG, "End: init_VIA_chipset\n"); } /** @@ -630,7 +630,7 @@ void hardwaremain(int boot_complete) u8 y, x; init_VIA_chipset(); - printk_emerg("file '%s', line %d\n\n", __FILE__, __LINE__); + printk(BIOS_EMERG, "file '%s', line %d\n\n", __FILE__, __LINE__); #if 0 @@ -653,90 +653,90 @@ void hardwaremain(int boot_complete) //pci_rawmodify_config8(PCI_RAWDEV(0, 0x11, 0), 0x50, 0x00, 0x76);//open all usb and usb mode //pci_rawmodify_config8(PCI_RAWDEV(0, 0x11, 0), 0x50, 0x76, 0x76);//close all usb - printk_info("=================SB 50h=%02x \n", + printk(BIOS_INFO, "=================SB 50h=%02x \n", pci_rawread_config8(PCI_RAWDEV(0, 0x11, 0), 0x50)); /* FIXME: Is there a better way to handle this? */ init_timer(); - printk_emerg("file '%s', line %d\n\n", __FILE__, __LINE__); + printk(BIOS_EMERG, "file '%s', line %d\n\n", __FILE__, __LINE__); /* Find the devices we don't have hard coded knowledge about. */ dev_enumerate(); - printk_emerg("file '%s', line %d\n\n", __FILE__, __LINE__); + printk(BIOS_EMERG, "file '%s', line %d\n\n", __FILE__, __LINE__); #if 0 x = y = 0; - printk_info("dump ehci3 \n"); + printk(BIOS_INFO, "dump ehci3 \n"); for (; x < 16; x++) { y = 0; for (; y < 16; y++) { - printk_info("%02x ", + printk(BIOS_INFO, "%02x ", pci_rawread_config8(PCI_RAWDEV (0, 0x10, 4), x * 16 + y)); } - printk_info("\n"); + printk(BIOS_INFO, "\n"); } #endif post_code(0x66); /* Now compute and assign the bus resources. */ dev_configure(); - printk_emerg("file '%s', line %d\n\n", __FILE__, __LINE__); + printk(BIOS_EMERG, "file '%s', line %d\n\n", __FILE__, __LINE__); #if 0 x = y = 0; - printk_info("dump ehci3 \n"); + printk(BIOS_INFO, "dump ehci3 \n"); for (; x < 16; x++) { y = 0; for (; y < 16; y++) { - printk_info("%02x ", + printk(BIOS_INFO, "%02x ", pci_rawread_config8(PCI_RAWDEV (0, 0x10, 4), x * 16 + y)); } - printk_info("\n"); + printk(BIOS_INFO, "\n"); } #endif post_code(0x88); /* Now actually enable devices on the bus */ dev_enable(); - printk_emerg("file '%s', line %d\n\n", __FILE__, __LINE__); + printk(BIOS_EMERG, "file '%s', line %d\n\n", __FILE__, __LINE__); /* And of course initialize devices on the bus */ #if 0 x = y = 0; - printk_info("dump ehci3 \n"); + printk(BIOS_INFO, "dump ehci3 \n"); for (; x < 16; x++) { y = 0; for (; y < 16; y++) { - printk_info("%02x ", + printk(BIOS_INFO, "%02x ", pci_rawread_config8(PCI_RAWDEV (0, 0x10, 4), x * 16 + y)); } - printk_info("\n"); + printk(BIOS_INFO, "\n"); } #endif dev_initialize(); post_code(0x89); - printk_emerg("file '%s', line %d\n\n", __FILE__, __LINE__); + printk(BIOS_EMERG, "file '%s', line %d\n\n", __FILE__, __LINE__); // pci_rawwrite_config16(PCI_RAWDEV(0, 0xf, 0), 0xBA, 0x0571); #if 0 x = y = 0; - printk_info("dump ehci3 \n"); + printk(BIOS_INFO, "dump ehci3 \n"); for (; x < 16; x++) { y = 0; for (; y < 16; y++) { - printk_info("%02x ", + printk(BIOS_INFO, "%02x ", pci_rawread_config8(PCI_RAWDEV (0, 0x10, 4), x * 16 + y)); } - printk_info("\n"); + printk(BIOS_INFO, "\n"); } #endif @@ -1265,25 +1265,25 @@ for(i=0;i<5;i++){ #if 1 struct device *dev; - printk_info("=========zjldump all devices...\n"); + printk(BIOS_INFO, "=========zjldump all devices...\n"); for (dev = all_devices; dev; dev = dev->next) { if (dev->path.type == DEVICE_PATH_PCI) { - printk_debug("%s dump\n", dev_path(dev)); + printk(BIOS_DEBUG, "%s dump\n", dev_path(dev)); x = y = 0; for (; x < 16; x++) { y = 0; for (; y < 16; y++) { - printk_info("%02x ", + printk(BIOS_INFO, "%02x ", pci_read_config8(dev, x * 16 + y)); } - printk_info("\n"); + printk(BIOS_INFO, "\n"); } } - printk_info("\n"); + printk(BIOS_INFO, "\n"); } #endif diff --git a/src/northbridge/via/vx800/examples/romstage.c b/src/northbridge/via/vx800/examples/romstage.c index c1de3f3dc2..c7efb51791 100644 --- a/src/northbridge/via/vx800/examples/romstage.c +++ b/src/northbridge/via/vx800/examples/romstage.c @@ -574,7 +574,7 @@ So, I use: #include "cpu/via/car/cache_as_ram_post.c". my via-version post.c hav __asm__ volatile ("movl %%esp, %0\n\t":"=a" (v_esp) ); #if CONFIG_USE_INIT - printk_debug("v_esp=%08x\r\n", v_esp); + printk(BIOS_DEBUG, "v_esp=%08x\r\n", v_esp); #else print_debug("v_esp="); print_debug_hex32(v_esp); @@ -590,7 +590,7 @@ So, I use: #include "cpu/via/car/cache_as_ram_post.c". my via-version post.c hav //stack cpu_reset = 0; #if CONFIG_USE_INIT - printk_debug("cpu_reset = %08x\r\n", cpu_reset); + printk(BIOS_DEBUG, "cpu_reset = %08x\r\n", cpu_reset); #else print_debug("cpu_reset = "); print_debug_hex32(cpu_reset); @@ -642,7 +642,7 @@ So, I use: #include "cpu/via/car/cache_as_ram_post.c". my via-version post.c hav print_debug("Use Ram as Stack now - \r\n"); } #if CONFIG_USE_INIT - printk_debug("new_cpu_reset = %08x\r\n", new_cpu_reset); + printk(BIOS_DEBUG, "new_cpu_reset = %08x\r\n", new_cpu_reset); #else print_debug("new_cpu_reset = "); print_debug_hex32(new_cpu_reset); diff --git a/src/northbridge/via/vx800/northbridge.c b/src/northbridge/via/vx800/northbridge.c index d1f60635bb..9ec54da399 100644 --- a/src/northbridge/via/vx800/northbridge.c +++ b/src/northbridge/via/vx800/northbridge.c @@ -126,7 +126,7 @@ static void pci_domain_set_resources(device_t dev) u32 pci_tolm; u8 reg; - printk_spew("Entering vx800 pci_domain_set_resources.\n"); + printk(BIOS_SPEW, "Entering vx800 pci_domain_set_resources.\n"); pci_tolm = find_pci_tolm(&dev->link[0]); mc_dev = dev_find_device(PCI_VENDOR_ID_VIA, @@ -162,7 +162,7 @@ if register with invalid value we set frame buffer size to 32M for default, but (((rambits << 6) - (4 << reg) - VIACONFIG_TOP_SM_SIZE_MB) * 1024); - printk_spew("tomk is 0x%x\n", tomk); + printk(BIOS_SPEW, "tomk is 0x%x\n", tomk); /* Compute the Top Of Low Memory, in Kb */ tolmk = pci_tolm >> 10; if (tolmk >= tomk) { @@ -206,7 +206,7 @@ static const struct device_operations cpu_bus_ops = { static void enable_dev(struct device *dev) { - printk_spew("In VX800 enable_dev for device %s.\n", dev_path(dev)); + printk(BIOS_SPEW, "In VX800 enable_dev for device %s.\n", dev_path(dev)); /* Set the operations if it is a special bus type */ if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) { diff --git a/src/northbridge/via/vx800/vga.c b/src/northbridge/via/vx800/vga.c index 732963de46..58d70c33c3 100644 --- a/src/northbridge/via/vx800/vga.c +++ b/src/northbridge/via/vx800/vga.c @@ -53,7 +53,7 @@ void write_protect_vgabios(void) { device_t dev; - printk_info("write_protect_vgabios\n"); + printk(BIOS_INFO, "write_protect_vgabios\n"); /* there are two possible devices. Just do both. */ dev = dev_find_device(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_VX855_MEMCTRL, 0); @@ -85,16 +85,16 @@ static void vga_init(device_t dev) pci_write_config32(dev, 0x14, VIACONFIG_VGA_PCI_14); pci_write_config8(dev, 0x3c, 0x0a); //same with vx855_lpc.c //*/ - printk_emerg("file '%s', line %d\n\n", __FILE__, __LINE__); + printk(BIOS_EMERG, "file '%s', line %d\n\n", __FILE__, __LINE__); #if 1 - printk_debug("INSTALL REAL-MODE IDT\n"); + printk(BIOS_DEBUG, "INSTALL REAL-MODE IDT\n"); setup_realmode_idt(); - printk_debug("DO THE VGA BIOS\n"); + printk(BIOS_DEBUG, "DO THE VGA BIOS\n"); do_vgabios(); if ((acpi_sleep_type == 3)/* || (PAYLOAD_IS_SEABIOS == 0)*/) { - printk_debug("Enable VGA console\n"); + printk(BIOS_DEBUG, "Enable VGA console\n"); // remove this function since in cn700 it is said "VGA seems to work without this, but crash & burn with it" //but the existense of vga_enable_console() seems do not hurt my coreboot. XP+ubuntu s3 can resume with and without this function. //and remove it also do not help my s3 problem: desktop screen have some thin black line, after resuming back to win. @@ -102,7 +102,7 @@ static void vga_init(device_t dev) } #else /* Attempt to manually force the rom to load */ - printk_debug("Forcing rom load\r\n"); + printk(BIOS_DEBUG, "Forcing rom load\r\n"); pci_rom_load(dev, 0xfff80000); run_bios(dev, 0xc0000); #endif @@ -122,7 +122,7 @@ static void vga_init(device_t dev) outb(0x39, SR_INDEX); outb(reg8, SR_DATA); */ } - printk_emerg("file '%s', line %d\n\n", __FILE__, __LINE__); + printk(BIOS_EMERG, "file '%s', line %d\n\n", __FILE__, __LINE__); } diff --git a/src/northbridge/via/vx800/vgabios.c b/src/northbridge/via/vx800/vgabios.c index b536b5825d..2a99b9c4c7 100644 --- a/src/northbridge/via/vx800/vgabios.c +++ b/src/northbridge/via/vx800/vgabios.c @@ -302,7 +302,7 @@ void do_vgabios(void) u16 tmp; u8 tmp8; - printk_emerg("file '%s', line %d\n\n", __FILE__, __LINE__); + printk(BIOS_EMERG, "file '%s', line %d\n\n", __FILE__, __LINE__); /* clear vga bios data area */ for (i = 0x400; i < 0x500; i++) { @@ -312,24 +312,24 @@ void do_vgabios(void) dev = dev_find_class(PCI_CLASS_DISPLAY_VGA << 8, 0); if (!dev) { - printk_debug("NO VGA FOUND\n"); + printk(BIOS_DEBUG, "NO VGA FOUND\n"); return; } - printk_debug("found VGA: vid=%x, did=%x\n", dev->vendor, dev->device); + printk(BIOS_DEBUG, "found VGA: vid=%x, did=%x\n", dev->vendor, dev->device); /* declare rom address here - keep any config data out of the way * of core LXB stuff */ rom = cbfs_load_optionrom(dev->vendor, dev->device, 0); pci_write_config32(dev, PCI_ROM_ADDRESS, rom | 1); - printk_debug("rom base: %x\n", rom); + printk(BIOS_DEBUG, "rom base: %x\n", rom); buf = (unsigned char *)rom; - printk_emerg("file '%s', line %d\n\n", __FILE__, __LINE__); + printk(BIOS_EMERG, "file '%s', line %d\n\n", __FILE__, __LINE__); if ((buf[0] == 0x55) && (buf[1] == 0xaa)) { memcpy((void *)0xc0000, buf, size); - printk_emerg("file '%s', line %d\n\n", __FILE__, __LINE__); + printk(BIOS_EMERG, "file '%s', line %d\n\n", __FILE__, __LINE__); write_protect_vgabios(); // in northbridge @@ -338,14 +338,14 @@ void do_vgabios(void) if (buf[0] == 0x55 && buf[1] == 0xAA) { busdevfn = (dev->bus->secondary << 8) | dev->path.pci.devfn; - printk_debug("bus/devfn = %#x\n", busdevfn); + printk(BIOS_DEBUG, "bus/devfn = %#x\n", busdevfn); real_mode_switch_call_vga(busdevfn); } else - printk_debug("Failed to copy VGA BIOS to 0xc0000\n"); + printk(BIOS_DEBUG, "Failed to copy VGA BIOS to 0xc0000\n"); } else - printk_debug("BAD SIGNATURE 0x%x 0x%x\n", buf[0], buf[1]); + printk(BIOS_DEBUG, "BAD SIGNATURE 0x%x 0x%x\n", buf[0], buf[1]); - printk_emerg("file '%s', line %d\n\n", __FILE__, __LINE__); + printk(BIOS_EMERG, "file '%s', line %d\n\n", __FILE__, __LINE__); pci_write_config32(dev, PCI_ROM_ADDRESS, 0); } @@ -513,12 +513,12 @@ int biosint(unsigned long intnumber, cs = cs_ip >> 16; flags = stackflags; - printk_debug("biosint: INT# 0x%lx\n", intnumber); - printk_debug("biosint: eax 0x%lx ebx 0x%lx ecx 0x%lx edx 0x%lx\n", + printk(BIOS_DEBUG, "biosint: INT# 0x%lx\n", intnumber); + printk(BIOS_DEBUG, "biosint: eax 0x%lx ebx 0x%lx ecx 0x%lx edx 0x%lx\n", eax, ebx, ecx, edx); - printk_debug("biosint: ebp 0x%lx esp 0x%lx edi 0x%lx esi 0x%lx\n", + printk(BIOS_DEBUG, "biosint: ebp 0x%lx esp 0x%lx edi 0x%lx esi 0x%lx\n", ebp, esp, edi, esi); - printk_debug("biosint: ip 0x%x cs 0x%x flags 0x%x\n", + printk(BIOS_DEBUG, "biosint: ip 0x%x cs 0x%x flags 0x%x\n", ip, cs, flags); // cases in a good compiler are just as good as your own tables. @@ -527,16 +527,16 @@ int biosint(unsigned long intnumber, case 6: case 7: case 8: case 9: case 10: case 11: case 12: case 13: case 14: case 15: // These are not BIOS service, but the CPU-generated exceptions - printk_info("biosint: Oops, exception %u\n", intnumber); + printk(BIOS_INFO, "biosint: Oops, exception %u\n", intnumber); if (esp < 0x1000) { - printk_debug("Stack contents: "); + printk(BIOS_DEBUG, "Stack contents: "); while (esp < 0x1000) { - printk_debug("0x%04x ", *(unsigned short *)esp); + printk(BIOS_DEBUG, "0x%04x ", *(unsigned short *)esp); esp += 2; } - printk_debug("\n"); + printk(BIOS_DEBUG, "\n"); } - printk_debug("biosint: Bailing out\n"); + printk(BIOS_DEBUG, "biosint: Bailing out\n"); // "longjmp" if ((acpi_sleep_type == 3)/* || (PAYLOAD_IS_SEABIOS == 0)*/) // add this to keep same with kevin's seabios patch in 2008-9-8 vga_exit(); @@ -556,7 +556,7 @@ int biosint(unsigned long intnumber, &ebx, &edx, &ecx, &eax, &flags); break; default: - printk_info("BIOSINT: Unsupport int #0x%x\n", intnumber); + printk(BIOS_INFO, "BIOSINT: Unsupport int #0x%x\n", intnumber); break; } if (ret) @@ -686,7 +686,7 @@ pcibios(unsigned long *pedi, unsigned long *pesi, unsigned long *pebp, // devfn is an int, so we mask it off. busdevfn = (dev->bus->secondary << 8) | (dev->path.pci.devfn & 0xff); - printk_debug("0x%x: return 0x%x\n", func, + printk(BIOS_DEBUG, "0x%x: return 0x%x\n", func, busdevfn); *pebx = busdevfn; retval = 0; @@ -713,8 +713,7 @@ pcibios(unsigned long *pedi, unsigned long *pesi, unsigned long *pebp, reg = *pedi; dev = dev_find_slot(bus, devfn); if (!dev) { - printk_debug - ("0x%x: BAD DEVICE bus %d devfn 0x%x\n", + printk(BIOS_DEBUG, "0x%x: BAD DEVICE bus %d devfn 0x%x\n", func, bus, devfn); // idiots. the pcibios guys assumed you'd never pass a bad bus/devfn! *peax = PCIBIOS_BADREG; @@ -749,15 +748,14 @@ pcibios(unsigned long *pedi, unsigned long *pesi, unsigned long *pebp, if (retval) retval = PCIBIOS_BADREG; - printk_debug - ("0x%x: bus %d devfn 0x%x reg 0x%x val 0x%lx\n", + printk(BIOS_DEBUG, "0x%x: bus %d devfn 0x%x reg 0x%x val 0x%lx\n", func, bus, devfn, reg, *pecx); *peax = 0; retval = 0; } break; default: - printk_err("UNSUPPORTED PCIBIOS FUNCTION 0x%x\n", func); + printk(BIOS_ERR, "UNSUPPORTED PCIBIOS FUNCTION 0x%x\n", func); break; } diff --git a/src/northbridge/via/vx800/vx800_ide.c b/src/northbridge/via/vx800/vx800_ide.c index 673d6152ad..b3d6bc2c02 100644 --- a/src/northbridge/via/vx800/vx800_ide.c +++ b/src/northbridge/via/vx800/vx800_ide.c @@ -169,7 +169,7 @@ static void ide_init(struct device *dev) uint8_t enables, Rx89, RxC0; u8 i, data; struct ATA_REG_INIT_TABLE *pEntry; - printk_info("ide_init\n"); + printk(BIOS_INFO, "ide_init\n"); #if 1 /*these 3 lines help to keep interl back door for DID VID SUBID untouched */ @@ -207,14 +207,14 @@ static void ide_init(struct device *dev) enables |= 0x02; pci_write_config8(dev, IDE_CS, enables); enables = pci_read_config8(dev, IDE_CS); - printk_debug("Enables in reg 0x40 read back as 0x%x\n", enables); + printk(BIOS_DEBUG, "Enables in reg 0x40 read back as 0x%x\n", enables); /* Enable only compatibility mode. */ enables = pci_read_config8(dev, IDE_CONF_II); enables &= ~0xc0; pci_write_config8(dev, IDE_CONF_II, enables); enables = pci_read_config8(dev, IDE_CONF_II); - printk_debug("Enables in reg 0x42 read back as 0x%x\n", enables); + printk(BIOS_DEBUG, "Enables in reg 0x42 read back as 0x%x\n", enables); /* Enable prefetch buffers. */ enables = pci_read_config8(dev, IDE_CONF_I); diff --git a/src/northbridge/via/vx800/vx800_lpc.c b/src/northbridge/via/vx800/vx800_lpc.c index 2a4550ab45..7a74b65d3d 100644 --- a/src/northbridge/via/vx800/vx800_lpc.c +++ b/src/northbridge/via/vx800/vx800_lpc.c @@ -58,7 +58,7 @@ static unsigned char *pin_to_irq(const unsigned char *pin) static void pci_routing_fixup(struct device *dev) { - printk_info("%s: dev is %p\n", __FUNCTION__, dev); + printk(BIOS_INFO, "%s: dev is %p\n", __FUNCTION__, dev); /* set up PCI IRQ routing */ pci_write_config8(dev, 0x55, pciIrqs[0] << 4); @@ -66,42 +66,42 @@ static void pci_routing_fixup(struct device *dev) pci_write_config8(dev, 0x57, pciIrqs[3] << 4); /* VGA */ - printk_info("setting vga\n"); + printk(BIOS_INFO, "setting vga\n"); pci_assign_irqs(0, 0x1, pin_to_irq(vgaPins)); /* PCI slot */ - printk_info("setting pci slot\n"); + printk(BIOS_INFO, "setting pci slot\n"); pci_assign_irqs(0, 0x08, pin_to_irq(slotPins)); /* PCI slot */ - printk_info("setting USB Device Controller\n"); + printk(BIOS_INFO, "setting USB Device Controller\n"); pci_assign_irqs(0, 0x0b, pin_to_irq(usbdevicePins)); /* PCI slot */ - printk_info("setting SDIO Controller\n"); + printk(BIOS_INFO, "setting SDIO Controller\n"); pci_assign_irqs(0, 0x0c, pin_to_irq(sdioPins)); /* PCI slot */ - printk_info("setting SD $ MS Controller\n"); + printk(BIOS_INFO, "setting SD $ MS Controller\n"); pci_assign_irqs(0, 0x0d, pin_to_irq(sd_ms_ctrl_Pins)); /* PCI slot */ - printk_info("setting CE-ATA NF Controller(Card Boot)\n"); + printk(BIOS_INFO, "setting CE-ATA NF Controller(Card Boot)\n"); pci_assign_irqs(0, 0x0e, pin_to_irq(ce_ata_nf_ctrl_Pins)); /* PCI slot */ - printk_info("setting ide\n"); + printk(BIOS_INFO, "setting ide\n"); //pci_assign_irqs(0, 0x0f, pin_to_irq(idePins)); /* Standard usb components */ - printk_info("setting usb1-2\n"); + printk(BIOS_INFO, "setting usb1-2\n"); // pci_assign_irqs(0, 0x10, pin_to_irq(usbPins)); /* sound hardware */ - printk_info("setting hdac audio\n"); + printk(BIOS_INFO, "setting hdac audio\n"); pci_assign_irqs(0, 0x14, pin_to_irq(hdacaudioPins)); - printk_spew("%s: DONE\n", __FUNCTION__); + printk(BIOS_SPEW, "%s: DONE\n", __FUNCTION__); } void setup_pm(device_t dev) @@ -335,7 +335,7 @@ void vx800_enable_resources(device_t dev) static void southbridge_init(struct device *dev) { - printk_debug("vx800 sb init\n"); + printk(BIOS_DEBUG, "vx800 sb init\n"); vx800_sb_init(dev); pci_routing_fixup(dev); @@ -343,8 +343,7 @@ static void southbridge_init(struct device *dev) /* turn on keyboard and RTC, no need to visit this reg twice */ pc_keyboard_init(0); - printk_debug - ("ps2 usb lid, you set who can wakeup system from s3 sleep\n"); + printk(BIOS_DEBUG, "ps2 usb lid, you set who can wakeup system from s3 sleep\n"); S3_ps2_kb_ms_wakeup(dev); S3_usb_wakeup(dev); -- cgit v1.2.3