PCMCIA addresses are 26-bit, widen the address type from 16 to 32 bits.

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@2797 c046a42c-6fe2-441c-8c8c-71466251a162

diff --git a/hw/ide.c b/hw/ide.c
index 1417e28..a1aebc9 100644 (file)
--- a/hw/ide.c
+++ b/hw/ide.c
@@ -3071,7 +3071,7 @@ static void md_reset(struct md_s *s)
     ide_reset(s->ide);
 }
 
-static uint8_t md_attr_read(void *opaque, uint16_t at)
+static uint8_t md_attr_read(void *opaque, uint32_t at)
 {
     struct md_s *s = (struct md_s *) opaque;
     if (at < s->attr_base) {
@@ -3104,7 +3104,7 @@ static uint8_t md_attr_read(void *opaque, uint16_t at)
     return 0;
 }
 
-static void md_attr_write(void *opaque, uint16_t at, uint8_t value)
+static void md_attr_write(void *opaque, uint32_t at, uint8_t value)
 {
     struct md_s *s = (struct md_s *) opaque;
     at -= s->attr_base;
@@ -3135,7 +3135,7 @@ static void md_attr_write(void *opaque, uint16_t at, uint8_t value)
     }
 }
 
-static uint16_t md_common_read(void *opaque, uint16_t at)
+static uint16_t md_common_read(void *opaque, uint32_t at)
 {
     struct md_s *s = (struct md_s *) opaque;
     uint16_t ret;
@@ -3194,7 +3194,7 @@ static uint16_t md_common_read(void *opaque, uint16_t at)
     return 0;
 }
 
-static void md_common_write(void *opaque, uint16_t at, uint16_t value)
+static void md_common_write(void *opaque, uint32_t at, uint16_t value)
 {
     struct md_s *s = (struct md_s *) opaque;
     at -= s->io_base;

diff --git a/vl.h b/vl.h
index f44eeab..171b02b 100644 (file)
--- a/vl.h
+++ b/vl.h
@@ -1552,12 +1552,12 @@ struct pcmcia_card_s {
     int cis_len;
 
     /* Only valid if attached */
-    uint8_t (*attr_read)(void *state, uint16_t address);
-    void (*attr_write)(void *state, uint16_t address, uint8_t value);
-    uint16_t (*common_read)(void *state, uint16_t address);
-    void (*common_write)(void *state, uint16_t address, uint16_t value);
-    uint16_t (*io_read)(void *state, uint16_t address);
-    void (*io_write)(void *state, uint16_t address, uint16_t value);
+    uint8_t (*attr_read)(void *state, uint32_t address);
+    void (*attr_write)(void *state, uint32_t address, uint8_t value);
+    uint16_t (*common_read)(void *state, uint32_t address);
+    void (*common_write)(void *state, uint32_t address, uint16_t value);
+    uint16_t (*io_read)(void *state, uint32_t address);
+    void (*io_write)(void *state, uint32_t address, uint16_t value);
 };
 
 #define CISTPL_DEVICE          0x01    /* 5V Device Information Tuple */