Merge branch 'games'.

2014-09-17 13:21:59 -07:00
parent 93d95abc69 e557c88b1e
commit 5c4309942a
137 changed files with 31923 additions and 5479 deletions
--- a/tools/virtualmips/pic32_dev_uart.c
+++ b/tools/virtualmips/pic32_dev_uart.c
@@ -137,9 +137,9 @@ void *dev_pic32_uart_access (cpu_mips_t * cpu, struct vdevice *dev,
 #endif
        switch (offset) {
        case PIC32_U1TXREG & 0xff:              /* Transmit */
-            /* Skip ^M. */
-            if ((char) (*data) != '\r')
-                vtty_put_char (d->vtty, (char) (*data));
+            /* Don't skip ^M. */
+            vtty_put_char (d->vtty, (char) (*data));
+
            if ((d->mode & PIC32_UMODE_ON) &&
                (d->sta & PIC32_USTA_UTXEN) && (d->output == 0)) {
                /*