From owner-cvs-all@FreeBSD.ORG Mon Aug 16 18:50:20 2004 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E64F716A4CE; Mon, 16 Aug 2004 18:50:20 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id DC8F143D45; Mon, 16 Aug 2004 18:50:20 +0000 (GMT) (envelope-from wpaul@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i7GIoK9S020521; Mon, 16 Aug 2004 18:50:20 GMT (envelope-from wpaul@repoman.freebsd.org) Received: (from wpaul@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i7GIoK6c020520; Mon, 16 Aug 2004 18:50:20 GMT (envelope-from wpaul) Message-Id: <200408161850.i7GIoK6c020520@repoman.freebsd.org> From: Bill Paul Date: Mon, 16 Aug 2004 18:50:20 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/sys/compat/ndis kern_ndis.c ndis_var.h subr_ndis.c src/sys/dev/if_ndis if_ndis_pci.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 16 Aug 2004 18:50:21 -0000 wpaul 2004-08-16 18:50:20 UTC FreeBSD src repository Modified files: sys/compat/ndis kern_ndis.c ndis_var.h subr_ndis.c sys/dev/if_ndis if_ndis_pci.c Log: Make the Texas Instruments 802.11g chipset work with the NDISulator. This was tested with a Netgear WG311v2 802.11b/g PCI card. Things that were fixed: - This chip has two memory mapped regions, one at PCIR_BAR(0) and the other at PCIR_BAR(1). This is a little different from the other chips I've seen with two PCI shared memory regions, since they tend to have the second BAR ad PCIR_BAR(2). if_ndis_pci.c tests explicitly for PCIR_BAR(2). This has been changed to simply fill in ndis_res_mem first and ndis_res_altmem second, if a second shared memory range exists. Given that NDIS drivers seem to scan for BARs in ascending order, I think this should be ok. - Fixed the code that tries to process firmware images that have been loaded as .ko files. To save a step, I was setting up the address mapping in ndis_open_file(), but ndis_map_file() flags pre-existing mappings as an error (to avoid duplicate mappings). Changed this so that the mapping is now donw in ndis_map_file() as expected. - Made the typedef for 'driver_entry' explicitly include __stdcall to silence gcc warning in ndis_load_driver(). NOTE: the Texas Instruments ACX111 driver needs firmware. With my card, there were 3 .bin files shipped with the driver. You must either put these files in /compat/ndis or convert them with ndiscvt -f and kldload them so the driver can use them. Without the firmware image, the NIC won't work. Revision Changes Path 1.60 +1 -1 src/sys/compat/ndis/kern_ndis.c 1.29 +1 -1 src/sys/compat/ndis/ndis_var.h 1.66 +17 -2 src/sys/compat/ndis/subr_ndis.c 1.8 +1 -1 src/sys/dev/if_ndis/if_ndis_pci.c