| @@ -1,14 +1,14 @@ | | | @@ -1,14 +1,14 @@ |
1 | /* $NetBSD: wdcvar.h,v 1.89 2008/04/28 20:23:51 martin Exp $ */ | | 1 | /* $NetBSD: wdcvar.h,v 1.90 2009/12/01 01:06:31 dyoung Exp $ */ |
2 | | | 2 | |
3 | /*- | | 3 | /*- |
4 | * Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc. | | 4 | * Copyright (c) 1998, 2003, 2004 The NetBSD Foundation, Inc. |
5 | * All rights reserved. | | 5 | * All rights reserved. |
6 | * | | 6 | * |
7 | * This code is derived from software contributed to The NetBSD Foundation | | 7 | * This code is derived from software contributed to The NetBSD Foundation |
8 | * by Charles M. Hannum, by Onno van der Linden and by Manuel Bouyer. | | 8 | * by Charles M. Hannum, by Onno van der Linden and by Manuel Bouyer. |
9 | * | | 9 | * |
10 | * Redistribution and use in source and binary forms, with or without | | 10 | * Redistribution and use in source and binary forms, with or without |
11 | * modification, are permitted provided that the following conditions | | 11 | * modification, are permitted provided that the following conditions |
12 | * are met: | | 12 | * are met: |
13 | * 1. Redistributions of source code must retain the above copyright | | 13 | * 1. Redistributions of source code must retain the above copyright |
14 | * notice, this list of conditions and the following disclaimer. | | 14 | * notice, this list of conditions and the following disclaimer. |
| @@ -131,27 +131,26 @@ struct wdc_softc { | | | @@ -131,27 +131,26 @@ struct wdc_softc { |
131 | | | 131 | |
132 | /* | | 132 | /* |
133 | * Public functions which can be called by ATA or ATAPI specific parts, | | 133 | * Public functions which can be called by ATA or ATAPI specific parts, |
134 | * or bus-specific backends. | | 134 | * or bus-specific backends. |
135 | */ | | 135 | */ |
136 | | | 136 | |
137 | void wdc_allocate_regs(struct wdc_softc *); | | 137 | void wdc_allocate_regs(struct wdc_softc *); |
138 | void wdc_init_shadow_regs(struct ata_channel *); | | 138 | void wdc_init_shadow_regs(struct ata_channel *); |
139 | | | 139 | |
140 | int wdcprobe(struct ata_channel *); | | 140 | int wdcprobe(struct ata_channel *); |
141 | void wdcattach(struct ata_channel *); | | 141 | void wdcattach(struct ata_channel *); |
142 | int wdcdetach(device_t, int); | | 142 | int wdcdetach(device_t, int); |
143 | void wdc_childdetached(device_t, device_t); | | 143 | void wdc_childdetached(device_t, device_t); |
144 | int wdcactivate(device_t, enum devact); | | | |
145 | int wdcintr(void *); | | 144 | int wdcintr(void *); |
146 | | | 145 | |
147 | void wdc_sataprobe(struct ata_channel *); | | 146 | void wdc_sataprobe(struct ata_channel *); |
148 | void wdc_drvprobe(struct ata_channel *); | | 147 | void wdc_drvprobe(struct ata_channel *); |
149 | | | 148 | |
150 | void wdcrestart(void*); | | 149 | void wdcrestart(void*); |
151 | | | 150 | |
152 | int wdcwait(struct ata_channel *, int, int, int, int); | | 151 | int wdcwait(struct ata_channel *, int, int, int, int); |
153 | #define WDCWAIT_OK 0 /* we have what we asked */ | | 152 | #define WDCWAIT_OK 0 /* we have what we asked */ |
154 | #define WDCWAIT_TOUT -1 /* timed out */ | | 153 | #define WDCWAIT_TOUT -1 /* timed out */ |
155 | #define WDCWAIT_THR 1 /* return, the kernel thread has been awakened */ | | 154 | #define WDCWAIT_THR 1 /* return, the kernel thread has been awakened */ |
156 | | | 155 | |
157 | void wdcbit_bucket(struct ata_channel *, int); | | 156 | void wdcbit_bucket(struct ata_channel *, int); |