Changeset 7258c6a in buchla-68k for ram/etres1.c

Timestamp:

07/09/2017 04:45:34 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

8618599

Parents:

0292fbb

Message:

Use standard integer types.

File:

• ram/etres1.c (modified) (15 diffs)

ram/etres1.c

@@ -20 +20 @@
 #include "scdsp.h"
 
-extern  short   ancmsw;
-extern  short   angroup;
-extern  short   ctrsw;
-extern  short   recsw;
-extern  short   stccol;
-
-extern  unsigned        *obj8;
-
-extern  short   anrs[8][16];
-extern  short   grpmode[12];
-extern  short   grpstat[12];
-extern  short   var2src[6];
-extern  short   varmode[8][16];
+extern  int16_t ancmsw;
+extern  int16_t angroup;
+extern  int16_t ctrsw;
+extern  int16_t recsw;
+extern  int16_t stccol;
+
+extern  uint16_t        *obj8;
+
+extern  int16_t anrs[8][16];
+extern  int16_t grpmode[12];
+extern  int16_t grpstat[12];
+extern  int16_t var2src[6];
+extern  int16_t varmode[8][16];
 
 extern  struct  gdsel   *gdstbc[];
@@ -43 +43 @@
 */
 
-short et_res1(short n)
+int16_t et_res1(int16_t n)
 {
         ebuf[0] = anrs[n][abs(angroup)-1];
@@ -60 +60 @@
 */
 
-short ef_res1(short n)
-{
-        register short ival, grp, vg;
+int16_t ef_res1(int16_t n)
+{
+        register int16_t ival, grp, vg;
         register struct s_entry *ep;
 
@@ -110 +110 @@
 */
 
-short rd_res1(short n)
-{
-        register short grp, chr;
+int16_t rd_res1(int16_t n)
+{
+        register int16_t grp, chr;
 
         grp = abs(angroup) - 1;
@@ -136 +136 @@
 */
 
-short nd_res1(short n, short k)
+int16_t nd_res1(int16_t n, int16_t k)
 {
         ebuf[0] = k;
@@ -158 +158 @@
 */
 
-short et_aval(short n)
-{
-        register short val, grp, gs;
-        short val1, val2, val3;
+int16_t et_aval(int16_t n)
+{
+        register int16_t val, grp, gs;
+        int16_t val1, val2, val3;
 
         grp = abs(angroup) - 1;
@@ -198 +198 @@
 */
 
-short ef_aval(short n)
-{
-        register short val, grp, src, vg;
+int16_t ef_aval(int16_t n)
+{
+        register int16_t val, grp, src, vg;
         register struct s_entry *ep;
 
@@ -225 +225 @@
                 if (E_NULL NE (ep = findev(p_cur, t_cur, EV_ANVL, vg, -1))) {
 
-                        ep->e_dn = (struct s_entry *)((long)val << 16);
+                        ep->e_dn = (struct s_entry *)((int32_t)val << 16);
 
                 } else if (E_NULL NE (ep = e_alc(E_SIZE2))) {
@@ -231 +231 @@
                         ep->e_type  = EV_ANVL;
                         ep->e_data1 = vg;
-                        ep->e_dn    = (struct s_entry *)((long)val << 16);
+                        ep->e_dn    = (struct s_entry *)((int32_t)val << 16);
                         ep->e_time  = t_cur;
                         p_cur = e_ins(ep, ep_adj(p_cur, 0, t_cur))->e_fwd;
@@ -253 +253 @@
 */
 
-short rd_aval(short n)
-{
-        register short grp, val, gs;
-        short val1, val2;
-        char    buf[6];
+int16_t rd_aval(int16_t n)
+{
+        register int16_t grp, val, gs;
+        int16_t val1, val2;
+        int8_t  buf[6];
 
         grp = abs(angroup) - 1;
@@ -299 +299 @@
 */
 
-short nd_aval(short n, short k)
-{
-        register short ec;
+int16_t nd_aval(int16_t n, int16_t k)
+{
+        register int16_t ec;
 
         ec = stccol - cfetp->flcol;
@@ -341 +341 @@
 */
 
-short et_agrp(short n)
+int16_t et_agrp(int16_t n)
 {
         sprintf(ebuf, "%02.2d", abs(angroup));
@@ -358 +358 @@
 */
 
-short ef_agrp(short n)
-{
-        register short ival;
+int16_t ef_agrp(int16_t n)
+{
+        register int16_t ival;
 
         ebflag = FALSE;
@@ -386 +386 @@
 */
 
-short rd_agrp(short n)
-{
-        char    buf[4];
+int16_t rd_agrp(int16_t n)
+{
+        int8_t  buf[4];
 
         sprintf(buf, "%02.2d", abs(angroup));
@@ -410 +410 @@
 */
 
-short nd_agrp(short n, short k)
-{
-        register short ec;
+int16_t nd_agrp(int16_t n, int16_t k)
+{
+        register int16_t ec;
 
         ec = stccol - cfetp->flcol;