projects
/
coreboot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
printk_foo -> printk(BIOS_FOO, ...)
[coreboot.git]
/
src
/
southbridge
/
via
/
vt8231
/
vt8231_ide.c
diff --git
a/src/southbridge/via/vt8231/vt8231_ide.c
b/src/southbridge/via/vt8231/vt8231_ide.c
index dd0e1bb4192e402be20a4cfd661079fce2b8131e..c1df5ef5cd100b6bcbc36503b71d1329ee009a8e 100644
(file)
--- a/
src/southbridge/via/vt8231/vt8231_ide.c
+++ b/
src/southbridge/via/vt8231/vt8231_ide.c
@@
-3,7
+3,6
@@
#include <device/pci.h>
#include <device/pci_ops.h>
#include <device/pci_ids.h>
#include <device/pci.h>
#include <device/pci_ops.h>
#include <device/pci_ids.h>
-#include "vt8231.h"
#include "chip.h"
static void ide_init(struct device *dev)
#include "chip.h"
static void ide_init(struct device *dev)
@@
-14,28
+13,28
@@
static void ide_init(struct device *dev)
if (!conf->enable_native_ide) {
// Run the IDE controller in 'compatiblity mode - i.e. don't use PCI
// interrupts. Using PCI ints confuses linux for some reason.
if (!conf->enable_native_ide) {
// Run the IDE controller in 'compatiblity mode - i.e. don't use PCI
// interrupts. Using PCI ints confuses linux for some reason.
- /* Setting reg 0x42 here does not work. It is set in mainboard/
auto
.c
+ /* Setting reg 0x42 here does not work. It is set in mainboard/
romstage
.c
* It probably can only be changed while the IDE is disabled
* or it is possibly a timing issue. Ben Hewson 29 Apr 2007.
*/
/*
* It probably can only be changed while the IDE is disabled
* or it is possibly a timing issue. Ben Hewson 29 Apr 2007.
*/
/*
- printk
_info("%s: enabling compatibility IDE addresses\n", __FUNCTION
__);
+ printk
(BIOS_INFO, "%s: enabling compatibility IDE addresses\n", __func
__);
enables = pci_read_config8(dev, 0x42);
enables = pci_read_config8(dev, 0x42);
- printk
_debug(
"enables in reg 0x42 0x%x\n", enables);
+ printk
(BIOS_DEBUG,
"enables in reg 0x42 0x%x\n", enables);
enables &= ~0xc0; // compatability mode
pci_write_config8(dev, 0x42, enables);
enables = pci_read_config8(dev, 0x42);
enables &= ~0xc0; // compatability mode
pci_write_config8(dev, 0x42, enables);
enables = pci_read_config8(dev, 0x42);
- 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);
*/
}
enables = pci_read_config8(dev, 0x40);
*/
}
enables = pci_read_config8(dev, 0x40);
- printk
_debug(
"enables in reg 0x40 0x%x\n", enables);
+ printk
(BIOS_DEBUG,
"enables in reg 0x40 0x%x\n", enables);
enables |= 3;
pci_write_config8(dev, 0x40, enables);
enables = pci_read_config8(dev, 0x40);
enables |= 3;
pci_write_config8(dev, 0x40, enables);
enables = pci_read_config8(dev, 0x40);
- 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 prefetch buffers
enables = pci_read_config8(dev, 0x41);
// Enable prefetch buffers
enables = pci_read_config8(dev, 0x41);
@@
-59,7
+58,7
@@
static void ide_init(struct device *dev)
// kevinh@ispiri.com - the standard linux drivers seem ass slow when
// used in native mode - I've changed back to classic
enables = pci_read_config8(dev, 0x9);
// kevinh@ispiri.com - the standard linux drivers seem ass slow when
// used in native mode - I've changed back to classic
enables = pci_read_config8(dev, 0x9);
- printk
_debug(
"enables in reg 0x9 0x%x\n", enables);
+ printk
(BIOS_DEBUG,
"enables in reg 0x9 0x%x\n", enables);
// by the book, set the low-order nibble to 0xa.
if (conf->enable_native_ide) {
enables &= ~0xf;
// by the book, set the low-order nibble to 0xa.
if (conf->enable_native_ide) {
enables &= ~0xf;
@@
-71,11
+70,11
@@
static void ide_init(struct device *dev)
pci_write_config8(dev, 0x9, enables);
enables = pci_read_config8(dev, 0x9);
pci_write_config8(dev, 0x9, enables);
enables = pci_read_config8(dev, 0x9);
- printk
_debug(
"enables in reg 0x9 read back as 0x%x\n", enables);
+ printk
(BIOS_DEBUG,
"enables in reg 0x9 read back as 0x%x\n", enables);
// standard bios sets master bit.
enables = pci_read_config8(dev, 0x4);
// standard bios sets master bit.
enables = pci_read_config8(dev, 0x4);
- printk
_debug(
"command in reg 0x4 0x%x\n", enables);
+ printk
(BIOS_DEBUG,
"command in reg 0x4 0x%x\n", enables);
enables |= 7;
// No need for stepping - kevinh@ispiri.com
enables |= 7;
// No need for stepping - kevinh@ispiri.com
@@
-83,7
+82,7
@@
static void ide_init(struct device *dev)
pci_write_config8(dev, 0x4, enables);
enables = pci_read_config8(dev, 0x4);
pci_write_config8(dev, 0x4, enables);
enables = pci_read_config8(dev, 0x4);
- printk
_debug(
"command in reg 0x4 reads back as 0x%x\n", enables);
+ printk
(BIOS_DEBUG,
"command in reg 0x4 reads back as 0x%x\n", enables);
if (!conf->enable_native_ide) {
// Use compatability mode - per award bios
if (!conf->enable_native_ide) {
// Use compatability mode - per award bios
@@
-107,7
+106,7
@@
static struct device_operations ide_ops = {
.ops_pci = 0,
};
.ops_pci = 0,
};
-static struct pci_driver northbridge_driver __pci_driver = {
+static
const
struct pci_driver northbridge_driver __pci_driver = {
.ops = &ide_ops,
.vendor = PCI_VENDOR_ID_VIA,
.device = PCI_DEVICE_ID_VIA_82C586_1,
.ops = &ide_ops,
.vendor = PCI_VENDOR_ID_VIA,
.device = PCI_DEVICE_ID_VIA_82C586_1,