summaryrefslogtreecommitdiff
path: root/src/superio/smsc
diff options
context:
space:
mode:
Diffstat (limited to 'src/superio/smsc')
-rw-r--r--src/superio/smsc/fdc37m60x/superio.c2
-rw-r--r--src/superio/smsc/lpc47b272/superio.c6
-rw-r--r--src/superio/smsc/lpc47b397/superio.c12
-rw-r--r--src/superio/smsc/lpc47m10x/superio.c6
-rw-r--r--src/superio/smsc/lpc47n217/superio.c14
-rw-r--r--src/superio/smsc/smscsuperio/superio.c6
6 files changed, 23 insertions, 23 deletions
diff --git a/src/superio/smsc/fdc37m60x/superio.c b/src/superio/smsc/fdc37m60x/superio.c
index 716cb8b2cb..54225162c5 100644
--- a/src/superio/smsc/fdc37m60x/superio.c
+++ b/src/superio/smsc/fdc37m60x/superio.c
@@ -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. */
diff --git a/src/superio/smsc/lpc47b272/superio.c b/src/superio/smsc/lpc47b272/superio.c
index e8fc7bddb0..80b0c233db 100644
--- a/src/superio/smsc/lpc47b272/superio.c
+++ b/src/superio/smsc/lpc47b272/superio.c
@@ -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
diff --git a/src/superio/smsc/lpc47b397/superio.c b/src/superio/smsc/lpc47b397/superio.c
index 0f66894499..5dc8e1f376 100644
--- a/src/superio/smsc/lpc47b397/superio.c
+++ b/src/superio/smsc/lpc47b397/superio.c
@@ -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?
diff --git a/src/superio/smsc/lpc47m10x/superio.c b/src/superio/smsc/lpc47m10x/superio.c
index ec72beaa34..bbe6cc3e15 100644
--- a/src/superio/smsc/lpc47m10x/superio.c
+++ b/src/superio/smsc/lpc47m10x/superio.c
@@ -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
diff --git a/src/superio/smsc/lpc47n217/superio.c b/src/superio/smsc/lpc47n217/superio.c
index 3c0056cb70..f64ec73198 100644
--- a/src/superio/smsc/lpc47n217/superio.c
+++ b/src/superio/smsc/lpc47n217/superio.c
@@ -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
diff --git a/src/superio/smsc/smscsuperio/superio.c b/src/superio/smsc/smscsuperio/superio.c
index dae720eb6b..14ac03f8b1 100644
--- a/src/superio/smsc/smscsuperio/superio.c
+++ b/src/superio/smsc/smscsuperio/superio.c
@@ -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);
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 04:02:54 +0000