summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorthorpej <thorpej@NetBSD.org>2003-12-14 05:14:39 +0000
committerthorpej <thorpej@NetBSD.org>2003-12-14 05:14:39 +0000
commit3dd2f16d75d248e340328d0acc71a4d6c34a6798 (patch)
treee1fa9de1ae012fe8c0bc44bda8cbbd0ea665e291 /sys/dev
parent09bbcae770a2a542abc61d4ab116aeb47b71b151 (diff)
Move struct ata_device from wdvar.h to atavar.h.
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ata/atavar.h13
-rw-r--r--sys/dev/ata/wdvar.h14
2 files changed, 13 insertions, 14 deletions
diff --git a/sys/dev/ata/atavar.h b/sys/dev/ata/atavar.h
index 54634587993..a16980c22e9 100644
--- a/sys/dev/ata/atavar.h
+++ b/sys/dev/ata/atavar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: atavar.h,v 1.33 2003/12/14 05:10:19 thorpej Exp $ */
+/* $NetBSD: atavar.h,v 1.34 2003/12/14 05:14:39 thorpej Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer.
@@ -207,6 +207,17 @@ struct ata_bustype {
#define SCSIPI_BUSTYPE_ATA 2
/*
+ * Describe an ATA device. Has to be compatible with scsipi_channel, so
+ * start with a pointer to ata_bustype.
+ */
+struct ata_device {
+ const struct ata_bustype *adev_bustype;
+ int adev_channel;
+ int adev_openings;
+ struct ata_drive_datas *adev_drv_data;
+};
+
+/*
* If WDSM_ATTR_ADVISORY, device exceeded intended design life period.
* If not WDSM_ATTR_ADVISORY, imminent data loss predicted.
*/
diff --git a/sys/dev/ata/wdvar.h b/sys/dev/ata/wdvar.h
index 1a18e392465..d6209cc682f 100644
--- a/sys/dev/ata/wdvar.h
+++ b/sys/dev/ata/wdvar.h
@@ -1,4 +1,4 @@
-/* $NetBSD: wdvar.h,v 1.23 2003/12/14 05:10:19 thorpej Exp $ */
+/* $NetBSD: wdvar.h,v 1.24 2003/12/14 05:14:39 thorpej Exp $ */
/*
* Copyright (c) 1998, 2001 Manuel Bouyer.
@@ -27,20 +27,8 @@
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
*/
-/*
- * describe an ATA device. Has to be compatible with scsipi_channel, so start
- * with a pointer to ata_bustype
- */
-struct ata_device {
- const struct ata_bustype *adev_bustype;
- int adev_channel;
- int adev_openings;
- struct ata_drive_datas *adev_drv_data;
-};
-
#ifdef __ATA_DISK_PRIVATE
struct wd_softc {