Changeset d18a473 in buchla-68k for lib700

Timestamp:

07/15/2017 11:46:04 AM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

7d0d347

Parents:

e102943

Message:

No more warnings in lib700.

Location:

lib700

Files:

• bitrev.c (modified) (2 diffs)
• bitrev.x (modified) (1 diff)
• ctype.c (modified) (2 diffs)
• ctype.x (modified) (1 diff)
• micons.c (modified) (2 diffs)
• micons.x (modified) (1 diff)

lib700/bitrev.c

@@ -8 +8 @@
 #include "ram.h"
 
-static int16_t bitmask[] = {
+static uint16_t bitmask[] = {
 
         0x0001, 0x0002, 0x0004, 0x0008,
@@ -24 +24 @@
 */
 
-int16_t bitrev(int16_t bitsin, int16_t nbits)
+uint16_t bitrev(uint16_t bitsin, int16_t nbits)
 {
-        int16_t m, n;
+        uint16_t n;
+        int16_t m;
 
         n = 0;

lib700/bitrev.x

@@ -15 +15 @@
 */
 
-extern  int16_t         bitrev(int16_t bitsin, int16_t nbits);
+extern  uint16_t        bitrev(uint16_t bitsin, int16_t nbits);

lib700/ctype.c

@@ -12 +12 @@
 */
 
-#define _CTYPE_C
-
 #include "ram.h"
 
@@ -22 +20 @@
 #define _LX     _L|_X
 
-int8_t __atab[] = {     /* EOF won't work properly with this table */
+uint8_t __atab[] = {    /* EOF won't work properly with this table */
 
         /* Octal */                                             /* Hex */

lib700/ctype.x

@@ -15 +15 @@
 */
 
-extern  int8_t          __atab[];
+extern  uint8_t         __atab[];

lib700/micons.c

@@ -4 +4 @@
         Version 3 -- 1987-06-11 -- D.N. Lynx Crowe
 
-        short
-        micons(wi)
-        short wi;
+        micon16(wi)
 
                 Convert between motorola and intel format for a short.
 
-        int
-        miconi(wi)
-        int wi;
-
-                Convert between motorola and intel format for an int.
-
-        long
-        miconl(wi)
-        long wi;
+        micon32(wi)
 
                 Convert between motorola and intel format for a long.
@@ -30 +20 @@
 /*
    =============================================================================
-        micons(wi) -- Convert between motorola and intel format for a short.
+        micon16(wi) -- Convert between motorola and intel format for a short.
    =============================================================================
 */
 
-int16_t micons(int16_t wi)
+uint16_t micon16(uint16_t wi)
 {
-        return((int16_t)( ((wi << 8) & 0xFF00) | ((wi >> 8) & 0x00FF) ) );
+        return(((wi << 8) & 0xFF00u) | ((wi >> 8) & 0x00FFu));
 }
 
 /*
    =============================================================================
-        miconi(wi) -- Convert between motorola and intel format for an int.
+        micon32(wi) -- Convert between motorola and intel format for a long.
    =============================================================================
 */
 
-int16_t miconi(int16_t wi)
+uint32_t micon32(uint32_t wi)
 {
-        return(((wi << 8) & 0xFF00) | ((wi >> 8) & 0x00FF));
-}
-
-/*
-   =============================================================================
-        miconl(wi) -- Convert between motorola and intel format for a long.
-   =============================================================================
-*/
-
-int32_t miconl(int32_t wi)
-{
-        return( ((wi << 24) & 0xFF000000L) | ((wi << 8) & 0x00FF0000L) |
-                ((wi >> 8) & 0x0000FF00L) | ((wi >> 24) & 0x000000FFL) );
+        return(((wi << 24) & 0xFF000000ul) | ((wi << 8) & 0x00FF0000ul) |
+                ((wi >> 8) & 0x0000FF00ul) | ((wi >> 24) & 0x000000FFul));
 }
 

lib700/micons.x

@@ -15 +15 @@
 */
 
-extern  int16_t         miconi(int16_t wi);
-extern  int32_t         miconl(int32_t wi);
-extern  int16_t         micons(int16_t wi);
+extern  uint16_t        micon16(uint16_t wi);
+extern  uint32_t        micon32(uint32_t wi);