Changeset 432327d in buchla-68k for rom

Timestamp:

09/17/2017 09:27:29 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

6099cac

Parents:

8c8b4e5

Message:

Fix conversion warnings.

Location:

rom

Files:

• romp.c (modified) (1 diff)
• romp.x (modified) (1 diff)

rom/romp.c

@@ -501 +501 @@
 */
 
-uint16_t exp_c(uint16_t c)
-{
-        c &= 0x000F;
-        c |= c << 4;
-        c |= c << 8;
-
-        return(c);
+uint16_t exp_c(int16_t c)
+{
+        uint16_t r;
+
+        r = (uint16_t)c & 0x000F;
+        r |= r << 4;
+        r |= r << 8;
+
+        return(r);
 }
 

rom/romp.x

@@ -153 +153 @@
 extern  void            dosw(int16_t nb, int16_t sv);
 extern  int16_t         dtext(int8_t *loc, int8_t *lastloc, int16_t nwide, int16_t unit);
-extern  uint16_t        exp_c(uint16_t c);
+extern  uint16_t        exp_c(int16_t c);
 extern  int16_t         getarg(void);
 extern  int16_t         getcmd(void);