From owner-cvs-all@FreeBSD.ORG  Sun May  8 23:07:51 2005
Return-Path: <owner-cvs-all@FreeBSD.ORG>
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 9147316A4E6; Sun,  8 May 2005 23:07:51 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 7BF6843D49; Sun,  8 May 2005 23:07:51 +0000 (GMT)
	(envelope-from wpaul@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j48N7pFK007227;
	Sun, 8 May 2005 23:07:51 GMT
	(envelope-from wpaul@repoman.freebsd.org)
Received: (from wpaul@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j48N7pXs007226;
	Sun, 8 May 2005 23:07:51 GMT
	(envelope-from wpaul)
Message-Id: <200505082307.j48N7pXs007226@repoman.freebsd.org>
From: Bill Paul <wpaul@FreeBSD.org>
Date: Sun, 8 May 2005 23:07:51 +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_windrv.c subr_hal.c
 src/sys/dev/if_ndis if_ndis_pccard.c src/usr.sbin/ndiscvt
 windrv_stub.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 08 May 2005 23:07:51 -0000

wpaul       2005-05-08 23:07:51 UTC

  FreeBSD src repository

  Modified files:
    sys/compat/ndis      kern_windrv.c subr_hal.c 
    sys/dev/if_ndis      if_ndis_pccard.c 
    usr.sbin/ndiscvt     windrv_stub.c 
  Log:
  Fix support for Windows drivers that support both PCI and PCMCIA devices at
  the same time.
  
  Fix if_ndis_pccard.c so that it sets sc->ndis_dobj and sc->ndis_regvals.
  
  Correct IMPORT_SFUNC() macros for the READ_PORT_BUFFER_xxx() routines,
  which take 3 arguments, not 2.
  
  This fixes it so that the Windows driver for my Cisco Aironet 340 PCMCIA
  card works again. (Yes, I know the an(4) driver supports this card natively,
  but it's the only PCMCIA device I have with a Windows XP driver.)
  
  Revision  Changes    Path
  1.9       +11 -0     src/sys/compat/ndis/kern_windrv.c
  1.23      +3 -3      src/sys/compat/ndis/subr_hal.c
  1.12      +2 -1      src/sys/dev/if_ndis/if_ndis_pccard.c
  1.2       +15 -13    src/usr.sbin/ndiscvt/windrv_stub.c