Changeset 4a17aeb in buchla-68k

Timestamp:

07/11/2017 05:11:50 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

7af8be4

Parents:

4aa78b2

Message:

Prototypes for I/O dispatch pointers.

Files:

• include/io.h (modified) (3 diffs)
• libcio/close.c (modified) (2 diffs)
• libcio/clusmap.c (modified) (2 diffs)
• libcio/fsinit.c (modified) (4 diffs)
• libcio/fsinit.x (modified) (1 diff)
• libcio/open.c (modified) (3 diffs)
• libcio/read.c (modified) (1 diff)
• libcio/write.c (modified) (1 diff)

include/io.h

@@ -11 +11 @@
 #include "stdint.h"
 
+struct devtabl;
+struct channel;
+
+typedef int16_t (*chclo)(io_arg arg);
+typedef int16_t (*devop)(int8_t *name, int16_t flag, int16_t mode, struct channel *chp, struct devtabl *dp);
+
 struct channel {                /* channel table entry */
 
@@ -17 +23 @@
         int8_t  c_ioctl;        /* ioctl routine index */
         int8_t  c_seek;         /* seek routine index */
-        int16_t (*c_close)();   /* close function pointer */
+        chclo   c_close;        /* close function pointer */
         io_arg  c_arg;          /* argument to channel driver */
 };
@@ -27 +33 @@
         int8_t  d_ioctl;        /* ioctl routine code */
         int8_t  d_seek;         /* seek routine code */
-        int16_t (*d_open)();    /* special open function */
+        devop   d_open;         /* special open function */
 };
 

libcio/close.c

@@ -74 +74 @@
         chp->c_ioctl = 0;
         chp->c_seek  = 0;
-        chp->c_close = _badfd;
+        chp->c_close = _badfc;
 
         if (_fatmod)
@@ -115 +115 @@
 
         for (fd = 0; fd < MAXCHAN; ++fd)
-                if (chantab[fd].c_close NE _badfd)
+                if (chantab[fd].c_close NE _badfc)
                         close(fd);
 

libcio/clusmap.c

@@ -289 +289 @@
 void FILEpr(FILE *fp)
 {
-        int16_t (*arg)(), ft;
+        chclo arg;
+        int16_t ft;
         int8_t  *ds, *fsn, *fse;
         struct  fcb     *fcp;
@@ -305 +306 @@
         ft = 0;
 
-        if (arg EQ _noper) {
+        if (arg EQ _nopc) {
 
                 ds = ((struct devtabl *)chantab[fp->_unit].c_arg)->d_name;

libcio/fsinit.c

@@ -39 +39 @@
 /*
    ============================================================================
-        _badfd() -- set "bad fd" error
+        _badfio() -- set "bad fd" error on I/O
    ============================================================================
 */
 
-int16_t _badfd(void)
+int16_t _badfio(io_arg arg, int8_t *buff, int16_t len)
 {
         errno = EBADF;          /* set bad fd code */
@@ -51 +51 @@
 /*
    ============================================================================
-        _noper() -- null return with no error condition
+        _badfc() -- set "bad fd" error on close
    ============================================================================
 */
 
-int16_t _noper(void)
+int16_t _badfc(io_arg arg)
+{
+        errno = EBADF;          /* set bad fd code */
+        return(FAILURE);        /* return with an error indication */
+}
+
+/*
+   ============================================================================
+        _nopo() -- null open with no error condition
+   ============================================================================
+*/
+
+int16_t _nopo(int8_t *name, int16_t flag, int16_t mode, struct channel *chp, struct devtabl *dp)
+{
+        return(SUCCESS);        /* return with a non-error indication */
+}
+
+/*
+   ============================================================================
+        _nopc() -- null close with no error condition
+   ============================================================================
+*/
+
+int16_t _nopc(io_arg arg)
 {
         return(SUCCESS);        /* return with a non-error indication */
@@ -70 +93 @@
 */
 
-void InitCH(struct channel *cp, int8_t rdi, int8_t wri, int8_t ioi, int8_t ski, int16_t (*cfp)(), io_arg charg)
+void InitCH(struct channel *cp, int8_t rdi, int8_t wri, int8_t ioi, int8_t ski, chclo cfp, io_arg charg)
 {
         cp->c_read  = rdi;
@@ -128 +151 @@
         Stdbufs = Stdbuf[MAXDFILE-1];
 
-        InitCH(&chantab[0], 2, 0, 1, 0, _noper, (io_arg)CON_DEV );      /*  0 - stdin  */
-        InitCH(&chantab[1], 0, 2, 1, 0, _noper, (io_arg)CON_DEV );      /*  1 - stdout */
-        InitCH(&chantab[2], 0, 2, 1, 0, _noper, (io_arg)CON_DEV );      /*  2 - stderr */
+        InitCH(&chantab[0], 2, 0, 1, 0, _nopc, (io_arg)CON_DEV );       /*  0 - stdin  */
+        InitCH(&chantab[1], 0, 2, 1, 0, _nopc, (io_arg)CON_DEV );       /*  1 - stdout */
+        InitCH(&chantab[2], 0, 2, 1, 0, _nopc, (io_arg)CON_DEV );       /*  2 - stderr */
 
         for (i = 3; i < MAXCHAN; i++)   /*  3..MAXCHAN-1 - not preassigned */
-                InitCH(&chantab[i], 0, 0, 0, 0, _badfd, (io_arg)0L );
+                InitCH(&chantab[i], 0, 0, 0, 0, _badfc, (io_arg)0L );
 
         _bpbin  = FALSE;        /* BPB isn't in memory */

libcio/fsinit.x

@@ -37 +37 @@
 */
 
-extern  void            InitCH(struct channel *cp, int8_t rdi, int8_t wri, int8_t ioi, int8_t ski, int16_t (*cfp)(), io_arg charg);
+extern  void            InitCH(struct channel *cp, int8_t rdi, int8_t wri, int8_t ioi, int8_t ski, chclo cfp, io_arg charg);
 extern  void            InitFS(void);
 extern  void            Init_CB(FILE *fp, int8_t unit, int8_t flags, int32_t *bufad, int16_t bufsize);
 extern  int16_t         _badfd(void);
 extern  int16_t         _noper(void);
+
+extern  int16_t         _badfc(io_arg arg);
+extern  int16_t         _badfio(io_arg arg, int8_t *buff, int16_t len);
+extern  int16_t         _nopc(io_arg arg);
+extern  int16_t         _nopo(int8_t *name, int16_t flag, int16_t mode, struct channel *chp, struct devtabl *dp);

libcio/open.c

@@ -8 +8 @@
 #include "ram.h"
 
-static struct device condev  = { 2, 2, 1, 0, _noper  };
+static struct device condev  = { 2, 2, 1, 0, _nopo  };
 static struct device filedev = { 1, 1, 0, 1, _fileop };
 
@@ -48 +48 @@
 
         for (chp = chantab, fd = 0 ; fd < MAXCHAN ; ++chp, ++fd)
-                if (chp->c_close EQ _badfd)
+                if (chp->c_close EQ _badfc)
                         goto fndchan;
 
@@ -90 +90 @@
         chp->c_ioctl = dev->d_ioctl;
         chp->c_seek  = dev->d_seek;
-        chp->c_close = _noper;
+        chp->c_close = _nopc;
 
         if ((*dev->d_open)(name, flag, mode, chp, dp) < 0) {    /* open */
 
-                chp->c_close = _badfd;  /* couldn't open for some reason */
+                chp->c_close = _badfc;  /* couldn't open for some reason */
                 return(FAILURE);
         }

libcio/read.c

@@ -38 +38 @@
 #include "ram.h"
 
-static int16_t (*t_read[])() = {
+static int16_t (*t_read[])(io_arg arg, int8_t *buff, int16_t len) = {
 
-        _badfd,         /* 0 - invalid type */
+        _badfio,        /* 0 - invalid type */
         _filerd,        /* 1 - disk file read */
         _conin          /* 2 - console read */

libcio/write.c

@@ -10 +10 @@
 #include "ram.h"
 
-static  int16_t (*wr_tab[])() = {       /* write routine dispatch table */
-
-        _badfd,         /* 0 - invalid entry */
+/* write routine dispatch table */
+
+static  int16_t (*wr_tab[])(io_arg arg, int8_t *buff, int16_t len) = {
+
+        _badfio,        /* 0 - invalid entry */
         _filewr,        /* 1 - disk file */
         _conwr          /* 2 - console device */