diff options
| author | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-06-25 19:56:13 +0000 |
|---|---|---|
| committer | blueswir1 <blueswir1@c046a42c-6fe2-441c-8c8c-71466251a162> | 2007-06-25 19:56:13 +0000 |
| commit | b3ceef24f4fee8d5ed96b8c4a5d3e80c0a651f0b (patch) | |
| tree | f52bd1a5b6e5e5bf0c04e4efaba1a9d8be219f90 /hw/slavio_serial.c | |
| parent | 46525e1fbe3fc18b8f3d8e567b955b8c66f0c28c (diff) | |
Rename variables and rearrange code to please gcc -Wshadow checks
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@3023 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/slavio_serial.c')
| -rw-r--r-- | hw/slavio_serial.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/hw/slavio_serial.c b/hw/slavio_serial.c index 0a2c873300..36dbdcf163 100644 --- a/hw/slavio_serial.c +++ b/hw/slavio_serial.c @@ -354,7 +354,7 @@ static void slavio_serial_update_parameters(ChannelState *s) static void slavio_serial_mem_writeb(void *opaque, target_phys_addr_t addr, uint32_t val) { - SerialState *ser = opaque; + SerialState *serial = opaque; ChannelState *s; uint32_t saddr; int newreg, channel; @@ -362,7 +362,7 @@ static void slavio_serial_mem_writeb(void *opaque, target_phys_addr_t addr, uint val &= 0xff; saddr = (addr & 3) >> 1; channel = (addr & SERIAL_MAXADDR) >> 2; - s = &ser->chn[channel]; + s = &serial->chn[channel]; switch (saddr) { case 0: SER_DPRINTF("Write channel %c, reg[%d] = %2.2x\n", CHN_C(s), s->reg, val & 0xff); @@ -407,13 +407,13 @@ static void slavio_serial_mem_writeb(void *opaque, target_phys_addr_t addr, uint default: break; case 0x40: - slavio_serial_reset_chn(&ser->chn[1]); + slavio_serial_reset_chn(&serial->chn[1]); return; case 0x80: - slavio_serial_reset_chn(&ser->chn[0]); + slavio_serial_reset_chn(&serial->chn[0]); return; case 0xc0: - slavio_serial_reset(ser); + slavio_serial_reset(serial); return; } break; @@ -446,7 +446,7 @@ static void slavio_serial_mem_writeb(void *opaque, target_phys_addr_t addr, uint static uint32_t slavio_serial_mem_readb(void *opaque, target_phys_addr_t addr) { - SerialState *ser = opaque; + SerialState *serial = opaque; ChannelState *s; uint32_t saddr; uint32_t ret; @@ -454,7 +454,7 @@ static uint32_t slavio_serial_mem_readb(void *opaque, target_phys_addr_t addr) saddr = (addr & 3) >> 1; channel = (addr & SERIAL_MAXADDR) >> 2; - s = &ser->chn[channel]; + s = &serial->chn[channel]; switch (saddr) { case 0: SER_DPRINTF("Read channel %c, reg[%d] = %2.2x\n", CHN_C(s), s->reg, s->rregs[s->reg]); |