cvs commit: src/sys/dev/disk/ata

[YONETANI Tomokazu]

On Sat, Sep 18, 2004 at 11:33:38AM -0700, Matthew Dillon wrote:
> dillon      2004/09/18 11:33:38 PDT
> 
> DragonFly src repository
> 
>   Modified files:
>     sys/dev/disk/ata     ata-disk.c ata-disk.h atapi-all.c 
>                          atapi-all.h 
>   Log:
>   timeout/untimeout ==> callout_*
>   
>   Revision  Changes    Path
>   1.22      +12 -10    src/sys/dev/disk/ata/ata-disk.c
>   1.5       +1 -1      src/sys/dev/disk/ata/ata-disk.h
>   1.14      +6 -6      src/sys/dev/disk/ata/atapi-all.c
>   1.5       +1 -1      src/sys/dev/disk/ata/atapi-all.h

And the following change is needed to unbreak addump().
request.callout must be callout_init()'ed before a call to
ad_transfer().

Index: ata-disk.c
===================================================================
RCS file: /home/source/dragonfly/cvs/src/sys/dev/disk/ata/ata-disk.c,v
retrieving revision 1.22
diff -u -r1.22 ata-disk.c
--- ata-disk.c	18 Sep 2004 18:33:38 -0000	1.22
+++ ata-disk.c	23 Sep 2004 11:11:56 -0000
@@ -359,6 +359,7 @@
 	request.blockaddr = blkno;
 	request.bytecount = PAGE_SIZE * dumppages;
 	request.data = va;
+	callout_init(&request.callout);
 
 	while (request.bytecount > 0) {
 	    ad_transfer(&request);


P.S. it seems that apollo.backplane.com doesn't like my IP address
(43.244.41.12).