gwj / at91sam9263 · Commits

Commit 5a16dc63c7500e30442eaaf88e50017c107dcd09

Authored by aurel32
1 parent 71ac3b08

sun4c/sun4d: also swap the CharDriverState of escc_init() 

Forgotten in r6284

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@6290 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 4 additions and 4 deletions
hw/sun4m.c
  View file @5a16dc6
@@ -548,8 +548,8 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, ram_addr_t RAM_size, @@ -548,8 +548,8 @@ static void sun4m_hw_init(const struct sun4m_hwdef *hwdef, ram_addr_t RAM_size,
548 nographic, ESCC_CLOCK, 1); 548 nographic, ESCC_CLOCK, 1);
549 // Slavio TTYA (base+4, Linux ttyS0) is the first Qemu serial device 549 // Slavio TTYA (base+4, Linux ttyS0) is the first Qemu serial device
550 // Slavio TTYB (base+0, Linux ttyS1) is the second Qemu serial device 550 // Slavio TTYB (base+0, Linux ttyS1) is the second Qemu serial device
551 - escc_init(hwdef->serial_base, slavio_irq[hwdef->ser_irq], serial_hds[1],  
552 - serial_hds[0], ESCC_CLOCK, 1); 551 + escc_init(hwdef->serial_base, slavio_irq[hwdef->ser_irq], serial_hds[0],
  552 + serial_hds[1], ESCC_CLOCK, 1);
553 553
554 cpu_halt = qemu_allocate_irqs(cpu_halt_signal, NULL, 1); 554 cpu_halt = qemu_allocate_irqs(cpu_halt_signal, NULL, 1);
555 slavio_misc = slavio_misc_init(hwdef->slavio_base, hwdef->apc_base, 555 slavio_misc = slavio_misc_init(hwdef->slavio_base, hwdef->apc_base,
@@ -1331,8 +1331,8 @@ static void sun4d_hw_init(const struct sun4d_hwdef *hwdef, ram_addr_t RAM_size, @@ -1331,8 +1331,8 @@ static void sun4d_hw_init(const struct sun4d_hwdef *hwdef, ram_addr_t RAM_size,
1331 nographic, ESCC_CLOCK, 1); 1331 nographic, ESCC_CLOCK, 1);
1332 // Slavio TTYA (base+4, Linux ttyS0) is the first Qemu serial device 1332 // Slavio TTYA (base+4, Linux ttyS0) is the first Qemu serial device
1333 // Slavio TTYB (base+0, Linux ttyS1) is the second Qemu serial device 1333 // Slavio TTYB (base+0, Linux ttyS1) is the second Qemu serial device
1334 - escc_init(hwdef->serial_base, sbi_irq[hwdef->ser_irq], serial_hds[1],  
1335 - serial_hds[0], ESCC_CLOCK, 1); 1334 + escc_init(hwdef->serial_base, sbi_irq[hwdef->ser_irq], serial_hds[0],
  1335 + serial_hds[1], ESCC_CLOCK, 1);
1336 1336
1337 if (drive_get_max_bus(IF_SCSI) > 0) { 1337 if (drive_get_max_bus(IF_SCSI) > 0) {
1338 fprintf(stderr, "qemu: too many SCSI bus\n"); 1338 fprintf(stderr, "qemu: too many SCSI bus\n");