Changeset 7258c6a in buchla-68k for ram/etioas.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/etioas.c (modified) (18 diffs)

ram/etioas.c

@@ -19 +19 @@
 #include "scdsp.h"
 
-extern  unsigned        fromfpu(unsigned fputime);
-extern  unsigned        tofpu(unsigned time);
-
-extern  unsigned        *obj8;
-extern  unsigned        curintp;
-
-extern  short   ctrsw;
-extern  short   curasg;
-extern  short   curtun;
-extern  short   tmpoval;
-extern  short   recsw;
-extern  short   stccol;
-
-extern  char    dspbuf[];
+extern  uint16_t        fromfpu(uint16_t fputime);
+extern  uint16_t        tofpu(uint16_t time);
+
+extern  uint16_t        *obj8;
+extern  uint16_t        curintp;
+
+extern  int16_t ctrsw;
+extern  int16_t curasg;
+extern  int16_t curtun;
+extern  int16_t tmpoval;
+extern  int16_t recsw;
+extern  int16_t stccol;
+
+extern  int8_t  dspbuf[];
 
 extern  struct  gdsel   *gdstbc[];
@@ -52 +52 @@
 */
 
-short et_ioas(short n)
+int16_t et_ioas(int16_t n)
 {
         sprintf(ebuf, "%02.2d", curasg);
@@ -69 +69 @@
 */
 
-short ef_ioas(short n)
-{
-        register short ival;
+int16_t ef_ioas(int16_t n)
+{
+        register int16_t ival;
         register struct s_entry *ep;
 
@@ -117 +117 @@
 */
 
-short rd_ioas(short n)
+int16_t rd_ioas(int16_t n)
 {
         sprintf(dspbuf, "%02.2d", curasg);
@@ -134 +134 @@
 */
 
-short nd_ioas(short n, short k)
-{
-        register short ec;
+int16_t nd_ioas(int16_t n, int16_t k)
+{
+        register int16_t ec;
 
         ec = stccol - cfetp->flcol;
@@ -165 +165 @@
 */
 
-short et_tune(short n)
+int16_t et_tune(int16_t n)
 {
         ebuf[0] = '0' + curtun;
@@ -183 +183 @@
 */
 
-short ef_tune(short n)
-{
-        register short ival;
+int16_t ef_tune(int16_t n)
+{
+        register int16_t ival;
         register struct s_entry *ep;
 
@@ -225 +225 @@
 */
 
-short rd_tune(short n)
+int16_t rd_tune(int16_t n)
 {
         if (v_regs[5] & 0x0180)
@@ -241 +241 @@
 */
 
-short nd_tune(short n, short k)
-{
-        register short ec;
+int16_t nd_tune(int16_t n, int16_t k)
+{
+        register int16_t ec;
 
         ebuf[0]  = k + '0';
@@ -271 +271 @@
 */
 
-short et_tmpo(short n)
+int16_t et_tmpo(int16_t n)
 {
         sprintf(ebuf, "%03.3d", tmpoval);
@@ -289 +289 @@
 */
 
-short ef_tmpo(short n)
-{
-        register short ival;
+int16_t ef_tmpo(int16_t n)
+{
+        register int16_t ival;
         register struct s_entry *ep;
 
@@ -337 +337 @@
 */
 
-short rd_tmpo(short n)
+int16_t rd_tmpo(int16_t n)
 {
         sprintf(dspbuf, "%03.3d", tmpoval);
@@ -355 +355 @@
 */
 
-short nd_tmpo(short n, short k)
-{
-        register short ec;
+int16_t nd_tmpo(int16_t n, int16_t k)
+{
+        register int16_t ec;
 
         ec = stccol - cfetp->flcol;
@@ -387 +387 @@
 */
 
-short et_intp(short n)
-{
-        register short th, tl;
-        register long tt, sc, sf;
+int16_t et_intp(int16_t n)
+{
+        register int16_t th, tl;
+        register int32_t tt, sc, sf;
 
         sc = 1000L;
@@ -410 +410 @@
 */
 
-short ef_intp(short n)
-{
-        register short i;
-        register unsigned tmpval;
+int16_t ef_intp(int16_t n)
+{
+        register int16_t i;
+        register uint16_t tmpval;
         register struct s_entry *ep;
 
@@ -426 +426 @@
         tmpval = ((tmpval * 10) + (ebuf[3] - '0')) * 100;
 
-        if (tmpval > (unsigned)64900)
+        if (tmpval > (uint16_t)64900)
                 return(FAILURE);
 
@@ -468 +468 @@
 */
 
-short rd_intp(short n)
-{
-        register short th, tl;
-        register long tt, sc, sf;
+int16_t rd_intp(int16_t n)
+{
+        register int16_t th, tl;
+        register int32_t tt, sc, sf;
 
         sc = 1000L;
@@ -494 +494 @@
 */
 
-short nd_intp(short n, short k)
-{
-        register short ec;
+int16_t nd_intp(int16_t n, int16_t k)
+{
+        register int16_t ec;
 
         ec = stccol - cfetp->flcol;     /* setup edit buffer column */