svn commit: r206613 - in user/imp/tbemd: bin/ps lib/libc/sys
sbin/geom/class/sched sbin/mca share/man/man5 share/misc
sys/amd64/amd64 sys/amd64/ia32 sys/compat/linprocfs
sys/dev/aac sys/dev/ata/chi...
Warner Losh
imp at FreeBSD.org
Wed Apr 14 17:52:01 UTC 2010
Author: imp
Date: Wed Apr 14 17:52:00 2010
New Revision: 206613
URL: http://svn.freebsd.org/changeset/base/206613
Log:
merge svn+ssh://svn.freebsd.org/base/head@206610
Modified:
user/imp/tbemd/bin/ps/ps.1
user/imp/tbemd/lib/libc/sys/sigaction.2
user/imp/tbemd/sbin/geom/class/sched/Makefile
user/imp/tbemd/sbin/geom/class/sched/geom_sched.c
user/imp/tbemd/sbin/geom/class/sched/gsched.8
user/imp/tbemd/sbin/mca/mca.c
user/imp/tbemd/share/man/man5/rc.conf.5
user/imp/tbemd/share/misc/committers-ports.dot
user/imp/tbemd/sys/amd64/amd64/machdep.c
user/imp/tbemd/sys/amd64/amd64/trap.c
user/imp/tbemd/sys/amd64/ia32/ia32_signal.c
user/imp/tbemd/sys/compat/linprocfs/linprocfs.c
user/imp/tbemd/sys/dev/aac/aac.c
user/imp/tbemd/sys/dev/aac/aac_cam.c
user/imp/tbemd/sys/dev/aac/aac_debug.c
user/imp/tbemd/sys/dev/aac/aac_disk.c
user/imp/tbemd/sys/dev/aac/aac_pci.c
user/imp/tbemd/sys/dev/aac/aac_tables.h
user/imp/tbemd/sys/dev/aac/aacreg.h
user/imp/tbemd/sys/dev/aac/aacvar.h
user/imp/tbemd/sys/dev/ata/chipsets/ata-acerlabs.c
user/imp/tbemd/sys/dev/mii/miidevs
user/imp/tbemd/sys/dev/mii/truephy.c
user/imp/tbemd/sys/dev/usb/serial/u3g.c
user/imp/tbemd/sys/dev/usb/usbdevs
user/imp/tbemd/sys/fs/devfs/devfs_devs.c
user/imp/tbemd/sys/fs/devfs/devfs_int.h
user/imp/tbemd/sys/geom/sched/g_sched.c
user/imp/tbemd/sys/geom/sched/g_sched.h
user/imp/tbemd/sys/geom/sched/gs_rr.c
user/imp/tbemd/sys/geom/sched/gs_scheduler.h
user/imp/tbemd/sys/i386/i386/machdep.c
user/imp/tbemd/sys/i386/i386/trap.c
user/imp/tbemd/sys/ia64/ia64/mca.c
user/imp/tbemd/sys/ia64/ia64/mp_machdep.c
user/imp/tbemd/sys/ia64/include/mca.h
user/imp/tbemd/sys/ia64/include/pal.h
user/imp/tbemd/sys/kern/vfs_syscalls.c
user/imp/tbemd/sys/mips/mips/pmap.c
user/imp/tbemd/sys/mips/mips/vm_machdep.c
user/imp/tbemd/sys/modules/Makefile
user/imp/tbemd/sys/modules/uart/Makefile
user/imp/tbemd/sys/vm/vm_glue.c
user/imp/tbemd/usr.bin/calendar/calendars/calendar.dutch
Directory Properties:
user/imp/tbemd/ (props changed)
user/imp/tbemd/contrib/tzcode/stdtime/ (props changed)
user/imp/tbemd/contrib/tzcode/zic/ (props changed)
user/imp/tbemd/contrib/tzdata/ (props changed)
user/imp/tbemd/lib/libz/ (props changed)
user/imp/tbemd/sys/contrib/x86emu/ (props changed)
Modified: user/imp/tbemd/bin/ps/ps.1
==============================================================================
--- user/imp/tbemd/bin/ps/ps.1 Wed Apr 14 17:17:25 2010 (r206612)
+++ user/imp/tbemd/bin/ps/ps.1 Wed Apr 14 17:52:00 2010 (r206613)
@@ -29,7 +29,7 @@
.\" @(#)ps.1 8.3 (Berkeley) 4/18/94
.\" $FreeBSD$
.\"
-.Dd March 17, 2010
+.Dd April 13, 2010
.Dt PS 1
.Os
.Sh NAME
@@ -298,6 +298,7 @@ the include file
.It Dv "P_WAITED" Ta No "0x01000 Someone is waiting for us"
.It Dv "P_WEXIT" Ta No "0x02000 Working on exiting"
.It Dv "P_EXEC" Ta No "0x04000 Process called exec"
+.It Dv "P_WKILLED" Ta No "0x08000 Killed, shall go to kernel/user boundary ASAP"
.It Dv "P_CONTINUED" Ta No "0x10000 Proc has continued from a stopped state"
.It Dv "P_STOPPED_SIG" Ta No "0x20000 Stopped due to SIGSTOP/SIGTSTP"
.It Dv "P_STOPPED_TRACE" Ta No "0x40000 Stopped because of tracing"
Modified: user/imp/tbemd/lib/libc/sys/sigaction.2
==============================================================================
--- user/imp/tbemd/lib/libc/sys/sigaction.2 Wed Apr 14 17:17:25 2010 (r206612)
+++ user/imp/tbemd/lib/libc/sys/sigaction.2 Wed Apr 14 17:52:00 2010 (r206613)
@@ -28,7 +28,7 @@
.\" From: @(#)sigaction.2 8.2 (Berkeley) 4/3/94
.\" $FreeBSD$
.\"
-.Dd June 7, 2004
+.Dd April 13, 2010
.Dt SIGACTION 2
.Os
.Sh NAME
@@ -42,7 +42,7 @@
struct sigaction {
union {
void (*__sa_handler)(int);
- void (*__sa_sigaction)(int, struct __siginfo *, void *);
+ void (*__sa_sigaction)(int, siginfo_t *, void *);
} __sigaction_u; /* signal handler */
int sa_flags; /* see signal options below */
sigset_t sa_mask; /* signal mask to apply */
Modified: user/imp/tbemd/sbin/geom/class/sched/Makefile
==============================================================================
--- user/imp/tbemd/sbin/geom/class/sched/Makefile Wed Apr 14 17:17:25 2010 (r206612)
+++ user/imp/tbemd/sbin/geom/class/sched/Makefile Wed Apr 14 17:52:00 2010 (r206613)
@@ -1,9 +1,8 @@
# GEOM_LIBRARY_PATH
# $FreeBSD$
-.PATH: /usr/src/sbin/geom/misc
-
-CFLAGS += -I/usr/src/sbin/geom
+.PATH: ${.CURDIR}/../../misc
+#CFLAGS += -I/usr/src/sbin/geom
CLASS=sched
Modified: user/imp/tbemd/sbin/geom/class/sched/geom_sched.c
==============================================================================
--- user/imp/tbemd/sbin/geom/class/sched/geom_sched.c Wed Apr 14 17:17:25 2010 (r206612)
+++ user/imp/tbemd/sbin/geom/class/sched/geom_sched.c Wed Apr 14 17:52:00 2010 (r206613)
@@ -1,5 +1,6 @@
/*-
- * Copyright (c) 2009 Fabio Checconi, Luigi Rizzo
+ * Copyright (c) 2009 Fabio Checconi
+ * Copyright (c) 2010 Luigi Rizzo, Universita` di Pisa
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Modified: user/imp/tbemd/sbin/geom/class/sched/gsched.8
==============================================================================
--- user/imp/tbemd/sbin/geom/class/sched/gsched.8 Wed Apr 14 17:17:25 2010 (r206612)
+++ user/imp/tbemd/sbin/geom/class/sched/gsched.8 Wed Apr 14 17:52:00 2010 (r206613)
@@ -1,6 +1,6 @@
-.\" Copyright (c) 2009-2010 Fabio Checconi, Luigi Rizzo
+.\" Copyright (c) 2009-2010 Fabio Checconi
+.\" Copyright (c) 2009-2010 Luigi Rizzo, Universita` di Pisa
.\" All rights reserved.
-.\" $FreeBSD$
.\"
.\" Redistribution and use in source and binary forms, with or without
.\" modification, are permitted provided that the following conditions
@@ -23,6 +23,8 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
+.\" $FreeBSD$
+.\"
.Dd April 12, 2010
.Dt GSCHED 8
.Os
Modified: user/imp/tbemd/sbin/mca/mca.c
==============================================================================
--- user/imp/tbemd/sbin/mca/mca.c Wed Apr 14 17:17:25 2010 (r206612)
+++ user/imp/tbemd/sbin/mca/mca.c Wed Apr 14 17:52:00 2010 (r206613)
@@ -53,10 +53,12 @@ __FBSDID("$FreeBSD$");
#define BCD(x) ((x >> 4) * 10 + (x & 15))
+#define HW_MCA_MAX_CPUID 255
+
static char hw_mca_count[] = "hw.mca.count";
static char hw_mca_first[] = "hw.mca.first";
static char hw_mca_last[] = "hw.mca.last";
-static char hw_mca_recid[] = "hw.mca.%d";
+static char hw_mca_recid[] = "hw.mca.%lu.%u";
static char default_dumpfile[] = "/var/log/mca.log";
@@ -372,10 +374,13 @@ show_section(struct mca_section_header *
}
static void
-show(char *data)
+show(char *data, const char *mib)
{
size_t reclen, seclen;
+ if (mib != NULL)
+ printf("<!-- MIB: %s -->\n", mib);
+
printf("<record>\n");
reclen = show_header((void*)data) - sizeof(struct mca_record_header);
data += sizeof(struct mca_record_header);
@@ -402,7 +407,7 @@ showall(char *buf, size_t buflen)
if (buflen < reclen)
return;
- show(buf);
+ show(buf, NULL);
buf += reclen;
buflen -= reclen;
@@ -442,7 +447,7 @@ main(int argc, char **argv)
char *buf;
size_t len;
int ch, error, fd;
- int count, first, last;
+ int count, first, last, cpuid;
while ((ch = getopt(argc, argv, "df:")) != -1) {
switch(ch) {
@@ -481,12 +486,19 @@ main(int argc, char **argv)
if (error)
err(1, hw_mca_last);
+ cpuid = 0;
while (count && first <= last) {
- sprintf(mib, hw_mca_recid, first);
- len = 0;
- error = sysctlbyname(mib, NULL, &len, NULL, 0);
- if (error == ENOENT) {
+ do {
+ sprintf(mib, hw_mca_recid, first, cpuid);
+ len = 0;
+ error = sysctlbyname(mib, NULL, &len, NULL, 0);
+ if (error != ENOENT)
+ break;
+ cpuid++;
+ } while (cpuid <= HW_MCA_MAX_CPUID);
+ if (error == ENOENT && cpuid > HW_MCA_MAX_CPUID) {
first++;
+ cpuid = 0;
continue;
}
if (error)
@@ -503,11 +515,15 @@ main(int argc, char **argv)
if (fl_dump)
dump(buf);
else
- show(buf);
+ show(buf, mib);
free(buf);
- first++;
count--;
+ if (cpuid == HW_MCA_MAX_CPUID) {
+ first++;
+ cpuid = 0;
+ } else
+ cpuid++;
}
} else {
fd = open(file, O_RDONLY);
Modified: user/imp/tbemd/share/man/man5/rc.conf.5
==============================================================================
--- user/imp/tbemd/share/man/man5/rc.conf.5 Wed Apr 14 17:17:25 2010 (r206612)
+++ user/imp/tbemd/share/man/man5/rc.conf.5 Wed Apr 14 17:52:00 2010 (r206613)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd April 09, 2010
+.Dd April 14, 2010
.Dt RC.CONF 5
.Os
.Sh NAME
@@ -427,27 +427,11 @@ the
kernel module will be loaded.
See also
.Va ipfilter_enable .
-.It Va ipv6_firewall_enable
-.Pq Vt bool
-The IPv6 equivalent of
-.Va firewall_enable .
-Set to
-.Dq Li YES
-to load IPv6 firewall rules at startup.
-If the kernel was not built with
-.Cd "options IPV6FIREWALL" ,
-the
-.Pa ipfw.ko
-kernel module will be loaded.
.It Va firewall_script
.Pq Vt str
This variable specifies the full path to the firewall script to run.
The default is
.Pa /etc/rc.firewall .
-.It Va ipv6_firewall_script
-.Pq Vt str
-The IPv6 equivalent of
-.Va firewall_script .
.It Va firewall_type
.Pq Vt str
Names the firewall type from the selection in
@@ -471,19 +455,11 @@ basic protection for a LAN.
.Pp
If a filename is specified, the full path
must be given.
-.It Va ipv6_firewall_type
-.Pq Vt str
-The IPv6 equivalent of
-.Va firewall_type .
.It Va firewall_quiet
.Pq Vt bool
Set to
.Dq Li YES
to disable the display of firewall rules on the console during boot.
-.It Va ipv6_firewall_quiet
-.Pq Vt bool
-The IPv6 equivalent of
-.Va firewall_quiet .
.It Va firewall_logging
.Pq Vt bool
Set to
@@ -492,10 +468,6 @@ to enable firewall event logging.
This is equivalent to the
.Dv IPFIREWALL_VERBOSE
kernel option.
-.It Va ipv6_firewall_logging
-.Pq Vt bool
-The IPv6 equivalent of
-.Va firewall_logging .
.It Va firewall_flags
.Pq Vt str
Flags passed to
@@ -503,10 +475,6 @@ Flags passed to
if
.Va firewall_type
specifies a filename.
-.It Va ipv6_firewall_flags
-.Pq Vt str
-The IPv6 equivalent of
-.Va firewall_flags .
.It Va firewall_coscripts
.Pq Vt str
List of executables and/or rc scripts to run after firewall starts/stops.
Modified: user/imp/tbemd/share/misc/committers-ports.dot
==============================================================================
--- user/imp/tbemd/share/misc/committers-ports.dot Wed Apr 14 17:17:25 2010 (r206612)
+++ user/imp/tbemd/share/misc/committers-ports.dot Wed Apr 14 17:52:00 2010 (r206613)
@@ -140,6 +140,7 @@ rafan [label="Rong-En Fan\nrafan at FreeBSD
rene [label="Rene Ladan\nrene at FreeBSD.org\n2010/04/11"]
rnoland [label="Robert Noland\nrnoland at FreeBSD.org\n2008/07/21"]
romain [label="Romain Tartiere\nromain at FreeBSD.org\n2010/01/24"]
+sahil [label="Sahil Tandon\nsahil at FreeBSD.org\n2010/04/11"]
sat [label="Andrew Pantyukhin\nsat at FreeBSD.org\n2006/05/06"]
sem [label="Sergey Matveychuk\nsem at FreeBSD.org\n2004/07/07"]
sergei [label="Sergei Kolobov\nsergei at FreeBSD.org\n2003/10/21"]
@@ -251,6 +252,7 @@ ijliao -> leeym
itetcu -> araujo
itetcu -> dryice
+itetcu -> sahil
joerg -> netchild
@@ -360,6 +362,7 @@ tmclaugh -> xride
will -> lioux
+wxs -> sahil
wxs -> skreuzer
}
Modified: user/imp/tbemd/sys/amd64/amd64/machdep.c
==============================================================================
--- user/imp/tbemd/sys/amd64/amd64/machdep.c Wed Apr 14 17:17:25 2010 (r206612)
+++ user/imp/tbemd/sys/amd64/amd64/machdep.c Wed Apr 14 17:52:00 2010 (r206613)
@@ -424,13 +424,14 @@ sigreturn(td, uap)
error = copyin(uap->sigcntxp, &uc, sizeof(uc));
if (error != 0) {
- printf("sigreturn (pid %d): copyin failed\n", p->p_pid);
+ uprintf("pid %d (%s): sigreturn copyin failed\n",
+ p->p_pid, td->td_name);
return (error);
}
ucp = &uc;
if ((ucp->uc_mcontext.mc_flags & ~_MC_FLAG_MASK) != 0) {
- printf("sigreturn (pid %d): mc_flags %x\n", p->p_pid,
- ucp->uc_mcontext.mc_flags);
+ uprintf("pid %d (%s): sigreturn mc_flags %x\n", p->p_pid,
+ td->td_name, ucp->uc_mcontext.mc_flags);
return (EINVAL);
}
regs = td->td_frame;
@@ -449,8 +450,8 @@ sigreturn(td, uap)
* one less debugger trap, so allowing it is fairly harmless.
*/
if (!EFL_SECURE(rflags & ~PSL_RF, regs->tf_rflags & ~PSL_RF)) {
- printf("sigreturn (pid %d): rflags = 0x%lx\n", p->p_pid,
- rflags);
+ uprintf("pid %d (%s): sigreturn rflags = 0x%lx\n", p->p_pid,
+ td->td_name, rflags);
return (EINVAL);
}
@@ -461,7 +462,8 @@ sigreturn(td, uap)
*/
cs = ucp->uc_mcontext.mc_cs;
if (!CS_SECURE(cs)) {
- printf("sigreturn (pid %d): cs = 0x%x\n", p->p_pid, cs);
+ uprintf("pid %d (%s): sigreturn cs = 0x%x\n", p->p_pid,
+ td->td_name, cs);
ksiginfo_init_trap(&ksi);
ksi.ksi_signo = SIGBUS;
ksi.ksi_code = BUS_OBJERR;
@@ -473,7 +475,8 @@ sigreturn(td, uap)
ret = set_fpcontext(td, &ucp->uc_mcontext);
if (ret != 0) {
- printf("sigreturn (pid %d): set_fpcontext\n", p->p_pid);
+ uprintf("pid %d (%s): sigreturn set_fpcontext err %d\n",
+ p->p_pid, td->td_name, ret);
return (ret);
}
bcopy(&ucp->uc_mcontext.mc_rdi, regs, sizeof(*regs));
Modified: user/imp/tbemd/sys/amd64/amd64/trap.c
==============================================================================
--- user/imp/tbemd/sys/amd64/amd64/trap.c Wed Apr 14 17:17:25 2010 (r206612)
+++ user/imp/tbemd/sys/amd64/amd64/trap.c Wed Apr 14 17:52:00 2010 (r206613)
@@ -303,7 +303,7 @@ trap(struct trapframe *frame)
* enabled later.
*/
if (ISPL(frame->tf_cs) == SEL_UPL)
- printf(
+ uprintf(
"pid %ld (%s): trap %d with interrupts disabled\n",
(long)curproc->p_pid, curthread->td_name, type);
else if (type != T_NMI && type != T_BPTFLT &&
Modified: user/imp/tbemd/sys/amd64/ia32/ia32_signal.c
==============================================================================
--- user/imp/tbemd/sys/amd64/ia32/ia32_signal.c Wed Apr 14 17:17:25 2010 (r206612)
+++ user/imp/tbemd/sys/amd64/ia32/ia32_signal.c Wed Apr 14 17:52:00 2010 (r206613)
@@ -565,7 +565,8 @@ freebsd4_freebsd32_sigreturn(td, uap)
* one less debugger trap, so allowing it is fairly harmless.
*/
if (!EFL_SECURE(eflags & ~PSL_RF, regs->tf_rflags & ~PSL_RF)) {
- printf("freebsd4_freebsd32_sigreturn: eflags = 0x%x\n", eflags);
+ uprintf("pid %d (%s): freebsd4_freebsd32_sigreturn eflags = 0x%x\n",
+ td->td_proc->p_pid, td->td_name, eflags);
return (EINVAL);
}
@@ -576,7 +577,8 @@ freebsd4_freebsd32_sigreturn(td, uap)
*/
cs = ucp->uc_mcontext.mc_cs;
if (!CS_SECURE(cs)) {
- printf("freebsd4_sigreturn: cs = 0x%x\n", cs);
+ uprintf("pid %d (%s): freebsd4_sigreturn cs = 0x%x\n",
+ td->td_proc->p_pid, td->td_name, cs);
ksiginfo_init_trap(&ksi);
ksi.ksi_signo = SIGBUS;
ksi.ksi_code = BUS_OBJERR;
@@ -647,7 +649,8 @@ freebsd32_sigreturn(td, uap)
* one less debugger trap, so allowing it is fairly harmless.
*/
if (!EFL_SECURE(eflags & ~PSL_RF, regs->tf_rflags & ~PSL_RF)) {
- printf("freebsd32_sigreturn: eflags = 0x%x\n", eflags);
+ uprintf("pid %d (%s): freebsd32_sigreturn eflags = 0x%x\n",
+ td->td_proc->p_pid, td->td_name, eflags);
return (EINVAL);
}
@@ -658,7 +661,8 @@ freebsd32_sigreturn(td, uap)
*/
cs = ucp->uc_mcontext.mc_cs;
if (!CS_SECURE(cs)) {
- printf("sigreturn: cs = 0x%x\n", cs);
+ uprintf("pid %d (%s): sigreturn cs = 0x%x\n",
+ td->td_proc->p_pid, td->td_name, cs);
ksiginfo_init_trap(&ksi);
ksi.ksi_signo = SIGBUS;
ksi.ksi_code = BUS_OBJERR;
Modified: user/imp/tbemd/sys/compat/linprocfs/linprocfs.c
==============================================================================
--- user/imp/tbemd/sys/compat/linprocfs/linprocfs.c Wed Apr 14 17:17:25 2010 (r206612)
+++ user/imp/tbemd/sys/compat/linprocfs/linprocfs.c Wed Apr 14 17:52:00 2010 (r206613)
@@ -274,7 +274,7 @@ linprocfs_docpuinfo(PFS_FILL_ARGS)
"cpu family\t: %d\n"
"model\t\t: %d\n"
"model name\t: %s\n"
- "stepping\t: %d\n",
+ "stepping\t: %d\n\n",
i, cpu_vendor, class, cpu, model, cpu_id & 0xf);
/* XXX per-cpu vendor / class / model / id? */
}
Modified: user/imp/tbemd/sys/dev/aac/aac.c
==============================================================================
--- user/imp/tbemd/sys/dev/aac/aac.c Wed Apr 14 17:17:25 2010 (r206612)
+++ user/imp/tbemd/sys/dev/aac/aac.c Wed Apr 14 17:52:00 2010 (r206613)
@@ -1880,7 +1880,7 @@ aac_init(struct aac_softc *sc)
ip->InitFlags = 0;
if (sc->flags & AAC_FLAGS_NEW_COMM) {
- ip->InitFlags = INITFLAGS_NEW_COMM_SUPPORTED;
+ ip->InitFlags |= AAC_INITFLAGS_NEW_COMM_SUPPORTED;
device_printf(sc->aac_dev, "New comm. interface enabled\n");
}
@@ -2004,7 +2004,7 @@ aac_setup_intr(struct aac_softc *sc)
}
if (sc->flags & AAC_FLAGS_NEW_COMM) {
if (bus_setup_intr(sc->aac_dev, sc->aac_irq,
- INTR_MPSAFE|INTR_TYPE_BIO, NULL,
+ INTR_MPSAFE|INTR_TYPE_BIO, NULL,
aac_new_intr, sc, &sc->aac_intr)) {
device_printf(sc->aac_dev, "can't set up interrupt\n");
return (EINVAL);
Modified: user/imp/tbemd/sys/dev/aac/aac_cam.c
==============================================================================
--- user/imp/tbemd/sys/dev/aac/aac_cam.c Wed Apr 14 17:17:25 2010 (r206612)
+++ user/imp/tbemd/sys/dev/aac/aac_cam.c Wed Apr 14 17:52:00 2010 (r206613)
@@ -395,7 +395,7 @@ aac_cam_action(struct cam_sim *sim, unio
srb->cdb_len);
/* Set command */
- fib->Header.Command = (sc->flags & AAC_FLAGS_SG_64BIT) ?
+ fib->Header.Command = (sc->flags & AAC_FLAGS_SG_64BIT) ?
ScsiPortCommandU64 : ScsiPortCommand;
/* Map the s/g list. XXX 32bit addresses only! */
@@ -512,7 +512,7 @@ aac_cam_complete(struct aac_command *cm)
scsi_sense_len = sizeof(struct scsi_sense_data);
bzero(&ccb->csio.sense_data, scsi_sense_len);
- sense_len = (srbr->sense_len >
+ sense_len = (srbr->sense_len >
scsi_sense_len) ? scsi_sense_len :
srbr->sense_len;
bcopy(&srbr->sense[0], &ccb->csio.sense_data,
Modified: user/imp/tbemd/sys/dev/aac/aac_debug.c
==============================================================================
--- user/imp/tbemd/sys/dev/aac/aac_debug.c Wed Apr 14 17:17:25 2010 (r206612)
+++ user/imp/tbemd/sys/dev/aac/aac_debug.c Wed Apr 14 17:52:00 2010 (r206613)
@@ -62,62 +62,62 @@ aac_print_queues(struct aac_softc *sc)
device_printf(sc->aac_dev, "FIB queue header at %p queues at %p\n",
&sc->aac_queues->qt_qindex[AAC_HOST_NORM_CMD_QUEUE][0],
&sc->aac_queues->qt_HostNormCmdQueue[0]);
- device_printf(sc->aac_dev, "HOST_NORM_CMD %d/%d (%d)\n",
+ device_printf(sc->aac_dev, "HOST_NORM_CMD %d/%d (%d)\n",
sc->aac_queues->qt_qindex[AAC_HOST_NORM_CMD_QUEUE][
AAC_PRODUCER_INDEX],
sc->aac_queues->qt_qindex[AAC_HOST_NORM_CMD_QUEUE][
- AAC_CONSUMER_INDEX],
+ AAC_CONSUMER_INDEX],
AAC_HOST_NORM_CMD_ENTRIES);
- device_printf(sc->aac_dev, "HOST_HIGH_CMD %d/%d (%d)\n",
+ device_printf(sc->aac_dev, "HOST_HIGH_CMD %d/%d (%d)\n",
sc->aac_queues->qt_qindex[AAC_HOST_HIGH_CMD_QUEUE][
AAC_PRODUCER_INDEX],
sc->aac_queues->qt_qindex[AAC_HOST_HIGH_CMD_QUEUE][
- AAC_CONSUMER_INDEX],
+ AAC_CONSUMER_INDEX],
AAC_HOST_HIGH_CMD_ENTRIES);
- device_printf(sc->aac_dev, "ADAP_NORM_CMD %d/%d (%d)\n",
+ device_printf(sc->aac_dev, "ADAP_NORM_CMD %d/%d (%d)\n",
sc->aac_queues->qt_qindex[AAC_ADAP_NORM_CMD_QUEUE][
AAC_PRODUCER_INDEX],
sc->aac_queues->qt_qindex[AAC_ADAP_NORM_CMD_QUEUE][
- AAC_CONSUMER_INDEX],
+ AAC_CONSUMER_INDEX],
AAC_ADAP_NORM_CMD_ENTRIES);
- device_printf(sc->aac_dev, "ADAP_HIGH_CMD %d/%d (%d)\n",
+ device_printf(sc->aac_dev, "ADAP_HIGH_CMD %d/%d (%d)\n",
sc->aac_queues->qt_qindex[AAC_ADAP_HIGH_CMD_QUEUE][
AAC_PRODUCER_INDEX],
sc->aac_queues->qt_qindex[AAC_ADAP_HIGH_CMD_QUEUE][
- AAC_CONSUMER_INDEX],
+ AAC_CONSUMER_INDEX],
AAC_ADAP_HIGH_CMD_ENTRIES);
- device_printf(sc->aac_dev, "HOST_NORM_RESP %d/%d (%d)\n",
+ device_printf(sc->aac_dev, "HOST_NORM_RESP %d/%d (%d)\n",
sc->aac_queues->qt_qindex[AAC_HOST_NORM_RESP_QUEUE][
AAC_PRODUCER_INDEX],
sc->aac_queues->qt_qindex[AAC_HOST_NORM_RESP_QUEUE][
AAC_CONSUMER_INDEX],
AAC_HOST_NORM_RESP_ENTRIES);
- device_printf(sc->aac_dev, "HOST_HIGH_RESP %d/%d (%d)\n",
+ device_printf(sc->aac_dev, "HOST_HIGH_RESP %d/%d (%d)\n",
sc->aac_queues->qt_qindex[AAC_HOST_HIGH_RESP_QUEUE][
AAC_PRODUCER_INDEX],
sc->aac_queues->qt_qindex[AAC_HOST_HIGH_RESP_QUEUE][
AAC_CONSUMER_INDEX],
AAC_HOST_HIGH_RESP_ENTRIES);
- device_printf(sc->aac_dev, "ADAP_NORM_RESP %d/%d (%d)\n",
+ device_printf(sc->aac_dev, "ADAP_NORM_RESP %d/%d (%d)\n",
sc->aac_queues->qt_qindex[AAC_ADAP_NORM_RESP_QUEUE][
AAC_PRODUCER_INDEX],
sc->aac_queues->qt_qindex[AAC_ADAP_NORM_RESP_QUEUE][
AAC_CONSUMER_INDEX],
AAC_ADAP_NORM_RESP_ENTRIES);
- device_printf(sc->aac_dev, "ADAP_HIGH_RESP %d/%d (%d)\n",
+ device_printf(sc->aac_dev, "ADAP_HIGH_RESP %d/%d (%d)\n",
sc->aac_queues->qt_qindex[AAC_ADAP_HIGH_RESP_QUEUE][
AAC_PRODUCER_INDEX],
sc->aac_queues->qt_qindex[AAC_ADAP_HIGH_RESP_QUEUE][
AAC_CONSUMER_INDEX],
AAC_ADAP_HIGH_RESP_ENTRIES);
- device_printf(sc->aac_dev, "AACQ_FREE %d/%d\n",
+ device_printf(sc->aac_dev, "AACQ_FREE %d/%d\n",
sc->aac_qstat[AACQ_FREE].q_length, sc->aac_qstat[AACQ_FREE].q_max);
- device_printf(sc->aac_dev, "AACQ_BIO %d/%d\n",
+ device_printf(sc->aac_dev, "AACQ_BIO %d/%d\n",
sc->aac_qstat[AACQ_BIO].q_length, sc->aac_qstat[AACQ_BIO].q_max);
- device_printf(sc->aac_dev, "AACQ_READY %d/%d\n",
+ device_printf(sc->aac_dev, "AACQ_READY %d/%d\n",
sc->aac_qstat[AACQ_READY].q_length,
sc->aac_qstat[AACQ_READY].q_max);
- device_printf(sc->aac_dev, "AACQ_BUSY %d/%d\n",
+ device_printf(sc->aac_dev, "AACQ_BUSY %d/%d\n",
sc->aac_qstat[AACQ_BUSY].q_length, sc->aac_qstat[AACQ_BUSY].q_max);
}
@@ -225,8 +225,8 @@ aac_print_fib(struct aac_softc *sc, stru
if (br->Command == VM_CtBlockRead) {
device_printf(sc->aac_dev,
- " BlockRead: container %d 0x%x/%d\n",
- br->ContainerId, br->BlockNumber,
+ " BlockRead: container %d 0x%x/%d\n",
+ br->ContainerId, br->BlockNumber,
br->ByteCount);
sg = &br->SgMap;
}
@@ -234,7 +234,7 @@ aac_print_fib(struct aac_softc *sc, stru
device_printf(sc->aac_dev,
" BlockWrite: container %d 0x%x/%d "
"(%s)\n", bw->ContainerId,
- bw->BlockNumber, bw->ByteCount,
+ bw->BlockNumber, bw->ByteCount,
bw->Stable == CSTABLE ? "stable" :
"unstable");
sg = &bw->SgMap;
@@ -267,7 +267,7 @@ aac_print_aif(struct aac_softc *sc, stru
device_printf(sc->aac_dev, "EventNotify(%d)\n", aif->seqNumber);
switch(aif->data.EN.type) {
case AifEnGeneric: /* Generic notification */
- device_printf(sc->aac_dev, "(Generic) %.*s\n",
+ device_printf(sc->aac_dev, "(Generic) %.*s\n",
(int)sizeof(aif->data.EN.data.EG),
aif->data.EN.data.EG.text);
break;
@@ -281,21 +281,21 @@ aac_print_aif(struct aac_softc *sc, stru
case AifEnContainerChange: /* Adapter specific container
* configuration change */
device_printf(sc->aac_dev, "(ContainerChange) "
- "container %d,%d\n",
- aif->data.EN.data.ECC.container[0],
+ "container %d,%d\n",
+ aif->data.EN.data.ECC.container[0],
aif->data.EN.data.ECC.container[1]);
break;
case AifEnDeviceFailure: /* SCSI device failed */
device_printf(sc->aac_dev, "(DeviceFailure) "
- "handle %d\n",
+ "handle %d\n",
aif->data.EN.data.EDF.deviceHandle);
break;
case AifEnMirrorFailover: /* Mirror failover started */
device_printf(sc->aac_dev, "(MirrorFailover) "
"container %d failed, "
"migrating from slice %d to %d\n",
- aif->data.EN.data.EMF.container,
- aif->data.EN.data.EMF.failedSlice,
+ aif->data.EN.data.EMF.container,
+ aif->data.EN.data.EMF.failedSlice,
aif->data.EN.data.EMF.creatingSlice);
break;
case AifEnContainerEvent: /* Significant container
@@ -325,7 +325,7 @@ aac_print_aif(struct aac_softc *sc, stru
device_printf(sc->aac_dev, "(EnclosureManagement) "
"EMPID %d unit %d "
"event %d\n", aif->data.EN.data.EEE.empID,
- aif->data.EN.data.EEE.unitID,
+ aif->data.EN.data.EEE.unitID,
aif->data.EN.data.EEE.eventType);
break;
case AifEnBatteryEvent: /* Significant NV battery
@@ -348,14 +348,14 @@ aac_print_aif(struct aac_softc *sc, stru
device_printf(sc->aac_dev, "(BatteryNeedsRecond)\n");
break;
case AifEnClusterEvent: /* Some cluster event */
- device_printf(sc->aac_dev, "(ClusterEvent) event %d\n",
+ device_printf(sc->aac_dev, "(ClusterEvent) event %d\n",
aif->data.EN.data.ECLE.eventType);
break;
case AifEnDiskSetEvent: /* A disk set event occured. */
device_printf(sc->aac_dev, "(DiskSetEvent) event %d "
"diskset %jd creator %jd\n",
- aif->data.EN.data.EDS.eventType,
- (intmax_t)aif->data.EN.data.EDS.DsNum,
+ aif->data.EN.data.EDS.eventType,
+ (intmax_t)aif->data.EN.data.EDS.DsNum,
(intmax_t)aif->data.EN.data.EDS.CreatorId);
break;
case AifDenMorphComplete: /* A morph operation
@@ -392,7 +392,7 @@ aac_print_aif(struct aac_softc *sc, stru
}
device_printf(sc->aac_dev, "JobProgress (%d) - %s (%d, %d)\n",
- aif->seqNumber, status,
+ aif->seqNumber, status,
aif->data.PR[0].currentTick,
aif->data.PR[0].finalTick);
switch(aif->data.PR[0].jd.type) {
@@ -418,12 +418,12 @@ aac_print_aif(struct aac_softc *sc, stru
break;
case AifJobCtrZero: /* Container clear operation */
device_printf(sc->aac_dev,
- "(ContainerZero) container %d\n",
+ "(ContainerZero) container %d\n",
aif->data.PR[0].jd.client.container.src);
break;
case AifJobCtrCopy: /* Container copy operation */
device_printf(sc->aac_dev,
- "(ContainerCopy) container %d to %d\n",
+ "(ContainerCopy) container %d to %d\n",
aif->data.PR[0].jd.client.container.src,
aif->data.PR[0].jd.client.container.dst);
break;
@@ -456,12 +456,12 @@ aac_print_aif(struct aac_softc *sc, stru
case AifJobCtrScrubRaid5: /* Container Scrub Raid5
* operation */
device_printf(sc->aac_dev,
- "(ContainerScrubRaid5) container %d\n",
+ "(ContainerScrubRaid5) container %d\n",
aif->data.PR[0].jd.client.container.src);
break;
case AifJobCtrMorph: /* Container morph operation */
device_printf(sc->aac_dev,
- "(ContainerMorph) container %d\n",
+ "(ContainerMorph) container %d\n",
aif->data.PR[0].jd.client.container.src);
/* XXX two containers? */
break;
@@ -476,13 +476,13 @@ aac_print_aif(struct aac_softc *sc, stru
case AifJobCtrRebuildMirror: /* Container Rebuild Mirror
* operation */
device_printf(sc->aac_dev,
- "(ContainerRebuildMirror) container "
+ "(ContainerRebuildMirror) container "
"%d\n",
aif->data.PR[0].jd.client.container.src);
break;
case AifJobCtrCrazyCache: /* crazy cache */
device_printf(sc->aac_dev,
- "(ContainerCrazyCache) container %d\n",
+ "(ContainerCrazyCache) container %d\n",
aif->data.PR[0].jd.client.container.src);
/* XXX two containers? */
break;
Modified: user/imp/tbemd/sys/dev/aac/aac_disk.c
==============================================================================
--- user/imp/tbemd/sys/dev/aac/aac_disk.c Wed Apr 14 17:17:25 2010 (r206612)
+++ user/imp/tbemd/sys/dev/aac/aac_disk.c Wed Apr 14 17:52:00 2010 (r206613)
@@ -87,7 +87,7 @@ DRIVER_MODULE(aacd, aac, aac_disk_driver
/*
* Handle open from generic layer.
*
- * This is called by the diskslice code on first open in order to get the
+ * This is called by the diskslice code on first open in order to get the
* basic device geometry paramters.
*/
static int
Modified: user/imp/tbemd/sys/dev/aac/aac_pci.c
==============================================================================
--- user/imp/tbemd/sys/dev/aac/aac_pci.c Wed Apr 14 17:17:25 2010 (r206612)
+++ user/imp/tbemd/sys/dev/aac/aac_pci.c Wed Apr 14 17:52:00 2010 (r206613)
@@ -177,7 +177,7 @@ struct aac_ident
{0x9005, 0x0285, 0x1014, 0x0312, AAC_HWIF_I960RX, 0,
"IBM ServeRAID 8i"},
{0x9005, 0x0285, 0x9005, 0x0298, AAC_HWIF_I960RX, 0,
- "Adaptec SAS RAID 4000SAS"},
+ "Adaptec RAID 4000"},
{0x9005, 0x0285, 0x9005, 0x0299, AAC_HWIF_I960RX, 0,
"Adaptec SAS RAID 4800SAS"},
{0x9005, 0x0285, 0x9005, 0x029a, AAC_HWIF_I960RX, 0,
@@ -353,7 +353,7 @@ aac_pci_attach(device_t dev)
/* assume failure is 'not configured' */
error = ENXIO;
- /*
+ /*
* Verify that the adapter is correctly set up in PCI space.
*/
command = pci_read_config(sc->aac_dev, PCIR_COMMAND, 2);
@@ -401,7 +401,7 @@ aac_pci_attach(device_t dev)
/*
* Allocate the parent bus DMA tag appropriate for our PCI interface.
- *
+ *
* Note that some of these controllers are 64-bit capable.
*/
if (bus_dma_tag_create(NULL, /* parent */
@@ -419,7 +419,7 @@ aac_pci_attach(device_t dev)
goto out;
}
- /*
+ /*
* Detect the hardware interface version, set up the bus interface
* indirection.
*/
Modified: user/imp/tbemd/sys/dev/aac/aac_tables.h
==============================================================================
--- user/imp/tbemd/sys/dev/aac/aac_tables.h Wed Apr 14 17:17:25 2010 (r206612)
+++ user/imp/tbemd/sys/dev/aac/aac_tables.h Wed Apr 14 17:52:00 2010 (r206613)
@@ -34,40 +34,42 @@
* relevant only to FSA operations.
*/
static struct aac_code_lookup aac_command_status_table[] = {
- {"OK", 0},
- {"operation not permitted", 1},
- {"not found", 2},
- {"I/O error", 5},
- {"device not configured", 6},
- {"too big", 7},
- {"permission denied", 13},
- {"file exists", 17},
- {"cross-device link", 18},
- {"operation not supported by device", 19},
- {"not a directory", 20},
- {"is a directory", 21},
- {"invalid argument", 22},
- {"file too large", 27},
- {"no space on device", 28},
- {"readonly filesystem", 30},
- {"too many links", 31},
- {"operation would block", 35},
- {"file name too long", 63},
- {"directory not empty", 66},
- {"quota exceeded", 69},
- {"stale file handle", 70},
- {"too many levels of remote in path", 71},
- {"bad file handle", 10001},
- {"not sync", 10002},
- {"bad cookie", 10003},
- {"operation not supported", 10004},
- {"too small", 10005},
- {"server fault", 10006},
- {"bad type", 10007},
- {"jukebox", 10008},
- {"not mounted", 10009},
- {"in maintenance mode", 10010},
- {"stale ACL", 10011},
+ {"OK", ST_OK},
+ {"operation not permitted", ST_PERM},
+ {"not found", ST_NOENT},
+ {"I/O error", ST_IO},
+ {"device not configured", ST_NXIO},
+ {"too big", ST_E2BIG},
+ {"permission denied", ST_ACCES},
+ {"file exists", ST_EXIST},
+ {"cross-device link", ST_XDEV},
+ {"operation not supported by device", ST_NODEV},
+ {"not a directory", ST_NOTDIR},
+ {"is a directory", ST_ISDIR},
+ {"invalid argument", ST_INVAL},
+ {"file too large", ST_FBIG},
+ {"no space on device", ST_NOSPC},
+ {"readonly filesystem", ST_ROFS},
+ {"too many links", ST_MLINK},
+ {"operation would block", ST_WOULDBLOCK},
+ {"file name too long", ST_NAMETOOLONG},
+ {"directory not empty", ST_NOTEMPTY},
+ {"quota exceeded", ST_DQUOT},
+ {"stale file handle", ST_STALE},
+ {"too many levels of remote in path", ST_REMOTE},
+ {"device busy (spinning up)", ST_NOT_READY},
+ {"bad file handle", ST_BADHANDLE},
+ {"not sync", ST_NOT_SYNC},
+ {"bad cookie", ST_BAD_COOKIE},
+ {"operation not supported", ST_NOTSUPP},
+ {"too small", ST_TOOSMALL},
+ {"server fault", ST_SERVERFAULT},
+ {"bad type", ST_BADTYPE},
+ {"jukebox", ST_JUKEBOX},
+ {"not mounted", ST_NOTMOUNTED},
+ {"in maintenance mode", ST_MAINTMODE},
+ {"stale ACL", ST_STALEACL},
+ {"bus reset - command aborted", ST_BUS_RESET},
{NULL, 0},
{"unknown command status", 0}
};
Modified: user/imp/tbemd/sys/dev/aac/aacreg.h
==============================================================================
--- user/imp/tbemd/sys/dev/aac/aacreg.h Wed Apr 14 17:17:25 2010 (r206612)
+++ user/imp/tbemd/sys/dev/aac/aacreg.h Wed Apr 14 17:52:00 2010 (r206613)
@@ -220,20 +220,20 @@ typedef enum {
IsAdapterPaused = 704,
SendHostTime = 705,
RequestSupplementAdapterInfo = 706, /* Supp. Info for set in UCC
- * use only if supported
+ * use only if supported
* (RequestAdapterInfo first) */
LastMiscCommand = 707,
-
- OnLineDiagnostic = 800,
- FduAdapterTest = 801,
+
+ OnLineDiagnostic = 800,
+ FduAdapterTest = 801,
RequestCompatibilityId = 802,
AdapterEnvironmentInfo = 803, /* temp. sensors */
NvsramEventLog = 900,
ResetNvsramEventLogPointers = 901,
EnableEventLog = 902,
DisableEventLog = 903,
- EncryptedKeyTransportFIB= 904,
- KeyableFeaturesFIB= 905
+ EncryptedKeyTransportFIB= 904,
+ KeyableFeaturesFIB= 905
} AAC_FibCommands;
/*
@@ -283,7 +283,7 @@ typedef enum {
#define AAC_ERROR_FIB_DEALLOCATION_FAILED 0x08
/*
- * Adapter Init Structure: this is passed to the adapter with the
+ * Adapter Init Structure: this is passed to the adapter with the
* AAC_MONKER_INITSTRUCT command to point it at our control structures.
*/
struct aac_adapter_init {
@@ -306,7 +306,7 @@ struct aac_adapter_init {
u_int32_t HostElapsedSeconds;
/* ADAPTER_INIT_STRUCT_REVISION_4 begins here */
u_int32_t InitFlags; /* flags for supported features */
-#define INITFLAGS_NEW_COMM_SUPPORTED 1
+#define AAC_INITFLAGS_NEW_COMM_SUPPORTED 1
u_int32_t MaxIoCommands; /* max outstanding commands */
u_int32_t MaxIoSize; /* largest I/O command */
u_int32_t MaxFibSize; /* largest FIB to adapter */
@@ -329,14 +329,14 @@ typedef enum {
CT_MORPH,
CT_PASSTHRU,
CT_RAID4,
- CT_RAID10, /* stripe of mirror */
- CT_RAID00, /* stripe of stripe */
- CT_VOLUME_OF_MIRRORS, /* volume of mirror */
- CT_PSEUDO_RAID3, /* really raid4 */
- CT_RAID50, /* stripe of raid5 */
- CT_RAID5D, /* raid5 distributed hot-sparing */
+ CT_RAID10, /* stripe of mirror */
+ CT_RAID00, /* stripe of stripe */
+ CT_VOLUME_OF_MIRRORS, /* volume of mirror */
+ CT_PSEUDO_RAID3, /* really raid4 */
+ CT_RAID50, /* stripe of raid5 */
+ CT_RAID5D, /* raid5 distributed hot-sparing */
CT_RAID5D0,
- CT_RAID1E, /* extended raid1 mirroring */
+ CT_RAID1E, /* extended raid1 mirroring */
CT_RAID6,
CT_RAID60,
} AAC_FSAVolType;
@@ -345,23 +345,23 @@ typedef enum {
* Host-addressable object types
*/
typedef enum {
- FT_REG = 1, /* regular file */
- FT_DIR, /* directory */
- FT_BLK, /* "block" device - reserved */
- FT_CHR, /* "character special" device - reserved */
- FT_LNK, /* symbolic link */
- FT_SOCK, /* socket */
- FT_FIFO, /* fifo */
- FT_FILESYS, /* ADAPTEC's "FSA"(tm) filesystem */
- FT_DRIVE, /* physical disk - addressable in scsi by b/t/l */
- FT_SLICE, /* virtual disk - raw volume - slice */
- FT_PARTITION, /* FSA partition - carved out of a slice - building
+ FT_REG = 1, /* regular file */
+ FT_DIR, /* directory */
+ FT_BLK, /* "block" device - reserved */
+ FT_CHR, /* "character special" device - reserved */
+ FT_LNK, /* symbolic link */
+ FT_SOCK, /* socket */
+ FT_FIFO, /* fifo */
+ FT_FILESYS, /* ADAPTEC's "FSA"(tm) filesystem */
+ FT_DRIVE, /* physical disk - addressable in scsi by b/t/l */
+ FT_SLICE, /* virtual disk - raw volume - slice */
+ FT_PARTITION, /* FSA partition - carved out of a slice - building
* block for containers */
- FT_VOLUME, /* Container - Volume Set */
- FT_STRIPE, /* Container - Stripe Set */
- FT_MIRROR, /* Container - Mirror Set */
- FT_RAID5, /* Container - Raid 5 Set */
- FT_DATABASE /* Storage object with "foreign" content manager */
+ FT_VOLUME, /* Container - Volume Set */
+ FT_STRIPE, /* Container - Stripe Set */
+ FT_MIRROR, /* Container - Mirror Set */
+ FT_RAID5, /* Container - Raid 5 Set */
+ FT_DATABASE /* Storage object with "foreign" content manager */
} AAC_FType;
/*
@@ -467,7 +467,7 @@ typedef enum {
CPU_MIPS,
CPU_XSCALE,
CPU__last
-} AAC_CpuType;
+} AAC_CpuType;
typedef enum {
CPUI960_JX = 1,
@@ -544,7 +544,7 @@ typedef enum {
* XXX the aac-2622 with no battery present reports PLATFORM_BAT_OPT_PRESENT
*/
typedef enum
-{
+{
PLATFORM_BAT_REQ_PRESENT = 1, /* BATTERY REQUIRED AND PRESENT */
PLATFORM_BAT_REQ_NOTPRESENT, /* BATTERY REQUIRED AND NOT PRESENT */
PLATFORM_BAT_OPT_PRESENT, /* BATTERY OPTIONAL AND PRESENT */
@@ -552,9 +552,9 @@ typedef enum
PLATFORM_BAT_NOT_SUPPORTED /* BATTERY NOT SUPPORTED */
} AAC_BatteryPlatform;
-/*
+/*
* options supported by this board
- * there has to be a one to one mapping of these defines and the ones in
+ * there has to be a one to one mapping of these defines and the ones in
* fsaapi.h, search for FSA_SUPPORT_SNAPSHOT
*/
#define AAC_SUPPORTED_SNAPSHOT 0x01
@@ -577,24 +577,24 @@ typedef enum
#define AAC_SUPPORTED_64BIT_ARRAYSIZE 0x40000
#define AAC_SUPPORTED_HEAT_SENSOR 0x80000
-/*
+/*
* Structure used to respond to a RequestAdapterInfo fib.
*/
struct aac_adapter_info {
- AAC_Platform PlatformBase; /* adapter type */
+ AAC_Platform PlatformBase; /* adapter type */
AAC_CpuType CpuArchitecture; /* adapter CPU type */
- AAC_CpuSubType CpuVariant; /* adapter CPU subtype */
- u_int32_t ClockSpeed; /* adapter CPU clockspeed */
- u_int32_t ExecutionMem; /* adapter Execution Memory
+ AAC_CpuSubType CpuVariant; /* adapter CPU subtype */
+ u_int32_t ClockSpeed; /* adapter CPU clockspeed */
+ u_int32_t ExecutionMem; /* adapter Execution Memory
* size */
- u_int32_t BufferMem; /* adapter Data Memory */
- u_int32_t TotalMem; /* adapter Total Memory */
+ u_int32_t BufferMem; /* adapter Data Memory */
+ u_int32_t TotalMem; /* adapter Total Memory */
struct FsaRevision KernelRevision; /* adapter Kernel Software
* Revision */
struct FsaRevision MonitorRevision; /* adapter Monitor/Diagnostic
* Software Revision */
struct FsaRevision HardwareRevision;/* TBD */
- struct FsaRevision BIOSRevision; /* adapter BIOS Revision */
+ struct FsaRevision BIOSRevision; /* adapter BIOS Revision */
u_int32_t ClusteringEnabled;
u_int32_t ClusterChannelMask;
u_int64_t SerialNumber;
@@ -604,7 +604,7 @@ struct aac_adapter_info {
AAC_OemFlavor OemVariant;
} __packed;
-/*
+/*
* Structure used to respond to a RequestSupplementAdapterInfo fib.
*/
struct vpd_info {
@@ -692,7 +692,7 @@ struct aac_supplement_adapter_info {
#define AAC_KERNEL_PANIC 0x00000100
/*
- * Data types relating to control and monitoring of the NVRAM/WriteCache
+ * Data types relating to control and monitoring of the NVRAM/WriteCache
* subsystem.
*/
@@ -867,7 +867,7 @@ typedef enum {
AifEnGeneric = 1, /* Generic notification */
AifEnTaskComplete, /* Task has completed */
AifEnConfigChange, /* Adapter config change occurred */
- AifEnContainerChange, /* Adapter specific container
+ AifEnContainerChange, /* Adapter specific container
* configuration change */
AifEnDeviceFailure, /* SCSI device failed */
AifEnMirrorFailover, /* Mirror failover started */
@@ -881,7 +881,7 @@ typedef enum {
AifEnBatteryEvent, /* Significant NV battery event */
AifEnAddContainer, /* A new container was created. */
AifEnDeleteContainer, /* A container was deleted. */
- AifEnSMARTEvent, /* SMART Event */
+ AifEnSMARTEvent, /* SMART Event */
AifEnBatteryNeedsRecond, /* The battery needs reconditioning */
AifEnClusterEvent, /* Some cluster event */
AifEnDiskSetEvent, /* A disk set event occured. */
@@ -967,7 +967,7 @@ struct aac_AifEventNotify {
/*
* Adapter Initiated FIB command structures. Start with the adapter
* initiated FIBs that really come from the adapter, and get responded
- * to by the host.
+ * to by the host.
*/
#define AAC_AIF_REPORT_MAX_SIZE 64
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-user
mailing list