[src/netbsd-1-5]: src/sys/dev/ic Pull up revision 1.9 (requested by ad):

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c23f14999575
branches:  netbsd-1-5
changeset: 492650:c23f14999575
user:      he <he%NetBSD.org@localhost>
date:      Tue Jan 29 23:31:18 2002 +0000

description:
Pull up revision 1.9 (requested by ad):
  Some fixes:
   o Always validate return value read from outbound FIFO
   o Copy access method into to softc to avoid double dereference
   o Remove static on functions
  Fixes PR#14453.

diffstat:

 sys/dev/ic/cacvar.h |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (30 lines):

diff -r 266d2b50b60f -r c23f14999575 sys/dev/ic/cacvar.h
--- a/sys/dev/ic/cacvar.h       Tue Jan 29 23:31:01 2002 +0000
+++ b/sys/dev/ic/cacvar.h       Tue Jan 29 23:31:18 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cacvar.h,v 1.5.2.1 2001/10/25 17:54:45 he Exp $        */
+/*     $NetBSD: cacvar.h,v 1.5.2.2 2002/01/29 23:31:18 he Exp $        */
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -114,11 +114,11 @@
        bus_dmamap_t            sc_dmamap;
        int                     sc_nunits;
        void                    *sc_ih;
-       const struct cac_linkage        *sc_cl;
        caddr_t                 sc_ccbs;
        paddr_t                 sc_ccbs_paddr;
        SIMPLEQ_HEAD(, cac_ccb) sc_ccb_free;    
        SIMPLEQ_HEAD(, cac_ccb) sc_ccb_queue;
+       struct cac_linkage      sc_cl;
 };
 
 struct cac_attach_args {
@@ -132,6 +132,6 @@
 int    cac_init(struct cac_softc *, const char *, int);
 int    cac_intr(void *);
 
-extern struct  cac_linkage cac_l0;
+extern const struct    cac_linkage cac_l0;
 
 #endif /* !_IC_CACVAR_H_ */