From owner-svn-src-head@FreeBSD.ORG Fri Nov 29 07:08:18 2013 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 865194B3; Fri, 29 Nov 2013 07:08:18 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 6733C1230; Fri, 29 Nov 2013 07:08:18 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAT78IXo019514; Fri, 29 Nov 2013 07:08:18 GMT (envelope-from kevlo@svn.freebsd.org) Received: (from kevlo@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAT78Hhq019511; Fri, 29 Nov 2013 07:08:17 GMT (envelope-from kevlo@svn.freebsd.org) Message-Id: <201311290708.rAT78Hhq019511@svn.freebsd.org> From: Kevin Lo Date: Fri, 29 Nov 2013 07:08:17 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r258733 - head/sys/dev/usb/wlan X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 29 Nov 2013 07:08:18 -0000 Author: kevlo Date: Fri Nov 29 07:08:17 2013 New Revision: 258733 URL: http://svnweb.freebsd.org/changeset/base/258733 Log: Change run_rt2870_rf_write() prototype (no functional change) Modified: head/sys/dev/usb/wlan/if_run.c head/sys/dev/usb/wlan/if_runreg.h Modified: head/sys/dev/usb/wlan/if_run.c ============================================================================== --- head/sys/dev/usb/wlan/if_run.c Fri Nov 29 06:10:44 2013 (r258732) +++ head/sys/dev/usb/wlan/if_run.c Fri Nov 29 07:08:17 2013 (r258733) @@ -344,7 +344,7 @@ static int run_write_region_1(struct run static int run_set_region_4(struct run_softc *, uint16_t, uint32_t, int); static int run_efuse_read_2(struct run_softc *, uint16_t, uint16_t *); static int run_eeprom_read_2(struct run_softc *, uint16_t, uint16_t *); -static int run_rt2870_rf_write(struct run_softc *, uint8_t, uint32_t); +static int run_rt2870_rf_write(struct run_softc *, uint32_t); static int run_rt3070_rf_read(struct run_softc *, uint8_t, uint8_t *); static int run_rt3070_rf_write(struct run_softc *, uint8_t, uint8_t); static int run_bbp_read(struct run_softc *, uint8_t, uint8_t *); @@ -1279,7 +1279,7 @@ run_srom_read(struct run_softc *sc, uint } static int -run_rt2870_rf_write(struct run_softc *sc, uint8_t reg, uint32_t val) +run_rt2870_rf_write(struct run_softc *sc, uint32_t val) { uint32_t tmp; int error, ntries; @@ -3684,24 +3684,24 @@ run_rt2870_set_chan(struct run_softc *sc r4 |= (txpow2 << 6); } - run_rt2870_rf_write(sc, RT2860_RF1, rfprog[i].r1); - run_rt2870_rf_write(sc, RT2860_RF2, r2); - run_rt2870_rf_write(sc, RT2860_RF3, r3 & ~(1 << 2)); - run_rt2870_rf_write(sc, RT2860_RF4, r4); + run_rt2870_rf_write(sc, rfprog[i].r1); + run_rt2870_rf_write(sc, r2); + run_rt2870_rf_write(sc, r3 & ~(1 << 2)); + run_rt2870_rf_write(sc, r4); run_delay(sc, 10); - run_rt2870_rf_write(sc, RT2860_RF1, rfprog[i].r1); - run_rt2870_rf_write(sc, RT2860_RF2, r2); - run_rt2870_rf_write(sc, RT2860_RF3, r3 | (1 << 2)); - run_rt2870_rf_write(sc, RT2860_RF4, r4); + run_rt2870_rf_write(sc, rfprog[i].r1); + run_rt2870_rf_write(sc, r2); + run_rt2870_rf_write(sc, r3 | (1 << 2)); + run_rt2870_rf_write(sc, r4); run_delay(sc, 10); - run_rt2870_rf_write(sc, RT2860_RF1, rfprog[i].r1); - run_rt2870_rf_write(sc, RT2860_RF2, r2); - run_rt2870_rf_write(sc, RT2860_RF3, r3 & ~(1 << 2)); - run_rt2870_rf_write(sc, RT2860_RF4, r4); + run_rt2870_rf_write(sc, rfprog[i].r1); + run_rt2870_rf_write(sc, r2); + run_rt2870_rf_write(sc, r3 & ~(1 << 2)); + run_rt2870_rf_write(sc, r4); } static void Modified: head/sys/dev/usb/wlan/if_runreg.h ============================================================================== --- head/sys/dev/usb/wlan/if_runreg.h Fri Nov 29 06:10:44 2013 (r258732) +++ head/sys/dev/usb/wlan/if_runreg.h Fri Nov 29 07:08:17 2013 (r258733) @@ -844,11 +844,6 @@ struct rt2860_rxwi { sizeof (struct ieee80211_htframe) + \ sizeof (uint16_t)) -#define RT2860_RF1 0 -#define RT2860_RF2 2 -#define RT2860_RF3 1 -#define RT2860_RF4 3 - #define RT2860_RF_2820 0x0001 /* 2T3R */ #define RT2860_RF_2850 0x0002 /* dual-band 2T3R */ #define RT2860_RF_2720 0x0003 /* 1T2R */