Revision b3ceef24 hw/slavio_serial.c
b/hw/slavio_serial.c | ||
---|---|---|
354 | 354 |
|
355 | 355 |
static void slavio_serial_mem_writeb(void *opaque, target_phys_addr_t addr, uint32_t val) |
356 | 356 |
{ |
357 |
SerialState *ser = opaque; |
|
357 |
SerialState *serial = opaque;
|
|
358 | 358 |
ChannelState *s; |
359 | 359 |
uint32_t saddr; |
360 | 360 |
int newreg, channel; |
... | ... | |
362 | 362 |
val &= 0xff; |
363 | 363 |
saddr = (addr & 3) >> 1; |
364 | 364 |
channel = (addr & SERIAL_MAXADDR) >> 2; |
365 |
s = &ser->chn[channel]; |
|
365 |
s = &serial->chn[channel];
|
|
366 | 366 |
switch (saddr) { |
367 | 367 |
case 0: |
368 | 368 |
SER_DPRINTF("Write channel %c, reg[%d] = %2.2x\n", CHN_C(s), s->reg, val & 0xff); |
... | ... | |
407 | 407 |
default: |
408 | 408 |
break; |
409 | 409 |
case 0x40: |
410 |
slavio_serial_reset_chn(&ser->chn[1]); |
|
410 |
slavio_serial_reset_chn(&serial->chn[1]);
|
|
411 | 411 |
return; |
412 | 412 |
case 0x80: |
413 |
slavio_serial_reset_chn(&ser->chn[0]); |
|
413 |
slavio_serial_reset_chn(&serial->chn[0]);
|
|
414 | 414 |
return; |
415 | 415 |
case 0xc0: |
416 |
slavio_serial_reset(ser); |
|
416 |
slavio_serial_reset(serial);
|
|
417 | 417 |
return; |
418 | 418 |
} |
419 | 419 |
break; |
... | ... | |
446 | 446 |
|
447 | 447 |
static uint32_t slavio_serial_mem_readb(void *opaque, target_phys_addr_t addr) |
448 | 448 |
{ |
449 |
SerialState *ser = opaque; |
|
449 |
SerialState *serial = opaque;
|
|
450 | 450 |
ChannelState *s; |
451 | 451 |
uint32_t saddr; |
452 | 452 |
uint32_t ret; |
... | ... | |
454 | 454 |
|
455 | 455 |
saddr = (addr & 3) >> 1; |
456 | 456 |
channel = (addr & SERIAL_MAXADDR) >> 2; |
457 |
s = &ser->chn[channel]; |
|
457 |
s = &serial->chn[channel];
|
|
458 | 458 |
switch (saddr) { |
459 | 459 |
case 0: |
460 | 460 |
SER_DPRINTF("Read channel %c, reg[%d] = %2.2x\n", CHN_C(s), s->reg, s->rregs[s->reg]); |
Also available in: Unified diff