diff options
author | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-06-18 09:45:47 +0000 |
---|---|---|
committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 1996-06-18 09:45:47 +0000 |
commit | 41ae123ec2d77615cd0b0476ff62564bd7a4865f (patch) | |
tree | ba6a57d3a8d7d725a5e0ae64e8401ed3bea0efb9 /sys/arch/alpha/tc/tcdsvar.h | |
parent | 7a0b7f798c45842a34a4c6413f45e1b3824154a5 (diff) |
sync to 0616, retaining local diffs
Diffstat (limited to 'sys/arch/alpha/tc/tcdsvar.h')
-rw-r--r-- | sys/arch/alpha/tc/tcdsvar.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sys/arch/alpha/tc/tcdsvar.h b/sys/arch/alpha/tc/tcdsvar.h index 5bee7191694..540db9c8538 100644 --- a/sys/arch/alpha/tc/tcdsvar.h +++ b/sys/arch/alpha/tc/tcdsvar.h @@ -1,7 +1,7 @@ -/* $NetBSD: tcdsvar.h,v 1.1 1995/12/20 00:40:41 cgd Exp $ */ +/* $NetBSD: tcdsvar.h,v 1.3 1996/04/12 06:10:18 cgd Exp $ */ /* - * Copyright (c) 1995 Carnegie-Mellon University. + * Copyright (c) 1995, 1996 Carnegie-Mellon University. * All rights reserved. * * Author: Chris G. Demetriou @@ -66,16 +66,16 @@ struct tcds_slotconfig { }; struct tcdsdev_attach_args { - struct tcdev_attach_args tcdsda_tc; + struct tc_attach_args tcdsda_ta; struct tcds_slotconfig *tcdsda_sc; u_int tcdsda_id; u_int tcdsda_freq; }; -#define tcdsda_modname tcdsda_tc.tcda_modname -#define tcdsda_slot tcdsda_tc.tcda_slot -#define tcdsda_offset tcdsda_tc.tcda_offset -#define tcdsda_addr tcdsda_tc.tcda_addr -#define tcdsda_cookie tcdsda_tc.tcda_cookie +#define tcdsda_modname tcdsda_ta.ta_modname +#define tcdsda_slot tcdsda_ta.ta_slot +#define tcdsda_offset tcdsda_ta.ta_offset +#define tcdsda_addr tcdsda_ta.ta_addr +#define tcdsda_cookie tcdsda_ta.ta_cookie #define TCDS_REG(base, off) \ (volatile u_int32_t *)TC_DENSE_TO_SPARSE((base) + (off)) @@ -105,4 +105,4 @@ int tcds_dmaintr __P((struct tcds_slotconfig *)); * The TCDS (bus) cfdriver, so that subdevices can more * easily tell what bus they're on. */ -extern struct cfdriver tcdscd; +extern struct cfdriver tcds_cd; |