Changeset 7258c6a in buchla-68k for libcio/blkrd.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:

• libcio/blkrd.c (modified) (6 diffs)

libcio/blkrd.c

@@ -40 +40 @@
 #endif
 
-extern  int     _nsic(struct fcb *fcp, struct bpb *bpp, char *fp);
+extern  int16_t _nsic(struct fcb *fcp, struct bpb *bpp, int8_t *fp);
 
-extern  long    _berrno;                /* last file system bios error number */
+extern  int32_t _berrno;                /* last file system bios error number */
 
-extern  unsigned        _thefat[];              /* current file allocation table */
+extern  uint16_t        _thefat[];              /* current file allocation table */
 
 extern  struct  bpb     *_thebpb;       /* current bios parameter block */
@@ -52 +52 @@
 /* WARNING:  this ONLY works for 512 byte sectors, 9 sectors per track */
 
-extern  short   _b_tbuf[9][256];        /* the track buffer */
+extern  int16_t _b_tbuf[9][256];        /* the track buffer */
 
-extern  short   _b_trak;                /* current track */
-extern  short   _b_side;                /* current side */
-extern  short   _b_sect;                /* current sector */
-extern  short   _b_tsec;                /* current base sector of current track */
+extern  int16_t _b_trak;                /* current track */
+extern  int16_t _b_side;                /* current side */
+extern  int16_t _b_sect;                /* current sector */
+extern  int16_t _b_tsec;                /* current base sector of current track */
 
 #endif
@@ -73 +73 @@
 */
 
-long _secrd(char *buf, short rec)
+int32_t _secrd(int8_t *buf, int16_t rec)
 {
-        register short  track, side, sector;
-        long brc;
+        register int16_t        track, side, sector;
+        int32_t brc;
 
         if (_thebpb->dspt NE 9)                 /* make sure we can do this */
@@ -118 +118 @@
         }
 
-        memcpy(buf, (char *)_b_tbuf[sector], 512);
+        memcpy(buf, (int8_t *)_b_tbuf[sector], 512);
         return(0L);
 }
@@ -135 +135 @@
 */
 
-int blkrd(struct fcb *fcp, char *buf, int ns)
+int16_t blkrd(struct fcb *fcp, int8_t *buf, int16_t ns)
 {
-        register long   brc;            /* bios return code */
-        register int    rb;             /* _nsic return code */
+        register int32_t        brc;            /* bios return code */
+        register int16_t        rb;             /* _nsic return code */
 
         if (ns < 0)             /* can't read a negative number of sectors */
@@ -152 +152 @@
 
 #if     TBUFFER
-                if (brc = _secrd(buf, (short)fcp->curdsn)) {
+                if (brc = _secrd(buf, (int16_t)fcp->curdsn)) {
 #else
                 if (brc = BIOS(B_RDWR, 0, buf, 1, (short)fcp->curdsn, 0)) {