sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move SUB_PER_DRIVE definition into minix/drvlib.h

Browse source 
Change-Id: Id25761085ce1868955da34d8e530e170448ea154
This commit is contained in:
David van Moolenbroek 2013-07-28 14:03:07 +02:00 committed by Lionel Sambuc
parent 5c53b417cd
commit a1f00d5527
5 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
drivers/ahci/ahci.h
View file

@ -264,7 +264,6 @@ typedef struct vumap_phys prd_t;
*/ */
#define MAX_DRIVES 8 #define MAX_DRIVES 8
#define NR_MINORS (MAX_DRIVES * DEV_PER_DRIVE) #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 NR_SUBDEVS (MAX_DRIVES * SUB_PER_DRIVE)
/* Port states. */ /* Port states. */

1
drivers/at_wini/at_wini.h
View file

@ -194,7 +194,6 @@
#define MAX_SECS 256 /* controller can transfer this many sectors */ #define MAX_SECS 256 /* controller can transfer this many sectors */
#define MAX_ERRORS 4 /* how often to try rd/wt before quitting */ #define MAX_ERRORS 4 /* how often to try rd/wt before quitting */
#define NR_MINORS (MAX_DRIVES * DEV_PER_DRIVE) #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 NR_SUBDEVS (MAX_DRIVES * SUB_PER_DRIVE)
#define DELAY_USECS 1000 /* controller timeout in microseconds */ #define DELAY_USECS 1000 /* controller timeout in microseconds */
#define DELAY_TICKS 1 /* controller timeout in ticks */ #define DELAY_TICKS 1 /* controller timeout in ticks */

1
drivers/mmc/mmcblk.c
View file

@ -32,7 +32,6 @@ static struct log log = {
/* holding the current host controller */ /* holding the current host controller */
static struct mmc_host host; static struct mmc_host host;
#define SUB_PER_DRIVE (NR_PARTITIONS * NR_PARTITIONS)
#define NR_SUBDEVS (MAX_DRIVES * SUB_PER_DRIVE) #define NR_SUBDEVS (MAX_DRIVES * SUB_PER_DRIVE)
/* When passing data over a grant one needs to pass /* When passing data over a grant one needs to pass

3
drivers/virtio_blk/virtio_blk.c
View file

@ -60,9 +60,8 @@ static int terminating = 0;
static int open_count = 0; static int open_count = 0;
/* Partition magic */ /* Partition magic */
#define VIRTIO_BLK_SUB_PER_DRIVE (NR_PARTITIONS * NR_PARTITIONS)
struct device part[DEV_PER_DRIVE]; struct device part[DEV_PER_DRIVE];
struct device subpart[VIRTIO_BLK_SUB_PER_DRIVE]; struct device subpart[SUB_PER_DRIVE];
/* Headers for requests */ /* Headers for requests */
static struct virtio_blk_outhdr *hdrs_vir; static struct virtio_blk_outhdr *hdrs_vir;

1
include/minix/drvlib.h
View file

@ -8,6 +8,7 @@ void partition(struct blockdriver *bdr, int device, int style, int
atapi); atapi);
#define DEV_PER_DRIVE (1 + NR_PARTITIONS) #define DEV_PER_DRIVE (1 + NR_PARTITIONS)
#define SUB_PER_DRIVE (NR_PARTITIONS * NR_PARTITIONS)
#define MINOR_t0 64 #define MINOR_t0 64
#define MINOR_r0 120 #define MINOR_r0 120
#define MINOR_d0p0s0 128 #define MINOR_d0p0s0 128