Commit b81b3b10aa6fa9f0be8162b3403e321e4768b977
1 parent
8be1f5c8
swap serial ports (Blue Swirl)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1347 c046a42c-6fe2-441c-8c8c-71466251a162
Showing
1 changed file
with
4 additions
and
2 deletions
hw/sun4m.c
| 1 | /* | 1 | /* |
| 2 | * QEMU Sun4m System Emulator | 2 | * QEMU Sun4m System Emulator |
| 3 | * | 3 | * |
| 4 | - * Copyright (c) 2003-2004 Fabrice Bellard | 4 | + * Copyright (c) 2003-2005 Fabrice Bellard |
| 5 | * | 5 | * |
| 6 | * Permission is hereby granted, free of charge, to any person obtaining a copy | 6 | * Permission is hereby granted, free of charge, to any person obtaining a copy |
| 7 | * of this software and associated documentation files (the "Software"), to deal | 7 | * of this software and associated documentation files (the "Software"), to deal |
| @@ -225,7 +225,9 @@ void sun4m_init(int ram_size, int vga_ram_size, int boot_device, | @@ -225,7 +225,9 @@ void sun4m_init(int ram_size, int vga_ram_size, int boot_device, | ||
| 225 | nvram = m48t08_init(PHYS_JJ_EEPROM, PHYS_JJ_EEPROM_SIZE); | 225 | nvram = m48t08_init(PHYS_JJ_EEPROM, PHYS_JJ_EEPROM_SIZE); |
| 226 | slavio_timer_init(PHYS_JJ_CLOCK, PHYS_JJ_CLOCK_IRQ, PHYS_JJ_CLOCK1, PHYS_JJ_CLOCK1_IRQ); | 226 | slavio_timer_init(PHYS_JJ_CLOCK, PHYS_JJ_CLOCK_IRQ, PHYS_JJ_CLOCK1, PHYS_JJ_CLOCK1_IRQ); |
| 227 | slavio_serial_ms_kbd_init(PHYS_JJ_MS_KBD, PHYS_JJ_MS_KBD_IRQ); | 227 | slavio_serial_ms_kbd_init(PHYS_JJ_MS_KBD, PHYS_JJ_MS_KBD_IRQ); |
| 228 | - slavio_serial_init(PHYS_JJ_SER, PHYS_JJ_SER_IRQ, serial_hds[0], serial_hds[1]); | 228 | + // Slavio TTYA (base+4, Linux ttyS0) is the first Qemu serial device |
| 229 | + // Slavio TTYB (base+0, Linux ttyS1) is the second Qemu serial device | ||
| 230 | + slavio_serial_init(PHYS_JJ_SER, PHYS_JJ_SER_IRQ, serial_hds[1], serial_hds[0]); | ||
| 229 | fdctrl_init(PHYS_JJ_FLOPPY_IRQ, 0, 1, PHYS_JJ_FDC, fd_table); | 231 | fdctrl_init(PHYS_JJ_FLOPPY_IRQ, 0, 1, PHYS_JJ_FDC, fd_table); |
| 230 | esp_init(bs_table, PHYS_JJ_ESP_IRQ, PHYS_JJ_ESP, PHYS_JJ_ESPDMA); | 232 | esp_init(bs_table, PHYS_JJ_ESP_IRQ, PHYS_JJ_ESP, PHYS_JJ_ESPDMA); |
| 231 | 233 |