Move enum definitions to global scope. Local scope is meaningless, and

interferes with C99's anonymous stuff.

ok millert@

2 files changed, 10 insertions, 9 deletions

diff --git a/sys/dev/atapiscsi/atapiscsi.c b/sys/dev/atapiscsi/atapiscsi.c
index 3e008b43791..ac7de00baf4 100644
--- a/sys/dev/atapiscsi/atapiscsi.c
+++ b/sys/dev/atapiscsi/atapiscsi.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: atapiscsi.c,v 1.60 2002/05/10 16:26:28 csapuntz Exp $     */
+/*      $OpenBSD: atapiscsi.c,v 1.61 2002/05/21 08:42:03 espie Exp $     */
 
 /*
  * This code is derived from code with the copyright below.
@@ -150,11 +150,12 @@ int	atapiscsi_match(struct device *, void *, void *);
 void	atapiscsi_attach(struct device *, struct device *, void *);
 int     atapi_to_scsi_sense(struct scsi_xfer *, u_int8_t);
 
+enum atapi_state { as_none, as_data, as_completed };
+
 struct atapiscsi_softc {
 	struct device  sc_dev;
 	struct  scsi_link  sc_adapterlink;
 	struct channel_softc *chp;
-	enum atapi_state { as_none, as_data, as_completed };
 	enum atapi_state protocol_phase;
 
 	int drive;
diff --git a/sys/dev/ic/ac97.h b/sys/dev/ic/ac97.h
index b7de3048098..f4630678f1e 100644
--- a/sys/dev/ic/ac97.h
+++ b/sys/dev/ic/ac97.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ac97.h,v 1.12 2002/04/08 01:43:13 frantzen Exp $	*/
+/*	$OpenBSD: ac97.h,v 1.13 2002/05/21 08:42:03 espie Exp $	*/
 
 /*
  * Copyright (c) 1999 Constantine Sapuntzakis
@@ -32,6 +32,12 @@ struct ac97_codec_if;
 /*
  * This is the interface used to attach the AC97 compliant CODEC.
  */
+enum ac97_host_flags {
+	AC97_HOST_DONT_READ = 0x1,
+	AC97_HOST_DONT_READANY = 0x2,
+	AC97_HOST_SWAPPED_CHANNELS = 0x4
+};
+
 struct ac97_host_if {
 	void  *arg;
 
@@ -40,12 +46,6 @@ struct ac97_host_if {
 	int (*write)(void *arg, u_int8_t reg, u_int16_t val);
 	void (*reset)(void *arg);
 
-	enum ac97_host_flags {
-		AC97_HOST_DONT_READ = 0x1,
-		AC97_HOST_DONT_READANY = 0x2,
-		AC97_HOST_SWAPPED_CHANNELS = 0x4
-	};
-
 	enum ac97_host_flags (*flags)(void *arg);
 };