Changeset 99cac86 in buchla-68k for libcio/open.c

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.

File:

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

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;