coreboot-v2: drop this ugly historic union name in v2 that was dropped in v3

a long time ago. This will make it easier to port v2 boards forward to v3 at
some point (and other things)

Signed-off-by: Stefan Reinauer <stepan@coresystems.de>
Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006@gmx.net>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3964 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Stefan Reinauer
2009-02-28 20:10:20 +00:00
committed by Stefan Reinauer
parent 3c924d2f48
commit 2b34db8d1d
99 changed files with 433 additions and 345 deletions

View File

@@ -37,7 +37,7 @@ static void init(device_t dev)
conf = dev->chip_info;
switch (dev->path.u.pnp.device) {
switch (dev->path.pnp.device) {
case FDC37M60X_FDC: /* TODO. */
break;
case FDC37M60X_PP: /* TODO. */

View File

@@ -140,7 +140,7 @@ static void lpc47b272_init(device_t dev)
if (!dev->enabled)
return;
switch(dev->path.u.pnp.device) {
switch(dev->path.pnp.device) {
case LPC47B272_SP1:
res0 = find_resource(dev, PNP_IDX_IO0);
init_uart8250(res0->base, &conf->com1);
@@ -171,7 +171,7 @@ static void lpc47b272_init(device_t dev)
//
static void pnp_enter_conf_state(device_t dev)
{
outb(0x55, dev->path.u.pnp.port);
outb(0x55, dev->path.pnp.port);
}
//----------------------------------------------------------------------------------
@@ -182,7 +182,7 @@ static void pnp_enter_conf_state(device_t dev)
//
static void pnp_exit_conf_state(device_t dev)
{
outb(0xaa, dev->path.u.pnp.port);
outb(0xaa, dev->path.pnp.port);
}
#if 0

View File

@@ -20,10 +20,10 @@
static void pnp_enter_conf_state(device_t dev) {
outb(0x55, dev->path.u.pnp.port);
outb(0x55, dev->path.pnp.port);
}
static void pnp_exit_conf_state(device_t dev) {
outb(0xaa, dev->path.u.pnp.port);
outb(0xaa, dev->path.pnp.port);
}
static void pnp_write_index(unsigned long port_base, uint8_t reg, uint8_t value)
@@ -56,7 +56,7 @@ static void lpc47b397_init(device_t dev)
return;
}
conf = dev->chip_info;
switch(dev->path.u.pnp.device) {
switch(dev->path.pnp.device) {
case LPC47B397_SP1:
res0 = find_resource(dev, PNP_IDX_IO0);
init_uart8250(res0->base, &conf->com1);
@@ -96,7 +96,7 @@ void lpc47b397_pnp_enable_resources(device_t dev)
pnp_enable_resources(dev);
switch(dev->path.u.pnp.device) {
switch(dev->path.pnp.device) {
case LPC47B397_HWM:
printk_debug("lpc47b397 SensorBus Register Access enabled\r\n");
pnp_set_logical_device(dev);
@@ -153,7 +153,7 @@ static int lsmbus_read_byte(device_t dev, uint8_t address)
struct resource *res;
int result;
device = dev->path.u.i2c.device;
device = dev->path.i2c.device;
res = find_resource(get_pbus_smbus(dev)->dev, PNP_IDX_IO0);
@@ -169,7 +169,7 @@ static int lsmbus_write_byte(device_t dev, uint8_t address, uint8_t val)
unsigned device;
struct resource *res;
device = dev->path.u.i2c.device;
device = dev->path.i2c.device;
res = find_resource(get_pbus_smbus(dev)->dev, PNP_IDX_IO0);
pnp_write_index(res->base+HWM_INDEX, 0, device); // why 0?

View File

@@ -138,7 +138,7 @@ static void lpc47m10x_init(device_t dev)
if (!dev->enabled)
return;
switch(dev->path.u.pnp.device) {
switch(dev->path.pnp.device) {
case LPC47M10X2_SP1:
res0 = find_resource(dev, PNP_IDX_IO0);
init_uart8250(res0->base, &conf->com1);
@@ -169,7 +169,7 @@ static void lpc47m10x_init(device_t dev)
//
static void pnp_enter_conf_state(device_t dev)
{
outb(0x55, dev->path.u.pnp.port);
outb(0x55, dev->path.pnp.port);
}
//----------------------------------------------------------------------------------
@@ -180,7 +180,7 @@ static void pnp_enter_conf_state(device_t dev)
//
static void pnp_exit_conf_state(device_t dev)
{
outb(0xaa, dev->path.u.pnp.port);
outb(0xaa, dev->path.pnp.port);
}
#if 0

View File

@@ -158,7 +158,7 @@ static void lpc47n217_init(device_t dev)
if (!dev->enabled)
return;
switch(dev->path.u.pnp.device) {
switch(dev->path.pnp.device) {
case LPC47N217_SP1:
res0 = find_resource(dev, PNP_IDX_IO0);
init_uart8250(res0->base, &conf->com1);
@@ -211,7 +211,7 @@ void lpc47n217_pnp_set_iobase(device_t dev, unsigned iobase)
{
ASSERT(!(iobase & 0x3));
switch(dev->path.u.pnp.device) {
switch(dev->path.pnp.device) {
case LPC47N217_PP:
pnp_write_config(dev, 0x23, (iobase >> 2) & 0xff);
break;
@@ -232,7 +232,7 @@ void lpc47n217_pnp_set_iobase(device_t dev, unsigned iobase)
void lpc47n217_pnp_set_drq(device_t dev, unsigned drq)
{
if (dev->path.u.pnp.device == LPC47N217_PP) {
if (dev->path.pnp.device == LPC47N217_PP) {
const uint8_t PP_DMA_MASK = 0x0F;
const uint8_t PP_DMA_SELECTION_REGISTER = 0x26;
uint8_t current_config = pnp_read_config(dev, PP_DMA_SELECTION_REGISTER);
@@ -253,7 +253,7 @@ void lpc47n217_pnp_set_irq(device_t dev, unsigned irq)
uint8_t current_config;
uint8_t new_config;
switch(dev->path.u.pnp.device) {
switch(dev->path.pnp.device) {
case LPC47N217_PP:
irq_config_register = 0x27;
irq_config_mask = 0x0F;
@@ -289,7 +289,7 @@ void lpc47n217_pnp_set_enable(device_t dev, int enable)
uint8_t current_power;
uint8_t new_power;
switch(dev->path.u.pnp.device) {
switch(dev->path.pnp.device) {
case LPC47N217_PP:
power_register = 0x01;
power_mask = 0x04;
@@ -334,7 +334,7 @@ void lpc47n217_pnp_set_enable(device_t dev, int enable)
//
static void pnp_enter_conf_state(device_t dev)
{
outb(0x55, dev->path.u.pnp.port);
outb(0x55, dev->path.pnp.port);
}
//----------------------------------------------------------------------------------
@@ -345,7 +345,7 @@ static void pnp_enter_conf_state(device_t dev)
//
static void pnp_exit_conf_state(device_t dev)
{
outb(0xaa, dev->path.u.pnp.port);
outb(0xaa, dev->path.pnp.port);
}
#if 0

View File

@@ -143,7 +143,7 @@ static const struct logical_devices {
*/
static inline void smsc_pnp_enter_conf_state(device_t dev)
{
outb(0x55, dev->path.u.pnp.port);
outb(0x55, dev->path.pnp.port);
}
/**
@@ -155,7 +155,7 @@ static inline void smsc_pnp_enter_conf_state(device_t dev)
*/
static inline void smsc_pnp_exit_conf_state(device_t dev)
{
outb(0xaa, dev->path.u.pnp.port);
outb(0xaa, dev->path.pnp.port);
}
/** Wrapper for pnp_set_resources(). */
@@ -213,7 +213,7 @@ static void smsc_init(device_t dev)
return;
/* A Super I/O was found, so initialize the respective device. */
ld = dev->path.u.pnp.device;
ld = dev->path.pnp.device;
if (ld == logical_device_table[i].devs[LD_SP1]) {
res0 = find_resource(dev, PNP_IDX_IO0);
init_uart8250(res0->base, &conf->com1);