Cleaning usage of MAJOR/MINOR

Change-Id: I4d7718c51967930375a5f0657b61f869745cf644

diff --git a/commands/autopart/autopart.c b/commands/autopart/autopart.c
index e07022c51f6d5922fe19fdedbcf32419d7d06290..c6fd7112ca344392a3062ea604d3e7a98455073f 100644 (file)
--- a/commands/autopart/autopart.c
+++ b/commands/autopart/autopart.c
@@ -229,13 +229,6 @@ void *alloc(size_t n)
        return m;
 }
 
-#ifndef makedev                /* Missing in sys/types.h */
-#define minor(dev)     (((dev) >> MINOR) & BYTE)
-#define major(dev)     (((dev) >> MAJOR) & BYTE)
-#define makedev(major, minor)  \
-                       ((dev_t) (((major) << MAJOR) | ((minor) << MINOR)))
-#endif
-
 typedef enum parttype { DUNNO, SUBPART, PRIMARY, FLOPPY } parttype_t;
 
 typedef struct device {

diff --git a/commands/fsck.mfs/fsck.c b/commands/fsck.mfs/fsck.c
index 63513eb25551898bb5e8ff0c736770d19fb11960..8b1abd099540a94312cbe0adf5e141596e6c7a43 100644 (file)
--- a/commands/fsck.mfs/fsck.c
+++ b/commands/fsck.mfs/fsck.c
@@ -958,8 +958,7 @@ void list(ino_t ino, d_inode *ip)
   switch (ip->i_mode & I_TYPE) {
       case I_CHAR_SPECIAL:
       case I_BLOCK_SPECIAL:
-       printf("  %2x,%2x ", (dev_t) ip->i_zone[0] >> MAJOR & 0xFF,
-              (dev_t) ip->i_zone[0] >> MINOR & 0xFF);
+       printf("  %2x,%2x ", major(ip->i_zone[0]), minor(ip->i_zone[0]));
        break;
       default: printf("%7ld ", ip->i_size);
   }

diff --git a/commands/part/part.c b/commands/part/part.c
index 18b3ee53a08ac7ac90634fbec61bc68e9166fe3f..eba6496db008a38036722ff9ad6d17f7a6ad231e 100644 (file)
--- a/commands/part/part.c
+++ b/commands/part/part.c
@@ -200,13 +200,6 @@ void *alloc(size_t n)
        return m;
 }
 
-#ifndef makedev                /* Missing in sys/types.h */
-#define minor(dev)     (((dev) >> MINOR) & BYTE)
-#define major(dev)     (((dev) >> MAJOR) & BYTE)
-#define makedev(major, minor)  \
-                       ((dev_t) (((major) << MAJOR) | ((minor) << MINOR)))
-#endif
-
 typedef enum parttype { DUNNO, SUBPART, PRIMARY, FLOPPY } parttype_t;
 
 typedef struct device {

diff --git a/commands/partition/partition.c b/commands/partition/partition.c
index be790d5b1dc6e91dd7fe0a27b7b05d6d45126396..5b3a7b2fca9dba51ce68d5fbc842fc9e19cca05b 100644 (file)
--- a/commands/partition/partition.c
+++ b/commands/partition/partition.c
@@ -36,13 +36,6 @@ void fatal(const char *label)
        exit(1);
 }
 
-#ifndef makedev
-#define minor(dev)     (((dev) >> MINOR) & BYTE)
-#define major(dev)     (((dev) >> MAJOR) & BYTE)
-#define makedev(major, minor)  \
-                       ((dev_t) (((major) << MAJOR) | ((minor) << MINOR)))
-#endif
-
 int aflag;                     /* Add a new partition to the current table. */
 int mflag;                     /* Minix rules, no need for alignment. */
 int rflag;                     /* Report current partitions. */

diff --git a/commands/repartition/repartition.c b/commands/repartition/repartition.c
index b3966d5adf41426600ed92749b56ed9516c018a2..ba929f2813a6ae9ab629e08dce1a19643ae15ad5 100644 (file)
--- a/commands/repartition/repartition.c
+++ b/commands/repartition/repartition.c
@@ -44,13 +44,6 @@ void fatal(const char *label)
        exit(1);
 }
 
-#ifndef makedev
-#define minor(dev)     (((dev) >> MINOR) & BYTE)
-#define major(dev)     (((dev) >> MAJOR) & BYTE)
-#define makedev(major, minor)  \
-                       ((dev_t) (((major) << MAJOR) | ((minor) << MINOR)))
-#endif
-
 #define MINOR_d0p0s0   128
 
 void partsort(struct part_entry *pe)

diff --git a/commands/service/service.c b/commands/service/service.c
index 3f8cadf674112aad2256b9a0c5ae200a6ae57bbe..65fe1998fcf000228f5a105d7d5d225ecb8a517e 100644 (file)
--- a/commands/service/service.c
+++ b/commands/service/service.c
@@ -307,7 +307,7 @@ static int parse_arguments(int argc, char **argv, u32_t *rss_flags)
                                  print_usage(argv[ARG_NAME], "major already set");
                                  exit(EINVAL);
                          }
-              req_major = (stat_buf.st_rdev >> MAJOR) & BYTE;
+              req_major = major(stat_buf.st_rdev);
               if(req_dev_style == STYLE_NDEV) {
                   req_dev_style = STYLE_DEV;
               }

diff --git a/servers/mfs/inode.c b/servers/mfs/inode.c
index 1ad314c6c02cfc689e2dc76de3f38d0672b569b7..e04b118c4d0ad8102e15bf0184aa71c8e85285bd 100644 (file)
--- a/servers/mfs/inode.c
+++ b/servers/mfs/inode.c
@@ -275,8 +275,8 @@ struct inode *alloc_inode(dev_t dev, mode_t bits)
   b = alloc_bit(sp, IMAP, sp->s_isearch);
   if (b == NO_BIT) {
        err_code = ENOSPC;
-       major = (int) (sp->s_dev >> MAJOR) & BYTE;
-       minor = (int) (sp->s_dev >> MINOR) & BYTE;
+       major = major(sp->s_dev);
+       minor = minor(sp->s_dev);
        printf("Out of i-nodes on device %d/%d\n", major, minor);
        return(NULL);
   }

diff --git a/sys/sys/types.h b/sys/sys/types.h
index d7c8ffb865dd26a649b3e9b1880bd436b667f2ca..74abeecc7a4d75734bc3f5f6974382757b3c0298 100644 (file)
--- a/sys/sys/types.h
+++ b/sys/sys/types.h
@@ -133,7 +133,6 @@ typedef uint32_t bitchunk_t; /* collection of bits in a bitmap */
  */
 
 typedef unsigned long  Ino_t;
-
 #endif /* __minix */
 
 #include <machine/endian.h>
@@ -301,13 +300,13 @@ typedef int32_t __devmajor_t, __devminor_t;
 #define devmajor_t __devmajor_t
 #define devminor_t __devminor_t
 #define NODEVMAJOR (-1)
-/* Major, minor numbers, dev_t's. */
-#define MAJOR              8    /* major device = (dev>>MAJOR) & 0377 */
-#define MINOR              0    /* minor device = (dev>>MINOR) & 0377 */
-#define minor(dev)      ((devminor_t)(((dev) >> MINOR) & 0xff))
-#define major(dev)      ((devmajor_t)(((dev) >> MAJOR) & 0xff))
-#define makedev(major, minor)   \
-                        ((dev_t) (((major) << MAJOR) | ((minor) << MINOR)))
+/* LSC Our major / minor numbering scheme is not the exactly the same, to be updated? */
+#define        major(x)        ((devmajor_t)(((uint32_t)(x) & 0x0000ff00) >>  8))
+#define        minor(x)        ((devminor_t)( \
+                                  (((uint32_t)(x) & 0x000000ff) >>  0)))
+#define        makedev(x,y)    ((dev_t)((((x) <<  8) & 0x0000ff00) | \
+                                 \
+                                (((y) <<  0) & 0x000000ff)))
 #endif
 
 #ifdef _BSD_CLOCK_T_