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

ram/dformat.c

@@ -14 +14 @@
 #define DF_DSIZ         7               /* directory size */
 
-extern  short   defect;                 /* defect code */
-extern  short   dferror;                /* error code from BIOS or XBIOS */
+extern  int16_t defect;                 /* defect code */
+extern  int16_t dferror;                /* error code from BIOS or XBIOS */
 
-extern  short   dftype;                 /* disk type code */
-extern  short   dfsides;                /* number of sides */
+extern  int16_t dftype;                 /* disk type code */
+extern  int16_t dfsides;                /* number of sides */
 
-extern  unsigned        dfbuf[4096];    /* track formatting buffer */
+extern  uint16_t        dfbuf[4096];    /* track formatting buffer */
 
 /* 
@@ -49 +49 @@
 */
 
-short dformat(short dt)
+int16_t dformat(int16_t dt)
 {
-        register short trk;
+        register int16_t trk;
 
         if (dt) {       /* setup for double sided disk */
@@ -68 +68 @@
         for (trk = 0; trk < 80; trk++) {
 
-                if (dferror = (short)XBIOS(X_FORMAT, dfbuf, 0L, 0, 9,
+                if (dferror = (int16_t)XBIOS(X_FORMAT, dfbuf, 0L, 0, 9,
                     trk, 0, 1, 0x87654321L, 0xE5E5)) {
 
@@ -77 +77 @@
                 if (dfsides EQ 2) {     /* format second side */
 
-                        if (dferror = (short)XBIOS(X_FORMAT, dfbuf, 0L, 0, 9,
+                        if (dferror = (int16_t)XBIOS(X_FORMAT, dfbuf, 0L, 0, 9,
                             trk, 1, 1, 0x87654321L, 0xE5E5)) {
 
@@ -93 +93 @@
         /* write boot sector to disk */
 
-        if (dferror = (short)XBIOS(X_FLOPWR, dfbuf, 0L, 0, 1, 0, 0, 1)) {
+        if (dferror = (int16_t)XBIOS(X_FLOPWR, dfbuf, 0L, 0, 1, 0, 0, 1)) {
 
                 defect = 3;     /* unable to write boot sector */
@@ -114 +114 @@
         }
 
-        if (dferror = (short)BIOS(B_RDWR, 3, dfbuf,
+        if (dferror = (int16_t)BIOS(B_RDWR, 3, dfbuf,
             DF_FSIZ, DF_FREC, 0)) {
 
@@ -121 +121 @@
         }
 
-        if (dferror = (short)BIOS(B_RDWR, 3, dfbuf,
+        if (dferror = (int16_t)BIOS(B_RDWR, 3, dfbuf,
             DF_FSIZ, DF_FREC-DF_FSIZ, 0)) {
 
@@ -132 +132 @@
         memsetw(dfbuf, 0, 4096);
 
-        if (dferror = (short)BIOS(B_RDWR, 3, dfbuf,
+        if (dferror = (int16_t)BIOS(B_RDWR, 3, dfbuf,
             DF_DSIZ, DF_FREC+DF_FSIZ, 0)) {