Move SUB_PER_DRIVE definition into minix/drvlib.h

Change-Id: Id25761085ce1868955da34d8e530e170448ea154

diff --git a/drivers/ahci/ahci.h b/drivers/ahci/ahci.h
index 5b77d9e63e2144577f21b0595bc9d0a509f8d685..ab7c52c74e09344efc88ad2a2fd2bd6eafc867e5 100644 (file)
--- a/drivers/ahci/ahci.h
+++ b/drivers/ahci/ahci.h
@@ -264,7 +264,6 @@ typedef struct vumap_phys prd_t;
  */
 #define MAX_DRIVES             8
 #define NR_MINORS              (MAX_DRIVES * DEV_PER_DRIVE)
-#define SUB_PER_DRIVE          (NR_PARTITIONS * NR_PARTITIONS)
 #define NR_SUBDEVS             (MAX_DRIVES * SUB_PER_DRIVE)
 
 /* Port states. */

diff --git a/drivers/at_wini/at_wini.h b/drivers/at_wini/at_wini.h
index 868c8cd0d1e3b508dfa52ebcf4d5ac816dd7c6f5..3385dc014cbd128f5999215906763801bcd7dead 100644 (file)
--- a/drivers/at_wini/at_wini.h
+++ b/drivers/at_wini/at_wini.h
@@ -194,7 +194,6 @@
 #define MAX_SECS        256    /* controller can transfer this many sectors */
 #define MAX_ERRORS         4   /* how often to try rd/wt before quitting */
 #define NR_MINORS       (MAX_DRIVES * DEV_PER_DRIVE)
-#define SUB_PER_DRIVE  (NR_PARTITIONS * NR_PARTITIONS)
 #define NR_SUBDEVS     (MAX_DRIVES * SUB_PER_DRIVE)
 #define DELAY_USECS     1000   /* controller timeout in microseconds */
 #define DELAY_TICKS       1    /* controller timeout in ticks */

diff --git a/drivers/mmc/mmcblk.c b/drivers/mmc/mmcblk.c
index 7541a0605166f42ea2295a253dcc227a10863158..9664408be602fa044272d83131dfaf31180e886f 100644 (file)
--- a/drivers/mmc/mmcblk.c
+++ b/drivers/mmc/mmcblk.c
@@ -32,7 +32,6 @@ static struct log log = {
 /* holding the current host controller */
 static struct mmc_host host;
 
-#define SUB_PER_DRIVE           (NR_PARTITIONS * NR_PARTITIONS)
 #define NR_SUBDEVS              (MAX_DRIVES * SUB_PER_DRIVE)
 
 /* When passing data over a grant one needs to pass

diff --git a/drivers/virtio_blk/virtio_blk.c b/drivers/virtio_blk/virtio_blk.c
index cc1b7d06931fab9b43ab1f96e6ade69d4e3983e9..1415524387a370ace6d7244d45176ca68af1b779 100644 (file)
--- a/drivers/virtio_blk/virtio_blk.c
+++ b/drivers/virtio_blk/virtio_blk.c
@@ -60,9 +60,8 @@ static int terminating = 0;
 static int open_count = 0;
 
 /* Partition magic */
-#define VIRTIO_BLK_SUB_PER_DRIVE       (NR_PARTITIONS * NR_PARTITIONS)
 struct device part[DEV_PER_DRIVE];
-struct device subpart[VIRTIO_BLK_SUB_PER_DRIVE];
+struct device subpart[SUB_PER_DRIVE];
 
 /* Headers for requests */
 static struct virtio_blk_outhdr *hdrs_vir;

diff --git a/include/minix/drvlib.h b/include/minix/drvlib.h
index b2a71e381d5adb1fc629b8c80bdaa8c4ccfcdf9c..402a89c93c0d6c99c96a9d012d1571cea84a3481 100644 (file)
--- a/include/minix/drvlib.h
+++ b/include/minix/drvlib.h
@@ -8,6 +8,7 @@ void partition(struct blockdriver *bdr, int device, int style, int
        atapi);
 
 #define DEV_PER_DRIVE  (1 + NR_PARTITIONS)
+#define SUB_PER_DRIVE  (NR_PARTITIONS * NR_PARTITIONS)
 #define MINOR_t0       64
 #define MINOR_r0       120
 #define MINOR_d0p0s0   128