From owner-svn-src-head@freebsd.org Fri Feb 17 06:49:55 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E922CCE1FF9; Fri, 17 Feb 2017 06:49:55 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id A05EB1A11; Fri, 17 Feb 2017 06:49:55 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1H6nsO9060982; Fri, 17 Feb 2017 06:49:54 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1H6ns0k060978; Fri, 17 Feb 2017 06:49:54 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201702170649.v1H6ns0k060978@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Fri, 17 Feb 2017 06:49:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r313861 - in head: share/man/man4 sys/dev/aha X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Feb 2017 06:49:56 -0000 Author: imp Date: Fri Feb 17 06:49:54 2017 New Revision: 313861 URL: https://svnweb.freebsd.org/changeset/base/313861 Log: Remove ahb references as well as 1640 info in aha.4 Modified: head/share/man/man4/aha.4 head/sys/dev/aha/aha.c head/sys/dev/aha/ahareg.h Modified: head/share/man/man4/aha.4 ============================================================================== --- head/share/man/man4/aha.4 Fri Feb 17 06:49:46 2017 (r313860) +++ head/share/man/man4/aha.4 Fri Feb 17 06:49:54 2017 (r313861) @@ -54,14 +54,9 @@ In .Sh DESCRIPTION This driver provides access to the .Tn SCSI -bus connected to the Adaptec AHA-154x and AHA-1640 SCSI host adapters. +bus connected to the Adaptec AHA-154x SCSI host adapters. x is 0 for controllers without a floppy drive and 2 for controllers that have them. -For optimum -performance, Adaptec AHA-174x controllers should be configured in -enhanced mode and attached via the -.Xr ahb 4 -driver. .Pp One device hint entry for every card to be attached by the system is required. @@ -89,16 +84,11 @@ Adaptec AHA-154xCF .It Adaptec AHA-154xCP .It -Adaptec AHA-1640 -.It -Adaptec AHA-174x in 154x emulation mode -.It DTC 3290 SCSI controller in 1542 emulation mode .It Tekram SCSI controllers in 154x emulation mode .El .Sh SEE ALSO -.Xr ahb 4 , .Xr ahc 4 , .Xr aic 4 , .Xr cd 4 , Modified: head/sys/dev/aha/aha.c ============================================================================== --- head/sys/dev/aha/aha.c Fri Feb 17 06:49:46 2017 (r313860) +++ head/sys/dev/aha/aha.c Fri Feb 17 06:49:54 2017 (r313861) @@ -338,9 +338,6 @@ aha_fetch_adapter_info(struct aha_softc case BOARD_1542: snprintf(aha->model, sizeof(aha->model), "1540/1542 64 head BIOS"); break; - case BOARD_1740: - snprintf(aha->model, sizeof(aha->model), "1740A/1742A/1744"); - break; case BOARD_1542C: snprintf(aha->model, sizeof(aha->model), "1542C"); break; Modified: head/sys/dev/aha/ahareg.h ============================================================================== --- head/sys/dev/aha/ahareg.h Fri Feb 17 06:49:46 2017 (r313860) +++ head/sys/dev/aha/ahareg.h Fri Feb 17 06:49:54 2017 (r313861) @@ -157,7 +157,6 @@ typedef struct { #define BOARD_1540_16HEAD_BIOS 0x00 #define BOARD_1540_64HEAD_BIOS 0x30 #define BOARD_1542 0x41 /* aha-1540/1542 w/64-h bios */ -#define BOARD_1740 0x43 /* aha-1740A/1742A/1744 */ #define BOARD_1542C 0x44 /* aha-1542C */ #define BOARD_1542CF 0x45 /* aha-1542CF */ #define BOARD_1542CP 0x46 /* aha-1542CP, plug and play */