diff options
| author | Vinod Kashyap <vkashyap@FreeBSD.org> | 2004-05-12 03:37:43 +0000 |
|---|---|---|
| committer | Vinod Kashyap <vkashyap@FreeBSD.org> | 2004-05-12 03:37:43 +0000 |
| commit | de44083139135062b3a1ba9abeee6093c2b0beda (patch) | |
| tree | 9ab66dde7ef1e238d4a0a5087f8f290df75e3e56 | |
| parent | c08e85f83e50d203828deec691b3c81eb72a91ed (diff) | |
Notes
| -rw-r--r-- | sys/dev/twe/twe.c | 16 | ||||
| -rw-r--r-- | sys/dev/twe/twereg.h | 2 | ||||
| -rw-r--r-- | sys/dev/twe/twevar.h | 6 |
3 files changed, 10 insertions, 14 deletions
diff --git a/sys/dev/twe/twe.c b/sys/dev/twe/twe.c index 671cbc3651e7..6a4a9b1e713f 100644 --- a/sys/dev/twe/twe.c +++ b/sys/dev/twe/twe.c @@ -393,14 +393,14 @@ twe_startio(struct twe_softc *sc) /* build a command from an outstanding bio */ if (tr == NULL) { - - /* see if there's work to be done */ - if ((bp = twe_dequeue_bio(sc)) == NULL) - break; /* get a command to handle the bio with */ - if (twe_get_request(sc, &tr)) { - twe_enqueue_bio(sc, bp); /* failed, put the bio back */ + if (twe_get_request(sc, &tr)) + break; + + /* see if there's work to be done */ + if ((bp = twe_dequeue_bio(sc)) == NULL) { + twe_release_request(tr); break; } @@ -1053,10 +1053,10 @@ twe_start(struct twe_request *tr) twe_check_bits(sc, status_reg); if (!(status_reg & TWE_STATUS_COMMAND_QUEUE_FULL)) { - TWE_COMMAND_QUEUE(sc, tr->tr_cmdphys); - done = 1; /* move command to work queue */ twe_enqueue_busy(tr); + TWE_COMMAND_QUEUE(sc, tr->tr_cmdphys); + done = 1; #ifdef TWE_DEBUG if (tr->tr_complete != NULL) { debug(3, "queued request %d with callback %p", tr->tr_command.generic.request_id, tr->tr_complete); diff --git a/sys/dev/twe/twereg.h b/sys/dev/twe/twereg.h index 5d08a1b94479..7b95a9354801 100644 --- a/sys/dev/twe/twereg.h +++ b/sys/dev/twe/twereg.h @@ -100,7 +100,7 @@ /* PCI related defines */ #define TWE_IO_CONFIG_REG 0x10 -#define TWE_DEVICE_NAME "3ware 7000 series Storage Controller" +#define TWE_DEVICE_NAME "3ware Storage Controller" #define TWE_VENDOR_ID 0x13C1 #define TWE_DEVICE_ID 0x1000 #define TWE_DEVICE_ID_ASIC 0x1001 diff --git a/sys/dev/twe/twevar.h b/sys/dev/twe/twevar.h index 89a5be92b2c1..6cb08126d11e 100644 --- a/sys/dev/twe/twevar.h +++ b/sys/dev/twe/twevar.h @@ -29,11 +29,7 @@ * $FreeBSD$ */ -/* - * The scheme for the driver version is: - * <major change>.<external release>.<3ware internal release>.<development release> - */ -#define TWE_DRIVER_VERSION_STRING "1.40.01.000" +#define TWE_DRIVER_VERSION_STRING "1.40.01.001" #define TWE_CDEV_MAJOR 146 #define TWED_CDEV_MAJOR 147 |