diff options
| author | rgrimes <rgrimes@FreeBSD.org> | 1995-06-11 19:33:05 +0000 |
|---|---|---|
| committer | rgrimes <rgrimes@FreeBSD.org> | 1995-06-11 19:33:05 +0000 |
| commit | 1b1ee5553889e207087539ddafa5dfd4e28bd585 (patch) | |
| tree | ba998dfb4fcad03e00a5cbf58e2a0ad648bab6e6 /sys/pci | |
| parent | b1a97daa1e06ab0de3071f979965878fd056292b (diff) | |
| download | FreeBSD-src-1b1ee5553889e207087539ddafa5dfd4e28bd585.zip FreeBSD-src-1b1ee5553889e207087539ddafa5dfd4e28bd585.tar.gz | |
Merge RELENG_2_0_5 into HEAD
Diffstat (limited to 'sys/pci')
| -rw-r--r-- | sys/pci/aic7870.c | 11 | ||||
| -rw-r--r-- | sys/pci/if_de.c | 4 |
2 files changed, 11 insertions, 4 deletions
diff --git a/sys/pci/aic7870.c b/sys/pci/aic7870.c index 6028455..e0e4733 100644 --- a/sys/pci/aic7870.c +++ b/sys/pci/aic7870.c @@ -1,6 +1,6 @@ /* * Product specific probe and attach routines for: - * 294X and aic7870 motherboard SCSI controllers + * 2940, aic7870, and aic7850 motherboard SCSI controllers * * Copyright (c) 1995 Justin T. Gibbs * All rights reserved. @@ -19,7 +19,7 @@ * 4. Modifications may be freely made to this file if the above conditions * are met. * - * $Id: aic7870.c,v 1.9 1995/04/15 21:38:34 gibbs Exp $ + * $Id: aic7870.c,v 1.10.2.2 1995/06/09 18:06:53 davidg Exp $ */ #include <pci.h> @@ -37,6 +37,7 @@ #define PCI_BASEADR0 PCI_MAP_REG_START #define PCI_DEVICE_ID_ADAPTEC_2940 0x71789004ul #define PCI_DEVICE_ID_ADAPTEC_AIC7870 0x70789004ul +#define PCI_DEVICE_ID_ADAPTEC_AIC7850 0x70759004ul static char* aic7870_probe __P((pcici_t tag, pcidi_t type)); void aic7870_attach __P((pcici_t config_id, int unit)); @@ -63,6 +64,9 @@ aic7870_probe (pcici_t tag, pcidi_t type) case PCI_DEVICE_ID_ADAPTEC_AIC7870: return ("Adaptec aic7870 SCSI host adapter"); break; + case PCI_DEVICE_ID_ADAPTEC_AIC7850: + return ("Adaptec aic7850 SCSI host adapter"); + break; default: break; } @@ -95,6 +99,9 @@ aic7870_attach(config_id, unit) case PCI_DEVICE_ID_ADAPTEC_AIC7870: ahc_t = AHC_AIC7870; break; + case PCI_DEVICE_ID_ADAPTEC_AIC7850: + ahc_t = AHC_AIC7850; + break; default: break; } diff --git a/sys/pci/if_de.c b/sys/pci/if_de.c index 7a0eee7..756bef0 100644 --- a/sys/pci/if_de.c +++ b/sys/pci/if_de.c @@ -21,7 +21,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $Id: if_de.c,v 1.27 1995/05/26 02:02:44 davidg Exp $ + * $Id: if_de.c,v 1.28.2.1 1995/06/02 10:44:24 davidg Exp $ * */ @@ -916,7 +916,7 @@ tulip_start( addr += slen; clsize = CLBYTES; } - } while ((m0 = m0->m_next) != NULL); + } while ((m0 != NULL) && ((m0 = m0->m_next) != NULL)); /* * The packet exceeds the number of transmit buffer |
