summaryrefslogtreecommitdiff
path: root/sys/dev
diff options
context:
space:
mode:
authorDavid Gwynne <dlg@cvs.openbsd.org>2007-03-20 10:02:32 +0000
committerDavid Gwynne <dlg@cvs.openbsd.org>2007-03-20 10:02:32 +0000
commite21c92e00052ef3c9e672e90238521f60c0d05e4 (patch)
tree395e2d82bc0914e43553af7d1716283c7d6081cc /sys/dev
parentb24c843bdee4c98e5a9ad6044663bce1dc186a98 (diff)
reorder slightly. ata bits before atascsi
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/ata/atascsi.h39
1 files changed, 23 insertions, 16 deletions
diff --git a/sys/dev/ata/atascsi.h b/sys/dev/ata/atascsi.h
index 61fc35d342b..815905ece22 100644
--- a/sys/dev/ata/atascsi.h
+++ b/sys/dev/ata/atascsi.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: atascsi.h,v 1.13 2007/03/20 08:47:46 pascoe Exp $ */
+/* $OpenBSD: atascsi.h,v 1.14 2007/03/20 10:02:31 dlg Exp $ */
/*
* Copyright (c) 2007 David Gwynne <dlg@openbsd.org>
@@ -17,22 +17,10 @@
*/
struct atascsi;
-struct ata_xfer;
-struct atascsi_methods {
- int (*probe)(void *, int);
- struct ata_xfer * (*ata_get_xfer)(void *, int );
- int (*ata_cmd)(struct ata_xfer *);
-};
-
-struct atascsi_attach_args {
- void *aaa_cookie;
-
- struct atascsi_methods *aaa_methods;
- void (*aaa_minphys)(struct buf *);
- int aaa_nports;
- int aaa_ncmds;
-};
+/*
+ * ATA interface
+ */
struct ata_port {
struct atascsi *ap_as;
@@ -134,6 +122,25 @@ struct ata_xfer {
#define ATA_COMPLETE 1
#define ATA_ERROR 2
+/*
+ * atascsi
+ */
+
+struct atascsi_methods {
+ int (*probe)(void *, int);
+ struct ata_xfer * (*ata_get_xfer)(void *, int );
+ int (*ata_cmd)(struct ata_xfer *);
+};
+
+struct atascsi_attach_args {
+ void *aaa_cookie;
+
+ struct atascsi_methods *aaa_methods;
+ void (*aaa_minphys)(struct buf *);
+ int aaa_nports;
+ int aaa_ncmds;
+};
+
struct atascsi *atascsi_attach(struct device *, struct atascsi_attach_args *);
int atascsi_detach(struct atascsi *);