gwj / at91sam9263 · Commits

Commit 9e315fa93c14d6da7dc5b8fef193a671b51defd8

Authored by balrog
1 parent f54f432e

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
Inline Side-by-side
Showing 2 changed files with 10 additions and 10 deletions
hw/ide.c
  View file @9e315fa
... ... @@ -3071,7 +3071,7 @@ static void md_reset(struct md_s *s)
3071 3071 ide_reset(s->ide);
3072 3072 }
3073 3073  
3074   -static uint8_t md_attr_read(void *opaque, uint16_t at)
  3074 +static uint8_t md_attr_read(void *opaque, uint32_t at)
3075 3075 {
3076 3076 struct md_s *s = (struct md_s *) opaque;
3077 3077 if (at < s->attr_base) {
... ... @@ -3104,7 +3104,7 @@ static uint8_t md_attr_read(void *opaque, uint16_t at)
3104 3104 return 0;
3105 3105 }
3106 3106  
3107   -static void md_attr_write(void *opaque, uint16_t at, uint8_t value)
  3107 +static void md_attr_write(void *opaque, uint32_t at, uint8_t value)
3108 3108 {
3109 3109 struct md_s *s = (struct md_s *) opaque;
3110 3110 at -= s->attr_base;
... ... @@ -3135,7 +3135,7 @@ static void md_attr_write(void *opaque, uint16_t at, uint8_t value)
3135 3135 }
3136 3136 }
3137 3137  
3138   -static uint16_t md_common_read(void *opaque, uint16_t at)
  3138 +static uint16_t md_common_read(void *opaque, uint32_t at)
3139 3139 {
3140 3140 struct md_s *s = (struct md_s *) opaque;
3141 3141 uint16_t ret;
... ... @@ -3194,7 +3194,7 @@ static uint16_t md_common_read(void *opaque, uint16_t at)
3194 3194 return 0;
3195 3195 }
3196 3196  
3197   -static void md_common_write(void *opaque, uint16_t at, uint16_t value)
  3197 +static void md_common_write(void *opaque, uint32_t at, uint16_t value)
3198 3198 {
3199 3199 struct md_s *s = (struct md_s *) opaque;
3200 3200 at -= s->io_base;
... ...
... ... @@ -1552,12 +1552,12 @@ struct pcmcia_card_s {
1552 1552 int cis_len;
1553 1553  
1554 1554 /* Only valid if attached */
1555   - uint8_t (*attr_read)(void *state, uint16_t address);
1556   - void (*attr_write)(void *state, uint16_t address, uint8_t value);
1557   - uint16_t (*common_read)(void *state, uint16_t address);
1558   - void (*common_write)(void *state, uint16_t address, uint16_t value);
1559   - uint16_t (*io_read)(void *state, uint16_t address);
1560   - void (*io_write)(void *state, uint16_t address, uint16_t value);
  1555 + uint8_t (*attr_read)(void *state, uint32_t address);
  1556 + void (*attr_write)(void *state, uint32_t address, uint8_t value);
  1557 + uint16_t (*common_read)(void *state, uint32_t address);
  1558 + void (*common_write)(void *state, uint32_t address, uint16_t value);
  1559 + uint16_t (*io_read)(void *state, uint32_t address);
  1560 + void (*io_write)(void *state, uint32_t address, uint16_t value);
1561 1561 };
1562 1562  
1563 1563 #define CISTPL_DEVICE 0x01 /* 5V Device Information Tuple */
... ...