Deleted Added
full compact
mcdvar.h (104445) mcdvar.h (104545)
1/*
1/*
2 * $FreeBSD: head/sys/dev/mcd/mcdvar.h 104445 2002-10-04 07:14:19Z mdodd $
2 * $FreeBSD: head/sys/dev/mcd/mcdvar.h 104545 2002-10-06 00:19:38Z mdodd $
3 */
4
5struct mcd_mbx {
3 */
4
5struct mcd_mbx {
6 short unit;
7 short port;
8 short retry;
9 short nblk;
10 int sz;
11 u_long skip;
12 struct bio * bp;
13 int p_offset;
14 short count;
15 short mode;
16};
17
18struct mcd_data {
19 short type;
20 char * name;
21 short config;
22 short flags;
23 u_char read_command;
24 short status;
25 int blksize;
26 u_long disksize;
6 short retry;
7 short nblk;
8 int sz;
9 u_long skip;
10 struct bio * bp;
11 int p_offset;
12 short count;
13 short mode;
14};
15
16struct mcd_data {
17 short type;
18 char * name;
19 short config;
20 short flags;
21 u_char read_command;
22 short status;
23 int blksize;
24 u_long disksize;
27 int iobase;
28 struct disklabel dlabel;
29 int partflags[MAXPARTITIONS];
25 int partflags;
30 int openflags;
31 struct mcd_volinfo volinfo;
32 struct mcd_qchninfo toc[MCD_MAXTOCS];
33 short audio_status;
34 short curr_mode;
35 struct mcd_read2 lastpb;
36 short debug;
37 struct bio_queue_head head; /* head of bio queue */
38 struct mcd_mbx mbx;
39};
40
41struct mcd_softc {
42 device_t dev;
26 int openflags;
27 struct mcd_volinfo volinfo;
28 struct mcd_qchninfo toc[MCD_MAXTOCS];
29 short audio_status;
30 short curr_mode;
31 struct mcd_read2 lastpb;
32 short debug;
33 struct bio_queue_head head; /* head of bio queue */
34 struct mcd_mbx mbx;
35};
36
37struct mcd_softc {
38 device_t dev;
43 dev_t mcd_dev_t[3];
39 dev_t mcd_dev_t;
44 int debug;
45
46 struct resource * port;
47 int port_rid;
48 int port_type;
49 bus_space_tag_t port_bst;
50 bus_space_handle_t port_bsh;
51

--- 28 unchanged lines hidden ---
40 int debug;
41
42 struct resource * port;
43 int port_rid;
44 int port_type;
45 bus_space_tag_t port_bst;
46 bus_space_handle_t port_bsh;
47

--- 28 unchanged lines hidden ---