From e21c92e00052ef3c9e672e90238521f60c0d05e4 Mon Sep 17 00:00:00 2001
From: David Gwynne <dlg@cvs.openbsd.org>
Date: Tue, 20 Mar 2007 10:02:32 +0000
Subject: reorder slightly. ata bits before atascsi

---
 sys/dev/ata/atascsi.h | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

(limited to 'sys/dev/ata/atascsi.h')

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 *);
 
-- 
cgit v1.2.3