diff options
Diffstat (limited to 'drivers/cdrom/sbpcd.c')
| -rw-r--r-- | drivers/cdrom/sbpcd.c | 56 |
1 files changed, 49 insertions, 7 deletions
diff --git a/drivers/cdrom/sbpcd.c b/drivers/cdrom/sbpcd.c index 4cec5680d..7e3138854 100644 --- a/drivers/cdrom/sbpcd.c +++ b/drivers/cdrom/sbpcd.c @@ -322,6 +322,9 @@ * CD_AUDIO_COMPLETED state so workman (and other playes) can repeat play. * Andrew J. Kroll <ag784@freenet.buffalo.edu> Wed Jul 26 04:24:10 EDT 2000 * + * 4.64 Fix module parameters - were being completely ignored. + * Can also specify max_drives=N as a setup int to get rid of + * "ghost" drives on crap hardware (aren't they all?) Paul Gortmaker * * TODO * implement "read all subchannel data" (96 bytes per frame) @@ -336,6 +339,15 @@ * */ +/* + * Trying to merge requests breaks this driver horribly (as in it goes + * boom and apparently has done so since 2.3.41). As it is a legacy + * driver for a horribly slow double speed CD on a hideous interface + * designed for polled operation, I won't loose any sleep in simply + * disallowing merging. Paul G. 02/2001 + */ +#define DONT_MERGE_REQUESTS + #ifndef SBPCD_ISSUE #define SBPCD_ISSUE 1 #endif SBPCD_ISSUE @@ -474,6 +486,7 @@ static int sbpcd[] = static int sbpcd[] = {CDROM_PORT, SBPRO}; /* probe with user's setup only */ #endif MODULE_PARM(sbpcd, "2i"); +MODULE_PARM(max_drives, "i"); #define NUM_PROBE (sizeof(sbpcd) / sizeof(int)) @@ -561,7 +574,6 @@ static int sbpcd_debug = 0 & ((1<<DBG_INF) | static int sbpcd_ioaddr = CDROM_PORT; /* default I/O base address */ static int sbpro_type = SBPRO; -static unsigned char setup_done; static unsigned char f_16bit; static unsigned char do_16bit; static int CDo_command, CDo_reset; @@ -578,15 +590,19 @@ static struct cdrom_read_audio read_audio; static unsigned char msgnum; static char msgbuf[80]; -static const char *str_sb = "SoundBlaster"; +static int max_drives = MAX_DRIVES; +#ifndef MODULE +static unsigned char setup_done; static const char *str_sb_l = "soundblaster"; -static const char *str_lm = "LaserMate"; -static const char *str_sp = "SPEA"; static const char *str_sp_l = "spea"; -static const char *str_ss = "SoundScape"; static const char *str_ss_l = "soundscape"; -static const char *str_t16 = "Teac16bit"; static const char *str_t16_l = "teac16bit"; +static const char *str_ss = "SoundScape"; +#endif +static const char *str_sb = "SoundBlaster"; +static const char *str_lm = "LaserMate"; +static const char *str_sp = "SPEA"; +static const char *str_t16 = "Teac16bit"; static const char *type; #if !(SBPCD_ISSUE-1) @@ -3739,7 +3755,7 @@ static int __init check_drives(void) msg(DBG_INI,"check_drives entered.\n"); ndrives=0; - for (j=0;j<MAX_DRIVES;j++) + for (j=0;j<max_drives;j++) { D_S[ndrives].drv_id=j; if (sbpro_type==1) D_S[ndrives].drv_sel=(j&0x01)<<1|(j&0x02)>>1; @@ -5540,6 +5556,7 @@ static int sbpcd_setup(char *s) int sbpcd_setup(char *s) #endif { +#ifndef MODULE int p[4]; (void)get_options(s, ARRAY_SIZE(p), p); setup_done++; @@ -5555,6 +5572,11 @@ int sbpcd_setup(char *s) else if (!strcmp(s,str_t16)) sbpro_type=3; else if (!strcmp(s,str_t16_l)) sbpro_type=3; if (p[0]>0) sbpcd_ioaddr=p[1]; + if (p[0]>2) max_drives=p[3]; +#else + sbpcd_ioaddr = sbpcd[0]; + sbpro_type = sbpcd[1]; +#endif CDo_command=sbpcd_ioaddr; CDi_info=sbpcd_ioaddr; @@ -5648,6 +5670,21 @@ static int __init config_spea(void) msg(DBG_SEQ,"found SoundScape interface at %04X.\n", sbpcd_ioaddr); return (0); } + +#ifdef DONT_MERGE_REQUESTS +static int dont_merge_requests_fn(request_queue_t *q, struct request *req, + struct request *next, int max_segments) +{ + return 0; +} + +static int dont_bh_merge_fn(request_queue_t *q, struct request *req, + struct buffer_head *bh, int max_segments) +{ + return 0; +} +#endif + /*==========================================================================*/ /* * Test for presence of drive and initialize it. @@ -5815,6 +5852,11 @@ int __init SBPCD_INIT(void) #endif MODULE } blk_init_queue(BLK_DEFAULT_QUEUE(MAJOR_NR), DEVICE_REQUEST); +#ifdef DONT_MERGE_REQUESTS + (BLK_DEFAULT_QUEUE(MAJOR_NR))->back_merge_fn = dont_bh_merge_fn; + (BLK_DEFAULT_QUEUE(MAJOR_NR))->front_merge_fn = dont_bh_merge_fn; + (BLK_DEFAULT_QUEUE(MAJOR_NR))->merge_requests_fn = dont_merge_requests_fn; +#endif blk_queue_headactive(BLK_DEFAULT_QUEUE(MAJOR_NR), 0); read_ahead[MAJOR_NR] = buffers * (CD_FRAMESIZE / 512); |