Changeset 99cac86 in buchla-68k

Timestamp:

07/16/2017 11:27:12 AM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

d60f436

Parents:

ea232f9

Message:

Simplify kind handling.

Files:

• include/io.h (modified) (2 diffs)
• libcio/clusmap.c (modified) (2 diffs)
• libcio/conwr.c (modified) (1 diff)
• libcio/fsinit.c (modified) (1 diff)
• libcio/open.c (modified) (3 diffs)

include/io.h

@@ -34 +34 @@
         int16_t d_seek;         /* seek routine code */
         devop   d_open;         /* special open function */
+        int16_t d_kind;         /* kind of device */
 };
 
@@ -40 +41 @@
         int8_t  *d_name;        /* device name */
         struct  device  *d_dev; /* pointer to device structure */
-        io_arg  d_arg;          /* argument to device driver */
-        int16_t d_kind;         /* kind of device */
 };

libcio/clusmap.c

@@ -258 +258 @@
         chclo arg;
         int16_t ft;
-        int8_t  *ds, *fsn, *fse;
+        int8_t  *fsn, *fse;
         struct  fcb     *fcp;
 
@@ -275 +275 @@
         if (arg EQ _nopc) {
 
-                ds = ((struct devtabl *)chantab[fp->_unit].c_arg)->d_name;
-                printf(" is a device:  [%s]\n", ds);
+                printf(" has device kind:  [%d]\n",
+                        (int16_t)(int32_t)chantab[fp->_unit].c_arg);
 
         } else if (arg EQ _filecl) {

libcio/conwr.c

@@ -18 +18 @@
 int16_t _conwr(io_arg arg, void *buff, int16_t len)
 {
-        struct devtabl *dp;
+        int16_t kind;
         int8_t *buff8;
         register int16_t count;
 
-        dp = (struct devtabl *)arg;
+        kind = (int16_t)arg;
         buff8 = buff;
 
         for (count = 0; count < len; ++count)
-                BIOS(B_PUTC, dp->d_kind, *buff8++);
+                BIOS(B_PUTC, kind, *buff8++);
 
         return(count);

libcio/fsinit.c

@@ -157 +157 @@
 
         for (i = 3; i < MAXCHAN; i++)   /*  3..MAXCHAN-1 - not preassigned */
-                InitCH(&chantab[i], 0, 0, 0, 0, _badfc, (io_arg)0L );
+                InitCH(&chantab[i], 0, 0, 0, 0, _badfc, (io_arg)-1 );
 
         _bpbin  = FALSE;        /* BPB isn't in memory */

libcio/open.c

@@ -8 +8 @@
 #include "ram.h"
 
-static struct device condev  = { 2, 2, 1, 0, _nopo  };
-static struct device filedev = { 1, 1, 0, 1, _fileop };
+static struct device condev  = { 2, 2, 1, 0, _nopo,   CON_DEV };
+static struct device filedev = { 1, 1, 0, 1, _fileop,      -1 };
 
 /*
@@ -19 +19 @@
 static struct devtabl devtabl[] = {
 
-        { "con:", &condev,  &devtabl[0], CON_DEV },     /* console device */
-        { "CON:", &condev,  &devtabl[1], CON_DEV },
-
-        {      0, &filedev,        NULL,      -1 }      /* this MUST be the last entry */
+        { "con:", &condev  },   /* console device */
+        { "CON:", &condev  },
+
+        {      0, &filedev }    /* this MUST be the last entry */
 };
 
@@ -80 +80 @@
         /* setup the channel table entries */
 
-        chp->c_arg   = dp->d_arg;
+        chp->c_arg   = (io_arg)(int32_t)dp->d_dev->d_kind;
         chp->c_ioctl = dev->d_ioctl;
         chp->c_seek  = dev->d_seek;