- static needs to be first

- complete the cdevsw
This commit is contained in:
christos 2006-08-27 23:31:15 +00:00
parent c689e59cb9
commit 4a778ebf9a
1 changed files with 9 additions and 9 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: amr.c,v 1.37 2006/08/23 15:44:29 christos Exp $ */ /* $NetBSD: amr.c,v 1.38 2006/08/27 23:31:15 christos Exp $ */
/*- /*-
* Copyright (c) 2002, 2003 The NetBSD Foundation, Inc. * Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
@ -71,7 +71,7 @@
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: amr.c,v 1.37 2006/08/23 15:44:29 christos Exp $"); __KERNEL_RCSID(0, "$NetBSD: amr.c,v 1.38 2006/08/27 23:31:15 christos Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/systm.h> #include <sys/systm.h>
@ -126,7 +126,7 @@ CFATTACH_DECL(amr, sizeof(struct amr_softc),
const struct cdevsw amr_cdevsw = { const struct cdevsw amr_cdevsw = {
amropen, amrclose, noread, nowrite, amrioctl, amropen, amrclose, noread, nowrite, amrioctl,
nostop, notty, nopoll, nommap, nostop, notty, nopoll, nommap, nokqfilter, D_OTHER
}; };
extern struct cfdriver amr_cd; extern struct cfdriver amr_cd;
@ -134,11 +134,11 @@ extern struct cfdriver amr_cd;
#define AT_QUARTZ 0x01 /* `Quartz' chipset */ #define AT_QUARTZ 0x01 /* `Quartz' chipset */
#define AT_SIG 0x02 /* Check for signature */ #define AT_SIG 0x02 /* Check for signature */
struct amr_pci_type { static struct amr_pci_type {
u_short apt_vendor; u_short apt_vendor;
u_short apt_product; u_short apt_product;
u_short apt_flags; u_short apt_flags;
} static const amr_pci_type[] = { } const amr_pci_type[] = {
{ PCI_VENDOR_AMI, PCI_PRODUCT_AMI_MEGARAID, 0 }, { PCI_VENDOR_AMI, PCI_PRODUCT_AMI_MEGARAID, 0 },
{ PCI_VENDOR_AMI, PCI_PRODUCT_AMI_MEGARAID2, 0 }, { PCI_VENDOR_AMI, PCI_PRODUCT_AMI_MEGARAID2, 0 },
{ PCI_VENDOR_AMI, PCI_PRODUCT_AMI_MEGARAID3, AT_QUARTZ }, { PCI_VENDOR_AMI, PCI_PRODUCT_AMI_MEGARAID3, AT_QUARTZ },
@ -156,10 +156,10 @@ struct amr_pci_type {
{ PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_MEGARAID_300X, AT_QUARTZ }, { PCI_VENDOR_SYMBIOS, PCI_PRODUCT_SYMBIOS_MEGARAID_300X, AT_QUARTZ },
}; };
struct amr_typestr { static struct amr_typestr {
const char *at_str; const char *at_str;
int at_sig; int at_sig;
} static const amr_typestr[] = { } const amr_typestr[] = {
{ "Series 431", AMR_SIG_431 }, { "Series 431", AMR_SIG_431 },
{ "Series 438", AMR_SIG_438 }, { "Series 438", AMR_SIG_438 },
{ "Series 466", AMR_SIG_466 }, { "Series 466", AMR_SIG_466 },
@ -170,10 +170,10 @@ struct amr_typestr {
{ "HP NetRAID (T7)", AMR_SIG_T7 }, { "HP NetRAID (T7)", AMR_SIG_T7 },
}; };
struct { static struct {
const char *ds_descr; const char *ds_descr;
int ds_happy; int ds_happy;
} static const amr_dstate[] = { } const amr_dstate[] = {
{ "offline", 0 }, { "offline", 0 },
{ "degraded", 1 }, { "degraded", 1 },
{ "optimal", 1 }, { "optimal", 1 },