xnu-517.7.7.tar.gz

[apple/xnu.git] / bsd / dev / ppc / conf.c

diff --git a/bsd/dev/ppc/conf.c b/bsd/dev/ppc/conf.c
index 0030fe927d1bf094a7e24e3fd34b729d1075e646..e4a751fcae7c504396af5b65ef79cdb78caaa77f 100644 (file)
--- a/bsd/dev/ppc/conf.c
+++ b/bsd/dev/ppc/conf.c
@@ -100,6 +100,9 @@ extern int  mmread(),mmwrite();
 #define        mmselect        seltrue
 
 #if 1
+#ifdef NPTY
+#undef NPTY
+#endif /* NPTY */
 #define NPTY 32
 #else /* 1 */
 #include <pty.h>
@@ -144,7 +147,7 @@ struct cdevsw       cdevsw[] =
     {
        consopen,       consclose,      consread,       conswrite,      /* 0*/
        consioctl,      nulldev,        nulldev,        0,      consselect,
-       eno_mmap,       eno_strat,      cons_getc,      cons_putc, D_TTY
+       eno_mmap,       eno_strat,      (getc_fcn_t *)cons_getc,        (putc_fcn_t *)cons_putc, D_TTY
    },
     NO_CDEVICE,                                                                /* 1*/
     {
@@ -154,7 +157,7 @@ struct cdevsw       cdevsw[] =
     },
     {
        nulldev,        nulldev,        mmread,         mmwrite,        /* 3*/
-       eno_ioctl,      nulldev,        nulldev,        0,              mmselect,
+       eno_ioctl,      nulldev,        nulldev,        0,              (select_fcn_t *)mmselect,
        eno_mmap,               eno_strat,      eno_getc,       eno_putc,       0
     },
     {
@@ -231,17 +234,19 @@ isdisk(dev, type)
        dev_t dev;
        int type;
 {
-       switch (major(dev)) {
-       case 1: /* fd: floppy */
-       case 6: /* sd: scsi disk */
-       case 3: /* ide:  */
-               if (type == VBLK)
-                       return(1);
-               break;
-       case 14:         /* sd: scsi disk */
-       case 41: /* fd: floppy */
-               if (type == VCHR)
-                       return(1);
+       dev_t   maj = major(dev);
+
+       switch (type) {
+       case VCHR:
+               maj = chrtoblk(maj);
+               if (maj == NODEV) {
+                       break;
+               }
+               /* FALL THROUGH */
+       case VBLK:
+               if (bdevsw[maj].d_type == D_DISK) {
+                       return (1);
+               }
                break;
        }
        return(0);
@@ -291,6 +296,17 @@ chrtoblk(dev)
        return(makedev(blkmaj, minor(dev)));
 }
 
+int
+chrtoblk_set(int cdev, int bdev)
+{
+       if (cdev >= nchrdev)
+               return (NODEV);
+       if (bdev != NODEV && bdev >= nblkdev)
+               return (NODEV);
+       chrtoblktab[cdev] = bdev;
+       return 0;
+}
+
 /*
  * Returns true if dev is /dev/mem or /dev/kmem.
  */