* 2.5.1pre6 compile error
@ 2001-12-07 10:50 Martin A. Brooks
2001-12-07 14:52 ` Jens Axboe
2001-12-07 14:55 ` Martin A. Brooks
0 siblings, 2 replies; 4+ messages in thread
From: Martin A. Brooks @ 2001-12-07 10:50 UTC (permalink / raw)
To: linux-kernel
gcc -D__KERNEL__ -I/home/martin/kernel-a-day-club/linux/include -Wall
-Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer
-fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2
-march=i686 -c -o ps2esdi.o ps2esdi.c
ps2esdi.c: In function `do_ps2esdi_request':
ps2esdi.c:498: switch quantity not an integer
ps2esdi.c:500: warning: unreachable code at beginning of switch
statement
make[3]: *** [ps2esdi.o] Error 1
--
Martin A. Brooks Systems Administrator
Jtrix Ltd t: +44 7395 4990
57-59 Neal Street f: +44 7395 4991
London, WC2H 9PP e: martin@jtrix.com
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: 2.5.1pre6 compile error
2001-12-07 10:50 2.5.1pre6 compile error Martin A. Brooks
@ 2001-12-07 14:52 ` Jens Axboe
2001-12-07 21:48 ` David C. Hansen
2001-12-07 14:55 ` Martin A. Brooks
1 sibling, 1 reply; 4+ messages in thread
From: Jens Axboe @ 2001-12-07 14:52 UTC (permalink / raw)
To: Martin A. Brooks; +Cc: linux-kernel
On Fri, Dec 07 2001, Martin A. Brooks wrote:
> gcc -D__KERNEL__ -I/home/martin/kernel-a-day-club/linux/include -Wall
> -Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer
> -fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2
> -march=i686 -c -o ps2esdi.o ps2esdi.c
> ps2esdi.c: In function `do_ps2esdi_request':
> ps2esdi.c:498: switch quantity not an integer
> ps2esdi.c:500: warning: unreachable code at beginning of switch
> statement
> make[3]: *** [ps2esdi.o] Error 1
Please take a look at the rq->cmd -> rq->flags changes. Then understand
them. Then fix ps2 and send me a diff, thanks.
:-)
--
Jens Axboe
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: 2.5.1pre6 compile error
2001-12-07 10:50 2.5.1pre6 compile error Martin A. Brooks
2001-12-07 14:52 ` Jens Axboe
@ 2001-12-07 14:55 ` Martin A. Brooks
1 sibling, 0 replies; 4+ messages in thread
From: Martin A. Brooks @ 2001-12-07 14:55 UTC (permalink / raw)
To: Jens Axboe; +Cc: linux-kernel
On Fri, 2001-12-07 at 14:52, Jens Axboe wrote:
> Please take a look at the rq->cmd -> rq->flags changes. Then understand
> them. Then fix ps2 and send me a diff, thanks.
As I may have mentioned before, I'm no kernel hacker, I'm just a chimp
with a compiler :)
--
Martin A. Brooks Systems Administrator
Jtrix Ltd t: +44 7395 4990
57-59 Neal Street f: +44 7395 4991
London, WC2H 9PP e: martin@jtrix.com
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: 2.5.1pre6 compile error
2001-12-07 14:52 ` Jens Axboe
@ 2001-12-07 21:48 ` David C. Hansen
0 siblings, 0 replies; 4+ messages in thread
From: David C. Hansen @ 2001-12-07 21:48 UTC (permalink / raw)
To: Jens Axboe; +Cc: Martin A. Brooks, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 910 bytes --]
Jens Axboe wrote:
>On Fri, Dec 07 2001, Martin A. Brooks wrote:
>
>>gcc -D__KERNEL__ -I/home/martin/kernel-a-day-club/linux/include -Wall
>>-Wstrict-prototypes -Wno-trigraphs -O2 -fomit-frame-pointer
>>-fno-strict-aliasing -fno-common -pipe -mpreferred-stack-boundary=2
>>-march=i686 -c -o ps2esdi.o ps2esdi.c
>>ps2esdi.c: In function `do_ps2esdi_request':
>>ps2esdi.c:498: switch quantity not an integer
>>ps2esdi.c:500: warning: unreachable code at beginning of switch
>>statement
>>make[3]: *** [ps2esdi.o] Error 1
>>
>Please take a look at the rq->cmd -> rq->flags changes. Then understand
>them. Then fix ps2 and send me a diff, thanks.
>
Jens,
It looks like in the rest of the code, you replaced CURRENT->cmd with
rq_data_dir(CURRENT). I've attached a patch that does this for
ps2esdi.c. Those old PS/2 machines are real workhorses. I still have a
few of them running.
--
Dave
[-- Attachment #2: ps2esdi_cmd_fix.patch --]
[-- Type: text/plain, Size: 1727 bytes --]
--- linux-2.5.1-pre6/drivers/block/ps2esdi.c Fri Nov 30 17:40:03 2001
+++ linux/drivers/block/ps2esdi.c Fri Dec 7 11:22:29 2001
@@ -466,10 +466,10 @@
sti();
#if 0
- printk("%s:got request. device : %d minor : %d command : %d sector : %ld count : %ld, buffer: %p\n",
+ printk("%s:got request. device : %d minor : %d flags : %d sector : %ld count : %ld, buffer: %p\n",
DEVICE_NAME,
CURRENT_DEV, MINOR(CURRENT->rq_dev),
- CURRENT->cmd, CURRENT->sector,
+ rq_data_dir(CURRENT), CURRENT->sector,
CURRENT->current_nr_sectors, CURRENT->buffer);
#endif
@@ -485,17 +485,17 @@
(CURRENT->sector + CURRENT->current_nr_sectors <=
ps2esdi[MINOR(CURRENT->rq_dev)].nr_sects)) {
#if 0
- printk("%s:got request. device : %d minor : %d command : %d sector : %ld count : %ld\n",
+ printk("%s:got request. device : %d minor : %d flags : %d sector : %ld count : %ld\n",
DEVICE_NAME,
CURRENT_DEV, MINOR(CURRENT->rq_dev),
- CURRENT->cmd, CURRENT->sector,
+ rq_data_dir(CURRENT), CURRENT->sector,
CURRENT->current_nr_sectors);
#endif
block = CURRENT->sector;
count = CURRENT->current_nr_sectors;
- switch (CURRENT->cmd) {
+ switch (rq_data_dir(CURRENT)) {
case READ:
ps2esdi_readwrite(READ, CURRENT_DEV, block, count);
break;
@@ -850,7 +850,7 @@
switch (int_ret_code & 0x0f) {
case INT_TRANSFER_REQ:
ps2esdi_prep_dma(CURRENT->buffer, CURRENT->current_nr_sectors,
- (CURRENT->cmd == READ)
+ ( rq_data_dir(CURRENT) == READ)
? MCA_DMA_MODE_16 | MCA_DMA_MODE_WRITE | MCA_DMA_MODE_XFER
: MCA_DMA_MODE_16 | MCA_DMA_MODE_READ);
outb(CTRL_ENABLE_DMA | CTRL_ENABLE_INTR, ESDI_CONTROL);
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2001-12-07 21:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2001-12-07 10:50 2.5.1pre6 compile error Martin A. Brooks
2001-12-07 14:52 ` Jens Axboe
2001-12-07 21:48 ` David C. Hansen
2001-12-07 14:55 ` Martin A. Brooks
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.