From owner-svn-src-head@freebsd.org Wed Jun 13 20:24:50 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 47CF610111EE; Wed, 13 Jun 2018 20:24:50 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id F103178A4C; Wed, 13 Jun 2018 20:24:49 +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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D2AD81E5E4; Wed, 13 Jun 2018 20:24:49 +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 w5DKOn8n049912; Wed, 13 Jun 2018 20:24:49 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5DKOn3j049911; Wed, 13 Jun 2018 20:24:49 GMT (envelope-from imp@FreeBSD.org) Message-Id: <201806132024.w5DKOn3j049911@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Wed, 13 Jun 2018 20:24:49 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r335077 - head/sys/dev/ncr X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: head/sys/dev/ncr X-SVN-Commit-Revision: 335077 X-SVN-Commit-Repository: base 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.26 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: Wed, 13 Jun 2018 20:24:50 -0000 Author: imp Date: Wed Jun 13 20:24:49 2018 New Revision: 335077 URL: https://svnweb.freebsd.org/changeset/base/335077 Log: Add PNP info to the PCI attachment of the ncr driver. Reviewed by: imp, chuck Submitted by: Lakhan Shiva Kamireddy Sponsored by: Google, Inc. (GSoC 2018) Modified: head/sys/dev/ncr/ncr.c Modified: head/sys/dev/ncr/ncr.c ============================================================================== --- head/sys/dev/ncr/ncr.c Wed Jun 13 19:57:03 2018 (r335076) +++ head/sys/dev/ncr/ncr.c Wed Jun 13 20:24:49 2018 (r335077) @@ -3169,8 +3169,8 @@ u_int32_t ncr_info (int unit) **---------------------------------------------------------- */ typedef struct { - unsigned long device_id; - unsigned short minrevid; + uint32_t device_id; + uint16_t minrevid; char *name; unsigned char maxburst; unsigned char maxoffs; @@ -3225,7 +3225,7 @@ static ncr_chip ncr_chip_table[] = { FE_WIDE|FE_ULTRA2|FE_QUAD|FE_CACHE_SET|FE_DFS|FE_LDSTR|FE_PFEN|FE_RAM} }; -static int ncr_chip_lookup(u_long device_id, u_char revision_id) +static int ncr_chip_lookup(uint32_t device_id, u_char revision_id) { int i, found; @@ -7108,6 +7108,8 @@ static driver_t ncr_driver = { static devclass_t ncr_devclass; DRIVER_MODULE(ncr, pci, ncr_driver, ncr_devclass, 0, 0); +MODULE_PNP_INFO("W32:vendor/device;U16:#;D:#", pci, ncr, ncr_chip_table, + sizeof(ncr_chip_table[0]), nitems(ncr_chip_table)); MODULE_DEPEND(ncr, cam, 1, 1, 1); MODULE_DEPEND(ncr, pci, 1, 1, 1);