Permalink
Browse files

Sync with head.

  • Loading branch information...
1 parent 1626877 commit 700fe7606eaa20d3e703e24616265b81db983059 kardel committed Jun 7, 2006
Showing with 1,341 additions and 1,043 deletions.
  1. +2 −2 sys/conf/files
  2. +4 −4 sys/dev/cardbus/if_ath_cardbus.c
  3. +4 −3 sys/dev/ic/elink3.c
  4. +23 −963 sys/dev/pci/azalia.c
  5. +10 −2 sys/dev/pci/azalia.h
  6. +1,295 −66 sys/dev/pci/azalia_codec.c
  7. +3 −3 sys/dev/pci/yds.c
View
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.757.2.5 2006/06/07 15:49:38 kardel Exp $
+# $NetBSD: files,v 1.757.2.6 2006/06/07 16:05:41 kardel Exp $
# @(#)files.newconf 7.5 (Berkeley) 5/10/93
@@ -536,7 +536,7 @@ file dev/ic/rtw.c rtw
file dev/ic/rtwphy.c rtw
file dev/ic/rtwphyio.c rtw
-# Ralink RT2500 802.11
+# Ralink RT2500/RT2600 802.11
device ral: arp, ether, ifnet, wlan, firmload
file dev/ic/rt2560.c ral
file dev/ic/rt2661.c ral
@@ -1,4 +1,4 @@
-/* $NetBSD: if_ath_cardbus.c,v 1.8.6.2 2006/06/07 15:51:08 kardel Exp $ */
+/* $NetBSD: if_ath_cardbus.c,v 1.8.6.3 2006/06/07 16:05:41 kardel Exp $ */
/*
* Copyright (c) 2003
* Ichiro FUKUHARA <ichiro@ichiro.org>.
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_ath_cardbus.c,v 1.8.6.2 2006/06/07 15:51:08 kardel Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_ath_cardbus.c,v 1.8.6.3 2006/06/07 16:05:41 kardel Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
@@ -235,8 +235,8 @@ ath_cardbus_detach(struct device *self, int flags)
/*
* Release bus space and close window.
*/
- Cardbus_mapreg_unmap(ct, ATH_PCI_MMBA, (bus_space_tag_t) sc->sc_st,
- (bus_space_handle_t)sc->sc_sh, csc->sc_mapsize);
+ Cardbus_mapreg_unmap(ct, ATH_PCI_MMBA, csc->sc_iot, csc->sc_ioh,
+ csc->sc_mapsize);
return (0);
}
View
@@ -1,4 +1,4 @@
-/* $NetBSD: elink3.c,v 1.114.6.1 2006/04/22 11:38:55 simonb Exp $ */
+/* $NetBSD: elink3.c,v 1.114.6.2 2006/06/07 16:05:41 kardel Exp $ */
/*-
* Copyright (c) 1998, 2001 The NetBSD Foundation, Inc.
@@ -69,7 +69,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: elink3.c,v 1.114.6.1 2006/04/22 11:38:55 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: elink3.c,v 1.114.6.2 2006/06/07 16:05:41 kardel Exp $");
#include "opt_inet.h"
#include "opt_ns.h"
@@ -799,7 +799,8 @@ epinit(ifp)
GO_WINDOW(1); /* Window 1 is operating window */
for (i = 0; i < 31; i++)
- bus_space_read_2(iot, ioh, ep_w1_reg(sc, ELINK_W1_TX_STATUS));
+ (void)bus_space_read_2(iot, ioh,
+ ep_w1_reg(sc, ELINK_W1_TX_STATUS));
/* Set threshold for Tx-space available interrupt. */
bus_space_write_2(iot, ioh, ELINK_COMMAND,
Oops, something went wrong.

0 comments on commit 700fe76

Please sign in to comment.