cvs commit: src/sys/dev/ata ata-all.c ata-all.h ata-disk.c ata-disk.h ata-dma.c ata-isa.c atapi-all.c atapi-all.h atapi-cd.c atapi-fd.c atapi-tape.c

[Erik Trulsson]

On Fri, Sep 05, 2003 at 12:29:11AM -0700, Luoqi Chen wrote:
> luoqi       2003/09/05 00:29:11 PDT
> 
>   FreeBSD src repository
> 
>   Modified files:        (Branch: RELENG_4)
>     sys/dev/ata          ata-all.c ata-all.h ata-disk.c ata-disk.h 
>                          ata-dma.c ata-isa.c atapi-all.c 
>                          atapi-all.h atapi-cd.c atapi-fd.c 
>                          atapi-tape.c 
>   Log:
>   MFC: ata driver bus dma code.
>   
>   Eyeballed by:   sos
>   Approved by:    re

This commit breaks compilation of non-PCI kernels, as I just discovered
while updating one of my machines.  The following patch makes the compilation
work again:



Index: ata-isa.c
===================================================================
RCS file: /ncvs/src/sys/dev/ata/ata-isa.c,v
retrieving revision 1.4.2.2
diff -u -r1.4.2.2 ata-isa.c
--- ata-isa.c	5 Sep 2003 07:29:10 -0000	1.4.2.2
+++ ata-isa.c	18 Sep 2003 09:07:24 -0000
@@ -134,9 +134,10 @@
     return -1;
 }
 
-void
+int
 ata_dmastart(struct ata_device *atadev, caddr_t data, int32_t count, int dir)
 {
+	return -1;
 }
 
 int




-- 
<Insert your favourite quote here.>
Erik Trulsson
ertr1013 at student.uu.se