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

libcio/clusmap.c

@@ -12 +12 @@
 #include "stddefs.h"
 
-extern  short   micons(short wi);
-extern  unsigned        _gtcl12(char *fat, unsigned cl);
-extern  long    miconl(long wi);
+extern  int16_t micons(int16_t wi);
+extern  uint16_t        _gtcl12(int8_t *fat, uint16_t cl);
+extern  int32_t miconl(int32_t wi);
 
 extern  struct  bpb     *_thebpb;
-extern  unsigned        _thefat[];
-
-extern  int     _filecl(struct fcb *fp);
-extern  int     _noper(void);
-
-/* 
-
-*/
-
-static char     *mfname[] = {   /* FCB flag names */
+extern  uint16_t        _thefat[];
+
+extern  int16_t _filecl(struct fcb *fp);
+extern  int16_t _noper(void);
+
+/* 
+
+*/
+
+static int8_t   *mfname[] = {   /* FCB flag names */
 
         "?D0",  /* D0  - 0001 */
@@ -53 +53 @@
 */
 
-static  char    *dfname[] = {
+static  int8_t  *dfname[] = {
 
         "RDONLY",       /* D0 - 01 */
@@ -65 +65 @@
 };
 
-static  char    *ffname[] = {
+static  int8_t  *ffname[] = {
 
         "BUSY  ",       /* D0 - 01 */
@@ -81 +81 @@
 */
 
-static int waitcr(void)
-{
-        char    c;
+static int16_t waitcr(void)
+{
+        int8_t  c;
 
         BIOS(B_PUTC, CON_DEV, '\007');
@@ -106 +106 @@
 */
 
-int ClusMap(struct fcb *fcp)
-{
-        int     clus, nc;
-        long    alsize, bused, bunused;
+int16_t ClusMap(struct fcb *fcp)
+{
+        int16_t clus, nc;
+        int32_t alsize, bused, bunused;
 
         if (!(fcp->modefl & FC_OPN)) {
@@ -175 +175 @@
 struct fcb *FCBmode(struct fcb *fcp)
 {
-        register unsigned short mf;
-        register short i;
+        register uint16_t mf;
+        register int16_t i;
 
         printf("  flags:  ");
@@ -254 +254 @@
 */
 
-void MapFAT(char *fat, short ncl, short stops)
-{
-        register int i;
+void MapFAT(int8_t *fat, int16_t ncl, int16_t stops)
+{
+        register int16_t i;
 
         printf("\nCluster dump of FAT at 0x%08.8lx  (%d entries):\n",
@@ -290 +290 @@
 FILE *FILEfl(FILE *fp)
 {
-        register unsigned short mf;
-        register short i;
+        register uint16_t mf;
+        register int16_t i;
 
         printf("  _flags:  ");
@@ -320 +320 @@
 void FILEpr(FILE *fp)
 {
-        int     (*arg)(), ft;
-        char    *ds, *fsn, *fse;
+        int16_t (*arg)(), ft;
+        int8_t  *ds, *fsn, *fse;
         struct  fcb     *fcp;
 
@@ -379 +379 @@
 */
 
-struct fcb *fd2fcb(short fd)
+struct fcb *fd2fcb(int16_t fd)
 {
         if ((fd < 0) OR (fd > MAXCHAN))