Changeset 298f0b4 in buchla-68k for ram

Timestamp:

07/14/2017 01:45:36 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

7d4cf30

Parents:

33b5477

Message:

Fewer incompatible pointers.

Location:

ram

Files:

• libdsp.c (modified) (4 diffs)
• libdsp.x (modified) (3 diffs)

ram/libdsp.c

@@ -235 +235 @@
 */
 
-int32_t chksum(int8_t *area, int32_t len)
-{
-        register int32_t cs, i;
-
+int32_t chksum(void *area, int32_t len)
+{
+        uint8_t *area8;
+        int32_t cs, i;
+
+        area8 = area;
         cs = 0L;
 
         for (i = 0; i < len; i++)
-                cs += 0x000000FFL & *area++;
+                cs += 0x000000FFL & *area8++;
 
         return(cs);
@@ -306 +308 @@
 */
 
-int16_t wr_ec(FILE *fp, int8_t *from, int32_t len)
-{
-        register int32_t count;
-        register int8_t c;
+int16_t wr_ec(FILE *fp, void *from, int32_t len)
+{
+        uint8_t *from8, c;
+        int32_t count;
+
+        from8 = from;
+
         for (count = 0; count < len; count++) {
 
                 errno = 0;
-                c  = *from++;
+                c  = *from8++;
 
                 if (EOF EQ putc(c, fp)) {
@@ -346 +351 @@
 */
 
-int16_t rd_ec(FILE *fp, int8_t *to, int32_t len)
-{
-        register int32_t count;
-        register int16_t c;
+int16_t rd_ec(FILE *fp, void *to, int32_t len)
+{
+        uint8_t *to8;
+        int32_t count;
+        int16_t c;
+
+        to8 = to;
 
         for (count = 0; count < len; count++) {
@@ -368 +376 @@
                 } else {
 
-                        *to++ = c;
+                        *to8++ = (uint8_t)c;
 
 #if     DEBUGRE

ram/libdsp.x

@@ -29 +29 @@
 extern  void            advlcur(void);
 extern  void            bsplcur(void);
-extern  int32_t         chksum(int8_t *area, int32_t len);
+extern  int32_t         chksum(void *area, int32_t len);
 extern  int16_t         ckdups(void);
 extern  int16_t         ckstor(void);
@@ -57 +57 @@
 extern  int16_t         ocslot(int16_t slot);
 extern  int16_t         putcat(void);
-extern  int16_t         rd_ec(FILE *fp, int8_t *to, int32_t len);
+extern  int16_t         rd_ec(FILE *fp, void *to, int32_t len);
 extern  int16_t         showcat(void);
 extern  int16_t         showsiz(void);
@@ -65 +65 @@
 extern  int16_t         storit(void);
 extern  void            streset(void);
-extern  int16_t         wr_ec(FILE *fp, int8_t *from, int32_t len);
+extern  int16_t         wr_ec(FILE *fp, void *from, int32_t len);
 extern  int16_t         writem(void);
 extern  int16_t         wrtfile(int16_t kind);