Commit 73c11f630be97e8098c8b4dd2a827a8097838a2b
1 parent
660de336
cleanup
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@821 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
1 additions
and
17 deletions
hw/ide.c
| @@ -1517,21 +1517,6 @@ typedef struct PCIIDEState { | @@ -1517,21 +1517,6 @@ typedef struct PCIIDEState { | ||
| 1517 | IDEState ide_if[4]; | 1517 | IDEState ide_if[4]; |
| 1518 | } PCIIDEState; | 1518 | } PCIIDEState; |
| 1519 | 1519 | ||
| 1520 | -static uint32_t ide_read_config(PCIDevice *d, | ||
| 1521 | - uint32_t address, int len) | ||
| 1522 | -{ | ||
| 1523 | - uint32_t val; | ||
| 1524 | - val = 0; | ||
| 1525 | - memcpy(&val, d->config + address, len); | ||
| 1526 | - return val; | ||
| 1527 | -} | ||
| 1528 | - | ||
| 1529 | -static void ide_write_config(PCIDevice *d, | ||
| 1530 | - uint32_t address, uint32_t val, int len) | ||
| 1531 | -{ | ||
| 1532 | - memcpy(d->config + address, &val, len); | ||
| 1533 | -} | ||
| 1534 | - | ||
| 1535 | static void ide_map(PCIDevice *pci_dev, int region_num, | 1520 | static void ide_map(PCIDevice *pci_dev, int region_num, |
| 1536 | uint32_t addr, uint32_t size, int type) | 1521 | uint32_t addr, uint32_t size, int type) |
| 1537 | { | 1522 | { |
| @@ -1564,8 +1549,7 @@ void pci_ide_init(BlockDriverState **hd_table) | @@ -1564,8 +1549,7 @@ void pci_ide_init(BlockDriverState **hd_table) | ||
| 1564 | 1549 | ||
| 1565 | d = (PCIIDEState *)pci_register_device("IDE", sizeof(PCIIDEState), | 1550 | d = (PCIIDEState *)pci_register_device("IDE", sizeof(PCIIDEState), |
| 1566 | 0, -1, | 1551 | 0, -1, |
| 1567 | - ide_read_config, | ||
| 1568 | - ide_write_config); | 1552 | + NULL, NULL); |
| 1569 | pci_conf = d->dev.config; | 1553 | pci_conf = d->dev.config; |
| 1570 | pci_conf[0x00] = 0x86; // Intel | 1554 | pci_conf[0x00] = 0x86; // Intel |
| 1571 | pci_conf[0x01] = 0x80; | 1555 | pci_conf[0x01] = 0x80; |