Changeset 8973acd in buchla-68k for libcio/open.c

Timestamp:

07/15/2017 03:12:10 PM (7 years ago)

Author:

Thomas Lopatic <thomas@…>

Branches:

master

Children:

ea232f9

Parents:

7d0d347

Message:

No more warnings in libcio.

File:

• libcio/open.c (modified) (9 diffs)

libcio/open.c

@@ -19 +19 @@
 static struct devtabl devtabl[] = {
 
-        { "con:", &condev,  &devtabl[0] },      /* console device */
-        { "CON:", &condev,  &devtabl[1] },
-
-        {      0, &filedev,      NULL   }       /* this MUST be the last entry */
+        { "con:", &condev,  &devtabl[0], CON_DEV },     /* console device */
+        { "CON:", &condev,  &devtabl[1], CON_DEV },
+
+        {      0, &filedev,        NULL,      -1 }      /* this MUST be the last entry */
 };
 
@@ -34 +34 @@
 */
 
-int16_t open(int8_t *name, int16_t flag, int16_t mode)
+int16_t open(int8_t *name, uint16_t flag)
 {
         register struct devtabl *dp;
         register struct channel *chp;
         register struct device  *dev;
-        int16_t fd, mdmask;
+        int16_t fd;
+        uint16_t mdmask;
 
         /* search for a free channel */
@@ -84 +85 @@
         chp->c_close = _nopc;
 
-        if ((*dev->d_open)(name, flag, mode, chp, dp) < 0) {    /* open */
+        if ((*dev->d_open)(name, flag, chp, dp) < 0) {  /* open */
 
                 chp->c_close = _badfc;  /* couldn't open for some reason */
@@ -102 +103 @@
 */
 
-int16_t opena(int8_t *name, int16_t flag, int16_t mode)
-{
-        return(open(name, flag, mode));
+int16_t opena(int8_t *name, uint16_t flag)
+{
+        return(open(name, flag));
 }
 
@@ -116 +117 @@
 */
 
-int16_t openb(int8_t *name, int16_t flag, int16_t mode)
-{
-        return(open(name, flag|O_RAW, mode));
+int16_t openb(int8_t *name, uint16_t flag)
+{
+        return(open(name, flag|O_RAW));
 }
 
@@ -131 +132 @@
 */
 
-int16_t creat(int8_t *name, int16_t mode)
-{
-        return(open(name, O_WRONLY|O_TRUNC|O_CREAT, mode));
+int16_t creat(int8_t *name)
+{
+        return(open(name, O_WRONLY|O_TRUNC|O_CREAT));
 }
 
@@ -146 +147 @@
 */
 
-int16_t creata(int8_t *name, int16_t mode)
-{
-        return(open(name, O_WRONLY|O_TRUNC|O_CREAT, mode));
+int16_t creata(int8_t *name)
+{
+        return(open(name, O_WRONLY|O_TRUNC|O_CREAT));
 }
 
@@ -161 +162 @@
 */
 
-int16_t creatb(int8_t *name, int16_t mode)
-{
-        return(open(name, O_WRONLY|O_TRUNC|O_CREAT|O_RAW, mode));
+int16_t creatb(int8_t *name)
+{
+        return(open(name, O_WRONLY|O_TRUNC|O_CREAT|O_RAW));
 }
 
@@ -174 +175 @@
 */
 
-int16_t _fileop(int8_t *name, int16_t flag, int16_t mode, struct channel *chp, struct devtabl *dp)
+int16_t _fileop(int8_t *name, uint16_t flag, struct channel *chp, struct devtabl *dp)
 {
         register struct fcb *fp;
         int8_t  tmpname[9], tmpext[4];
 
-        (void)mode;
         (void)dp;