Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make iwi_alloc_tx_ring() prototype match function declaration (shows up when 

bus_addr_t != bus_size_t). Fix cast for 64bit paddr_t on i386.
This commit is contained in:
bouyer 2009-02-13 21:11:47 +00:00
parent a5e21717ca
commit b48bdec72e
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/pci/if_iwi.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: if_iwi.c,v 1.78 2009/01/09 21:14:36 jmcneill Exp $ */
/* $NetBSD: if_iwi.c,v 1.79 2009/02/13 21:11:47 bouyer Exp $ */
/*-
* Copyright (c) 2004, 2005
@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: if_iwi.c,v 1.78 2009/01/09 21:14:36 jmcneill Exp $");
__KERNEL_RCSID(0, "$NetBSD: if_iwi.c,v 1.79 2009/02/13 21:11:47 bouyer Exp $");
/*-
* Intel(R) PRO/Wireless 2200BG/2225BG/2915ABG driver
@ -102,7 +102,7 @@ static int iwi_alloc_cmd_ring(struct iwi_softc *, struct iwi_cmd_ring *,
static void iwi_reset_cmd_ring(struct iwi_softc *, struct iwi_cmd_ring *);
static void iwi_free_cmd_ring(struct iwi_softc *, struct iwi_cmd_ring *);
static int iwi_alloc_tx_ring(struct iwi_softc *, struct iwi_tx_ring *,
int, bus_addr_t, bus_size_t);
int, bus_size_t, bus_size_t);
static void iwi_reset_tx_ring(struct iwi_softc *, struct iwi_tx_ring *);
static void iwi_free_tx_ring(struct iwi_softc *, struct iwi_tx_ring *);
static struct mbuf *
@ -2020,7 +2020,7 @@ iwi_load_firmware(struct iwi_softc *sc, void *fw, int size)
int ntries, nsegs, error;
int sn;
nsegs = atop((char*)fw+size-1) - atop((char *)fw) + 1;
nsegs = atop((vaddr_t)fw+size-1) - atop((vaddr_t)fw) + 1;
/* Create a DMA map for the firmware image */
error = bus_dmamap_create(sc->sc_dmat, size, nsegs, size, 0,