mirror of
https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git
synced 2025-01-24 01:57:06 +01:00
if_sk.c: use pci_port_t instead of u_short
if_skreg.h: use alpha_XXX_dmamap() instead of pmap_kextract hackery on alpha platform
This commit is contained in:
parent
29a751bf4e
commit
05919c5b73
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=48712
@ -29,7 +29,7 @@
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
|
||||
* THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $Id: if_sk.c,v 1.48 1999/07/06 21:37:42 wpaul Exp $
|
||||
* $Id: if_sk.c,v 1.1 1999/07/09 04:29:50 wpaul Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -99,7 +99,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] =
|
||||
"$Id: if_sk.c,v 1.48 1999/07/06 21:37:42 wpaul Exp $";
|
||||
"$Id: if_sk.c,v 1.1 1999/07/09 04:29:50 wpaul Exp $";
|
||||
#endif
|
||||
|
||||
static struct sk_type sk_devs[] = {
|
||||
@ -1195,7 +1195,7 @@ sk_attach(config_id, unit)
|
||||
}
|
||||
|
||||
if (!pci_map_port(config_id, SK_PCI_LOIO,
|
||||
(u_short *)&(sc->sk_bhandle))) {
|
||||
(pci_port_t *)&(sc->sk_bhandle))) {
|
||||
printf ("skc%d: couldn't map ports\n", unit);
|
||||
goto fail;
|
||||
}
|
||||
|
@ -29,7 +29,7 @@
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
|
||||
* THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $Id: if_skreg.h,v 1.32 1999/07/06 22:07:40 wpaul Exp $
|
||||
* $Id: if_skreg.h,v 1.1 1999/07/09 04:29:51 wpaul Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -1167,6 +1167,5 @@ struct sk_if_softc {
|
||||
|
||||
#ifdef __alpha__
|
||||
#undef vtophys
|
||||
#define vtophys(va) (pmap_kextract(((vm_offset_t) (va))) \
|
||||
+ 1*1024*1024*1024)
|
||||
#define vtophys(va) alpha_XXX_dmamap((vm_offset_t)va)
|
||||
#endif
|
||||
|
@ -29,7 +29,7 @@
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
|
||||
* THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $Id: if_sk.c,v 1.48 1999/07/06 21:37:42 wpaul Exp $
|
||||
* $Id: if_sk.c,v 1.1 1999/07/09 04:29:50 wpaul Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -99,7 +99,7 @@
|
||||
|
||||
#ifndef lint
|
||||
static const char rcsid[] =
|
||||
"$Id: if_sk.c,v 1.48 1999/07/06 21:37:42 wpaul Exp $";
|
||||
"$Id: if_sk.c,v 1.1 1999/07/09 04:29:50 wpaul Exp $";
|
||||
#endif
|
||||
|
||||
static struct sk_type sk_devs[] = {
|
||||
@ -1195,7 +1195,7 @@ sk_attach(config_id, unit)
|
||||
}
|
||||
|
||||
if (!pci_map_port(config_id, SK_PCI_LOIO,
|
||||
(u_short *)&(sc->sk_bhandle))) {
|
||||
(pci_port_t *)&(sc->sk_bhandle))) {
|
||||
printf ("skc%d: couldn't map ports\n", unit);
|
||||
goto fail;
|
||||
}
|
||||
|
@ -29,7 +29,7 @@
|
||||
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
|
||||
* THE POSSIBILITY OF SUCH DAMAGE.
|
||||
*
|
||||
* $Id: if_skreg.h,v 1.32 1999/07/06 22:07:40 wpaul Exp $
|
||||
* $Id: if_skreg.h,v 1.1 1999/07/09 04:29:51 wpaul Exp $
|
||||
*/
|
||||
|
||||
/*
|
||||
@ -1167,6 +1167,5 @@ struct sk_if_softc {
|
||||
|
||||
#ifdef __alpha__
|
||||
#undef vtophys
|
||||
#define vtophys(va) (pmap_kextract(((vm_offset_t) (va))) \
|
||||
+ 1*1024*1024*1024)
|
||||
#define vtophys(va) alpha_XXX_dmamap((vm_offset_t)va)
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user