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

libcio/filesys.c

@@ -29 +29 @@
 #define DE_NULL         ((struct dirent *)0L)
 
-extern  short   micons(short wi);
-extern  long    miconl(long wi);
-extern  void    _ptcl12(unsigned *fat, unsigned cl, unsigned val);
-extern  char    *FilName(char *s, char *p);
-extern  char    *FilExt(char *s, char *p);
+extern  int16_t micons(int16_t wi);
+extern  int32_t miconl(int32_t wi);
+extern  void    _ptcl12(uint16_t *fat, uint16_t cl, uint16_t val);
+extern  int8_t  *FilName(int8_t *s, int8_t *p);
+extern  int8_t  *FilExt(int8_t *s, int8_t *p);
 
 #if DEBUGIT
@@ -44 +44 @@
 struct  dirent  *_dptr;                 /* internal directory pointer */
 
-unsigned _thefat[MAXFAT * WDPSEC];      /* file allocation table */
-
-int     _fatin;                         /* FAT has been read */
-int     _dirin;                         /* directory has been read */
-int     _bpbin;                         /* BPB has been read */
-int     _fatmod;                        /* FAT modified flag */
-int     _dirmod;                        /* directory modified flag */
-
-long    _berrno;                        /* BIOS error number */
+uint16_t _thefat[MAXFAT * WDPSEC];      /* file allocation table */
+
+int16_t _fatin;                         /* FAT has been read */
+int16_t _dirin;                         /* directory has been read */
+int16_t _bpbin;                         /* BPB has been read */
+int16_t _fatmod;                        /* FAT modified flag */
+int16_t _dirmod;                        /* directory modified flag */
+
+int32_t _berrno;                        /* BIOS error number */
 
 /* 
@@ -66 +66 @@
 */
 
-unsigned _cl2lsn(struct bpb *bpp, unsigned clnum)
+uint16_t _cl2lsn(struct bpb *bpp, uint16_t clnum)
 {
         return(bpp->datrec + (bpp->clsiz * (clnum - 2)) );
@@ -78 +78 @@
 */
 
-unsigned _gtcl12(char *fat, unsigned cl)
-{
-        register unsigned cla, clt;
+uint16_t _gtcl12(int8_t *fat, uint16_t cl)
+{
+        register uint16_t cla, clt;
 
         cla = cl + (cl >> 1);
-        clt = ((unsigned)0xFF00 & (fat[cla+1] << 8))
-                | ((unsigned)0x00FF & fat[cla]);
+        clt = ((uint16_t)0xFF00 & (fat[cla+1] << 8))
+                | ((uint16_t)0x00FF & fat[cla]);
 
         if (cl & 1)
                 clt >>= 4;
 
-        clt &= (unsigned)0x0FFF;
+        clt &= (uint16_t)0x0FFF;
         return(clt);
 }
@@ -104 +104 @@
 */
 
-unsigned _getfat(unsigned *bufad, unsigned nfat, struct bpb *bpp)
-{
-        unsigned fatsec;
+uint16_t _getfat(uint16_t *bufad, uint16_t nfat, struct bpb *bpp)
+{
+        uint16_t fatsec;
 
         fatsec = nfat ? bpp->fatrec : (bpp->fatrec - bpp->fsiz);
-        return(BIOS(B_RDWR, 0, (char *)bufad, bpp->fsiz, fatsec, 0));
+        return(BIOS(B_RDWR, 0, (int8_t *)bufad, bpp->fsiz, fatsec, 0));
 }
 
@@ -123 +123 @@
 */
 
-int _rdfat(unsigned *bufad, struct bpb *bpp)
+int16_t _rdfat(uint16_t *bufad, struct bpb *bpp)
 {
         if (_getfat(bufad, bpp, 0)) {
@@ -143 +143 @@
 */
 
-int _rdroot(unsigned *buf, struct bpb *bpp)
-{
-        return(BIOS(B_RDWR, 0, (char *)buf, bpp->rdlen,
+int16_t _rdroot(uint16_t *buf, struct bpb *bpp)
+{
+        return(BIOS(B_RDWR, 0, (int8_t *)buf, bpp->rdlen,
                 (bpp->fatrec + bpp->fsiz), 0));
 }
@@ -162 +162 @@
 */
 
-int _nsic(struct fcb *fcp, struct bpb *bpp, char *fp)
-{
-        register unsigned tfe;
+int16_t _nsic(struct fcb *fcp, struct bpb *bpp, int8_t *fp)
+{
+        register uint16_t tfe;
 
         /* check the FCB flags */
@@ -261 +261 @@
 struct dirent *_dsrch(struct dirent *de)
 {
-        unsigned i, dl;
+        uint16_t i, dl;
         register struct dirent *dp;
 
@@ -298 +298 @@
 struct dirent *_dsnew(void)
 {
-        unsigned i, dl;
+        uint16_t i, dl;
         register struct dirent *dp;
 
@@ -332 +332 @@
 */
 
-void _deadio(struct fcb *fcp, int err)
+void _deadio(struct fcb *fcp, int16_t err)
 {
         fcp->clsec = 0;
@@ -355 +355 @@
 */
 
-int _seek(struct fcb *fcp)
-{
-        register unsigned acls, rcls, nc;
-        unsigned sic, spc;
+int16_t _seek(struct fcb *fcp)
+{
+        register uint16_t acls, rcls, nc;
+        uint16_t sic, spc;
 
         if (!(fcp->modefl & FC_OPN)) {          /* file must be open */
@@ -461 +461 @@
 */
 
-int _ftrnc(struct dirent *dp)
-{
-        register unsigned acls, ncls;
+int16_t _ftrnc(struct dirent *dp)
+{
+        register uint16_t acls, ncls;
 
 #if     DEBUGIT
@@ -525 +525 @@
 */
 
-int _newcls(void)
-{
-        register int tc, i;
+int16_t _newcls(void)
+{
+        register int16_t tc, i;
 
         tc = _thebpb->numcl;
@@ -548 +548 @@
 */
 
-int _alcnew(struct fcb *fcp)
-{
-        register int ac, nc, pc;
+int16_t _alcnew(struct fcb *fcp)
+{
+        register int16_t ac, nc, pc;
 
 #if     DEBUGIT
@@ -639 +639 @@
 */
 
-int _fmake(struct fcb *fcp)
+int16_t _fmake(struct fcb *fcp)
 {
         register struct dirent *dp;
@@ -664 +664 @@
 */
 
-int _opnvol(void)
-{
-        register long drc;
+int16_t _opnvol(void)
+{
+        register int32_t drc;
 
         /* check for media change if we already have a BPB */
@@ -750 +750 @@
 */
 
-int _opfcb(struct fcb *fcp)
-{
-        int     rc;
+int16_t _opfcb(struct fcb *fcp)
+{
+        int16_t rc;
 
         /* check for an already open FCB */
@@ -892 +892 @@
 */
 
-int _inifcb(struct fcb *fcp, char *name, char *ext, int mode)
-{
-        int     fl;
-        register int    i;
-        register char *s1, *s2, c;
+int16_t _inifcb(struct fcb *fcp, int8_t *name, int8_t *ext, int16_t mode)
+{
+        int16_t fl;
+        register int16_t        i;
+        register int8_t *s1, *s2, c;
 
         /* clear the FCB */
 
-        memset((char *)fcp, 0, sizeof (struct fcb));
+        memset((int8_t *)fcp, 0, sizeof (struct fcb));
 
         /* check for valid flags */
@@ -1024 +1024 @@
 */
 
-int ClsFile(struct fcb *fcp)
+int16_t ClsFile(struct fcb *fcp)
 {
         register struct dirent *dp;
@@ -1136 +1136 @@
 */
 
-short fcbinit(char *name, struct fcb *fcp)
-{
-        char    tmpname[9], tmpext[4];
+int16_t fcbinit(int8_t *name, struct fcb *fcp)
+{
+        int8_t  tmpname[9], tmpext[4];
 
         return(_inifcb(fcp, FilName(name, tmpname), FilExt(name, tmpext), 0));
@@ -1153 +1153 @@
 */
 
-int DelFile(struct fcb *fcp)
+int16_t DelFile(struct fcb *fcp)
 {
 #if     DEBUGIT