summary refs log tree commit diff stats
path: root/hw/sun4m.c
diff options
context:
space:
mode:
authorbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2005-04-06 20:43:37 +0000
committerbellard <bellard@c046a42c-6fe2-441c-8c8c-71466251a162>2005-04-06 20:43:37 +0000
commitb81b3b10aa6fa9f0be8162b3403e321e4768b977 (patch)
treeb12898e9bdab6c9c56b723223153ae4339f37a91 /hw/sun4m.c
parent8be1f5c889fa39571f9dad766497b7bdd56e9d6d (diff)
downloadfocaccia-qemu-b81b3b10aa6fa9f0be8162b3403e321e4768b977.tar.gz
focaccia-qemu-b81b3b10aa6fa9f0be8162b3403e321e4768b977.zip
swap serial ports (Blue Swirl)
git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@1347 c046a42c-6fe2-441c-8c8c-71466251a162
Diffstat (limited to 'hw/sun4m.c')
-rw-r--r--hw/sun4m.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/hw/sun4m.c b/hw/sun4m.c
index b186b23f13..b911ba234a 100644
--- a/hw/sun4m.c
+++ b/hw/sun4m.c
@@ -1,7 +1,7 @@
 /*
  * QEMU Sun4m System Emulator
  * 
- * Copyright (c) 2003-2004 Fabrice Bellard
+ * Copyright (c) 2003-2005 Fabrice Bellard
  * 
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * 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,
     nvram = m48t08_init(PHYS_JJ_EEPROM, PHYS_JJ_EEPROM_SIZE);
     slavio_timer_init(PHYS_JJ_CLOCK, PHYS_JJ_CLOCK_IRQ, PHYS_JJ_CLOCK1, PHYS_JJ_CLOCK1_IRQ);
     slavio_serial_ms_kbd_init(PHYS_JJ_MS_KBD, PHYS_JJ_MS_KBD_IRQ);
-    slavio_serial_init(PHYS_JJ_SER, PHYS_JJ_SER_IRQ, serial_hds[0], serial_hds[1]);
+    // Slavio TTYA (base+4, Linux ttyS0) is the first Qemu serial device
+    // Slavio TTYB (base+0, Linux ttyS1) is the second Qemu serial device
+    slavio_serial_init(PHYS_JJ_SER, PHYS_JJ_SER_IRQ, serial_hds[1], serial_hds[0]);
     fdctrl_init(PHYS_JJ_FLOPPY_IRQ, 0, 1, PHYS_JJ_FDC, fd_table);
     esp_init(bs_table, PHYS_JJ_ESP_IRQ, PHYS_JJ_ESP, PHYS_JJ_ESPDMA);