Changeset 72741f4 in buchla-68k for ram/sqscan.c

Timestamp:

11/15/2017 07:28:55 PM (6 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

00c31a2

Parents:

7c5def4

Message:

Fixed incompatible pointers.

File:

• ram/sqscan.c (modified) (9 diffs)

ram/sqscan.c

@@ -63 +63 @@
         }
 
-        cval = spool;
+        cval = (struct s_entry *)spool;
 
         if (ptr LT cval) {
@@ -75 +75 @@
         }
 
-        cval = &spool[(int32_t)MAX_SE-1];
+        cval = (struct s_entry *)&spool[(int32_t)MAX_SE-1];
 
         if (ptr GT cval) {
@@ -104 +104 @@
         nsp->e_vel   = vel;
 
-        return(e_ins((struct s_entry *)nsp, ep_adj(p_cur, 0, t_cur))->e_fwd);
+        return((struct n_entry *)
+                e_ins((struct s_entry *)nsp, ep_adj(p_cur, 0, t_cur))->e_fwd);
 }
 
@@ -704 +705 @@
                 while (tsp2) {
 
-                        tsp3 = &spool[0];
+                        tsp3 = (struct s_entry *)&spool[0];
 
                         if (tsp2 LT tsp3) {
@@ -715 +716 @@
                         }
 
-                        tsp3 = &spool[MAX_SE-1];
+                        tsp3 = (struct s_entry *)&spool[MAX_SE-1];
 
                         if (tsp2 GT tsp3) {
@@ -840 +841 @@
 
                 noteon = t_cur;
-                p_cur = insnevt(nsp1, EV_NBEG, curgrp, notenum, 64);
+                p_cur = (struct s_entry *)insnevt(nsp1, EV_NBEG, curgrp, notenum, 64);
 
                 if (verbose)
@@ -857 +858 @@
 
                 noteoff = t_cur;
-                p_cur = insnevt(nsp1, EV_NEND, curgrp, notenum, 64);
+                p_cur = (struct s_entry *)insnevt(nsp1, EV_NEND, curgrp, notenum, 64);
 
                 if (verbose)
@@ -882 +883 @@
                 }
 
-                p_cur = insnevt(nsp1, EV_NBEG, curgrp, notenum, 64);
+                p_cur = (struct s_entry *)insnevt(nsp1, EV_NBEG, curgrp, notenum, 64);
 
                 if (E_NULL EQ (nsp1 = (struct n_entry *)e_alc(E_SIZE1))) {
@@ -915 +916 @@
         }
 
-        p_cur = insnevt(nsp1, EV_NBEG, curgrp, notenum, 64);
+        p_cur = (struct s_entry *)insnevt(nsp1, EV_NBEG, curgrp, notenum, 64);
 
         if (E_NULL EQ (nsp1 = (struct n_entry *)e_alc(E_SIZE1))) {