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

libcio/fsinit.c

@@ -14 +14 @@
 #include "stddefs.h"
 
-extern  int     _bpbin, _dirin, _fatin, _dirmod, _fatmod;
+extern  int16_t _bpbin, _dirin, _fatin, _dirmod, _fatmod;
 
-int     _badfd(void);
-int     _noper(void);
+int16_t _badfd(void);
+int16_t _noper(void);
 
-char    *Stdbufs;                       /* buffer chain pointer */
+int8_t  *Stdbufs;                       /* buffer chain pointer */
 
-char    Wrkbuf[BPSEC];                  /* sector work buffer */
+int8_t  Wrkbuf[BPSEC];                  /* sector work buffer */
 
-long    Stdbuf[MAXDFILE][BUFSIZL];      /* standard buffers */
+int32_t Stdbuf[MAXDFILE][BUFSIZL];      /* standard buffers */
 
 FILE Cbuffs[NSTREAMS];                  /* stream file control table */
@@ -35 +35 @@
 /* WARNING:  this ONLY works for 512 byte sectors, 9 sectors per track */
 
-short   _b_tbuf[9][256];        /* the track buffer */
+int16_t _b_tbuf[9][256];        /* the track buffer */
 
-short   _b_trak;                /* current track */
-short   _b_side;                /* current side */
-short   _b_sect;                /* current sector */
-short   _b_tsec;                /* current base sector of current track */
+int16_t _b_trak;                /* current track */
+int16_t _b_side;                /* current side */
+int16_t _b_sect;                /* current sector */
+int16_t _b_tsec;                /* current base sector of current track */
 
 #endif
@@ -54 +54 @@
 */
 
-int _badfd(void)
+int16_t _badfd(void)
 {
         errno = EBADF;          /* set bad fd code */
@@ -66 +66 @@
 */
 
-int _noper(void)
+int16_t _noper(void)
 {
         return(SUCCESS);        /* return with a non-error indication */
@@ -81 +81 @@
 */
 
-void InitCH(struct channel *cp, char rdi, char wri, char ioi, char ski, int (*cfp)(), io_arg charg)
+void InitCH(struct channel *cp, int8_t rdi, int8_t wri, int8_t ioi, int8_t ski, int16_t (*cfp)(), io_arg charg)
 {
         cp->c_read  = rdi;
@@ -97 +97 @@
 */
 
-void Init_CB(FILE *fp, char unit, char flags, long *bufad, int bufsize)
+void Init_CB(FILE *fp, int8_t unit, int8_t flags, int32_t *bufad, int16_t bufsize)
 {
-        fp->_bp     = (char *)0L;
-        fp->_bend   = (char *)0L;
-        fp->_buff   = (char *)bufad;
+        fp->_bp     = (int8_t *)0L;
+        fp->_bend   = (int8_t *)0L;
+        fp->_buff   = (int8_t *)bufad;
         fp->_flags  = flags;
         fp->_unit   = unit;
@@ -120 +120 @@
 void InitFS(void)
 {
-        register int i;
+        register int16_t i;
 
         memset(_fcbtab, 0, sizeof _fcbtab);             /* clear fcb table */
         memsetw(Stdbuf, 0, sizeof Stdbuf / 2);          /* clear buffers */
 
-        Init_CB(stdin,  _BUSY, 0, (char *)0L, BUFSIZ);  /* stdin */
-        Init_CB(stdout, _BUSY, 1, (char *)0L, 1);       /* stdout */ 
-        Init_CB(stderr, _BUSY, 2, (char *)0L, 1);       /* stderr */
+        Init_CB(stdin,  _BUSY, 0, (int8_t *)0L, BUFSIZ);        /* stdin */
+        Init_CB(stdout, _BUSY, 1, (int8_t *)0L, 1);     /* stdout */ 
+        Init_CB(stderr, _BUSY, 2, (int8_t *)0L, 1);     /* stderr */
 
         for (i = 3; i < NSTREAMS; i++)
-                Init_CB(&Cbuffs[i], 0, 0, (char *)0L, 0);
+                Init_CB(&Cbuffs[i], 0, 0, (int8_t *)0L, 0);
 
         Stdbuf[0][0] = 0L;              /* initialize the buffer list */
 
         for (i = 1; i < MAXDFILE; i++)
-                Stdbuf[i][0] = (long)Stdbuf[i-1];
+                Stdbuf[i][0] = (int32_t)Stdbuf[i-1];
 
         Stdbufs = Stdbuf[MAXDFILE-1];