Fix 32 bit shifting issue

ps2 · Nov 19, 2015 · 83d6b0b · 83d6b0b
1 parent 37065bd
commit 83d6b0b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/spi1_alt2/serial.c b/spi1_alt2/serial.c
@@ -180,7 +180,7 @@ uint16_t serial_rx_word() {
 }
 
 uint32_t serial_rx_long() {
-  return serial_rx_word() << 16 + serial_rx_word();
+  return ((uint32_t)serial_rx_word() << 16) + serial_rx_word();
 }
 
 void serial_tx_byte(uint8_t tx_byte) {

diff --git a/uart0_alt1/serial.c b/uart0_alt1/serial.c
@@ -44,9 +44,10 @@ uint16_t serial_rx_word() {
 }
 
 uint32_t serial_rx_long() {
-  return serial_rx_word() << 16 + serial_rx_word();
+  return ((uint32_t)serial_rx_word() << 16) + serial_rx_word();
 }
 
+
 void serial_tx_byte(uint8_t tx_byte) {
   UTX0IF = 0;
   U0DBUF = tx_byte;

diff --git a/uart1_alt2/serial.c b/uart1_alt2/serial.c
@@ -44,9 +44,10 @@ uint16_t serial_rx_word() {
 }
 
 uint32_t serial_rx_long() {
-  return serial_rx_word() << 16 + serial_rx_word();
+  return ((uint32_t)serial_rx_word() << 16) + serial_rx_word();
 }
 
+
 void serial_tx_byte(uint8_t tx_byte) {
   UTX1IF = 0;
   U1DBUF = tx_byte;

diff --git a/usb_ep0/serial.c b/usb_ep0/serial.c
@@ -46,9 +46,10 @@ uint16_t serial_rx_word() {
 }
 
 uint32_t serial_rx_long() {
-  return serial_rx_word() << 16 + serial_rx_word();
+  return ((uint32_t)serial_rx_word() << 16) + serial_rx_word();
 }
 
+
 void flush_serial( ) {
   GREEN_LED ^= 1;
   usb_flush( );