Author: emaste
Date: Tue Apr 13 01:16:15 2010
New Revision: 206540
URL: http://svn.freebsd.org/changeset/base/206540
Log:
Sync some minor items with the upstream driver. Should have no functional
change.
Modified:
head/sys/dev/aac/aac.c
head/sys/dev/aac/aac_pci.c
head/sys/dev/aac/aac_tables.h
head/sys/dev/aac/aacreg.h
Modified: head/sys/dev/aac/aac.c
==============================================================================
--- head/sys/dev/aac/aac.c Tue Apr 13 01:04:11 2010 (r206539)
+++ head/sys/dev/aac/aac.c Tue Apr 13 01:16:15 2010 (r206540)
@@ -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");
}
Modified: head/sys/dev/aac/aac_pci.c
==============================================================================
--- head/sys/dev/aac/aac_pci.c Tue Apr 13 01:04:11 2010 (r206539)
+++ head/sys/dev/aac/aac_pci.c Tue Apr 13 01:16:15 2010 (r206540)
@@ -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,
Modified: head/sys/dev/aac/aac_tables.h
==============================================================================
--- head/sys/dev/aac/aac_tables.h Tue Apr 13 01:04:11 2010
(r206539)
+++ head/sys/dev/aac/aac_tables.h Tue Apr 13 01:16:15 2010
(r206540)
@@ -57,6 +57,7 @@ static struct aac_code_lookup aac_comman
{"quota exceeded", 69},
{"stale file handle", 70},
{"too many levels of remote in path", 71},
+ {"device busy (spinning up)", 72},
{"bad file handle", 10001},
{"not sync", 10002},
{"bad cookie", 10003},
@@ -68,6 +69,7 @@ static struct aac_code_lookup aac_comman
{"not mounted", 10009},
{"in maintenance mode", 10010},
{"stale ACL", 10011},
+ {"bus reset - command aborted", 20001},
{NULL, 0},
{"unknown command status", 0}
};
Modified: head/sys/dev/aac/aacreg.h
==============================================================================
--- head/sys/dev/aac/aacreg.h Tue Apr 13 01:04:11 2010 (r206539)
+++ head/sys/dev/aac/aacreg.h Tue Apr 13 01:16:15 2010 (r206540)
@@ -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 */
@@ -1081,6 +1081,7 @@ typedef enum {
ST_DQUOT = 69,
ST_STALE = 70,
ST_REMOTE = 71,
+ ST_NOT_READY = 72,
ST_BADHANDLE = 10001,
ST_NOT_SYNC = 10002,
ST_BAD_COOKIE = 10003,
@@ -1091,7 +1092,8 @@ typedef enum {
ST_JUKEBOX = 10008,
ST_NOTMOUNTED = 10009,
ST_MAINTMODE = 10010,
- ST_STALEACL = 10011
+ ST_STALEACL = 10011,
+ ST_BUS_RESET = 20001
} AAC_FSAStatus;
/*
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
