diff options
| author | Ian Romanick <idr@us.ibm.com> | 2007-01-15 11:38:22 -0800 |
|---|---|---|
| committer | Ian Romanick <idr@us.ibm.com> | 2007-01-15 11:38:22 -0800 |
| commit | d8bd0c41de11d12976a5ea9f185b7ac6c7060b71 (patch) | |
| tree | 20dc40f04ac427352cf92e72c40e9cebe2ddbf7a /hw/xfree86/int10 | |
| parent | a87af8218f97da76433a5192d5e51aca0d5c3ed0 (diff) | |
Convert to new pci_device_cfg_write_u* interface.
Diffstat (limited to 'hw/xfree86/int10')
| -rw-r--r-- | hw/xfree86/int10/helper_exec.c | 6 | ||||
| -rw-r--r-- | hw/xfree86/int10/xf86int10.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/hw/xfree86/int10/helper_exec.c b/hw/xfree86/int10/helper_exec.c index 9937d65b9..aef24cc35 100644 --- a/hw/xfree86/int10/helper_exec.c +++ b/hw/xfree86/int10/helper_exec.c @@ -494,7 +494,7 @@ pciCfg1out(CARD16 addr, CARD32 val) return 1; } if (addr == 0xCFC) { - pci_device_cfg_write_u32(Int10Current->dev, & val, OFFSET(PciCfg1Addr)); + pci_device_cfg_write_u32(Int10Current->dev, val, OFFSET(PciCfg1Addr)); return 1; } return 0; @@ -533,7 +533,7 @@ pciCfg1outw(CARD16 addr, CARD16 val) if ((addr >= 0xCFC) && (addr <= 0xCFF)) { const unsigned offset = addr - 0xCFC; - pci_device_cfg_write_u16(Int10Current->dev, & val, OFFSET(PciCfg1Addr) + offset); + pci_device_cfg_write_u16(Int10Current->dev, val, OFFSET(PciCfg1Addr) + offset); return 1; } return 0; @@ -572,7 +572,7 @@ pciCfg1outb(CARD16 addr, CARD8 val) if ((addr >= 0xCFC) && (addr <= 0xCFF)) { const unsigned offset = addr - 0xCFC; - pci_device_cfg_write_u8(Int10Current->dev, & val, OFFSET(PciCfg1Addr) + offset); + pci_device_cfg_write_u8(Int10Current->dev, val, OFFSET(PciCfg1Addr) + offset); return 1; } return 0; diff --git a/hw/xfree86/int10/xf86int10.c b/hw/xfree86/int10/xf86int10.c index 1b58b923d..535978b89 100644 --- a/hw/xfree86/int10/xf86int10.c +++ b/hw/xfree86/int10/xf86int10.c @@ -769,7 +769,7 @@ int1A_handler(xf86Int10InfoPtr pInt) return 1; case 0xb10b: if ((dev = findPci(pInt, X86_EBX)) != NULL) { - pci_device_cfg_write_u8(dev, & X86_CL, X86_EDI); + pci_device_cfg_write_u8(dev, X86_CL, X86_EDI); X86_EAX = X86_AL | (SUCCESSFUL << 8); X86_EFLAGS &= ~((unsigned long)0x01); /* clear carry flag */ } else { @@ -782,7 +782,7 @@ int1A_handler(xf86Int10InfoPtr pInt) return 1; case 0xb10c: if ((dev = findPci(pInt, X86_EBX)) != NULL) { - pci_device_cfg_write_u16(dev, & X86_CX, X86_EDI); + pci_device_cfg_write_u16(dev, X86_CX, X86_EDI); X86_EAX = X86_AL | (SUCCESSFUL << 8); X86_EFLAGS &= ~((unsigned long)0x01); /* clear carry flag */ } else { @@ -795,7 +795,7 @@ int1A_handler(xf86Int10InfoPtr pInt) return 1; case 0xb10d: if ((dev = findPci(pInt, X86_EBX)) != NULL) { - pci_device_cfg_write_u32(dev, & X86_ECX, X86_EDI); + pci_device_cfg_write_u32(dev, X86_ECX, X86_EDI); X86_EAX = X86_AL | (SUCCESSFUL << 8); X86_EFLAGS &= ~((unsigned long)0x01); /* clear carry flag */ } else { |