From owner-p4-projects@FreeBSD.ORG Fri Jan 4 21:34:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 673B516A46B; Fri, 4 Jan 2008 21:34:23 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2CA7A16A421 for ; Fri, 4 Jan 2008 21:34:23 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1A74913C465 for ; Fri, 4 Jan 2008 21:34:23 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m04LYMgO064424 for ; Fri, 4 Jan 2008 21:34:22 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m04LYM8f064421 for perforce@freebsd.org; Fri, 4 Jan 2008 21:34:22 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 4 Jan 2008 21:34:22 GMT Message-Id: <200801042134.m04LYM8f064421@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 132525 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jan 2008 21:34:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=132525 Change 132525 by hselasky@hselasky_laptop001 on 2008/01/04 21:33:25 Style changes. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/if_ural.c#50 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/if_ural.c#50 (text+ko) ==== @@ -122,111 +122,44 @@ static usbd_config_td_command_t ural_cfg_stop; static usbd_config_td_command_t ural_cfg_amrr_timeout; -static void -ural_cfg_do_request(struct ural_softc *sc, usb_device_request_t *req, - void *data); -static void - ural_cfg_set_testmode(struct ural_softc *sc); - -static void -ural_cfg_eeprom_read(struct ural_softc *sc, uint16_t addr, - void *buf, uint16_t len); -static uint16_t - ural_cfg_read(struct ural_softc *sc, uint16_t reg); - -static void -ural_cfg_read_multi(struct ural_softc *sc, uint16_t reg, - void *buf, uint16_t len); -static void - ural_cfg_write(struct ural_softc *sc, uint16_t reg, uint16_t val); - -static void -ural_cfg_write_multi(struct ural_softc *sc, uint16_t reg, - void *buf, uint16_t len); -static void - ural_cfg_bbp_write(struct ural_softc *sc, uint8_t reg, uint8_t val); - -static uint8_t - ural_cfg_bbp_read(struct ural_softc *sc, uint8_t reg); - -static void - ural_cfg_rf_write(struct ural_softc *sc, uint8_t reg, uint32_t val); - -static void - ural_end_of_commands(struct ural_softc *sc); - -static const char * - ural_get_rf(int rev); - -static int - ural_rxrate(struct ural_rx_desc *desc); - -static uint16_t - ural_ack_rate(struct ieee80211com *ic, uint16_t rate); - -static uint16_t -ural_txtime(struct ural_softc *sc, uint16_t len, uint16_t rate, - uint32_t flags); - -static uint8_t - ural_plcp_signal(uint16_t rate); - -static void -ural_setup_tx_desc(struct ural_softc *sc, uint32_t flags, uint16_t len, - uint16_t rate); -static void - ural_watchdog(void *arg); - -static void - ural_init_cb(void *arg); - -static int - ural_ioctl_cb(struct ifnet *ifp, u_long cmd, caddr_t data); - -static void - ural_start_cb(struct ifnet *ifp); - -static int - ural_media_change_cb(struct ifnet *ifp); - -static int - ural_reset_cb(struct ifnet *ifp); - -static int - ural_newstate_cb(struct ieee80211com *ic, enum ieee80211_state nstate, int arg); - +static void ural_cfg_do_request(struct ural_softc *sc, usb_device_request_t *req, void *data); +static void ural_cfg_set_testmode(struct ural_softc *sc); +static void ural_cfg_eeprom_read(struct ural_softc *sc, uint16_t addr, void *buf, uint16_t len); +static uint16_t ural_cfg_read(struct ural_softc *sc, uint16_t reg); +static void ural_cfg_read_multi(struct ural_softc *sc, uint16_t reg, void *buf, uint16_t len); +static void ural_cfg_write(struct ural_softc *sc, uint16_t reg, uint16_t val); +static void ural_cfg_write_multi(struct ural_softc *sc, uint16_t reg, void *buf, uint16_t len); +static void ural_cfg_bbp_write(struct ural_softc *sc, uint8_t reg, uint8_t val); +static uint8_t ural_cfg_bbp_read(struct ural_softc *sc, uint8_t reg); +static void ural_cfg_rf_write(struct ural_softc *sc, uint8_t reg, uint32_t val); +static void ural_end_of_commands(struct ural_softc *sc); +static const char *ural_get_rf(int rev); +static int ural_rxrate(struct ural_rx_desc *desc); +static uint16_t ural_ack_rate(struct ieee80211com *ic, uint16_t rate); +static uint16_t ural_txtime(struct ural_softc *sc, uint16_t len, uint16_t rate, uint32_t flags); +static uint8_t ural_plcp_signal(uint16_t rate); +static void ural_setup_tx_desc(struct ural_softc *sc, uint32_t flags, uint16_t len, uint16_t rate); +static void ural_watchdog(void *arg); +static void ural_init_cb(void *arg); +static int ural_ioctl_cb(struct ifnet *ifp, u_long cmd, caddr_t data); +static void ural_start_cb(struct ifnet *ifp); +static int ural_media_change_cb(struct ifnet *ifp); +static int ural_reset_cb(struct ifnet *ifp); +static int ural_newstate_cb(struct ieee80211com *ic, enum ieee80211_state nstate, int arg); static void ural_std_command(struct ieee80211com *ic, usbd_config_td_command_t *func); static void ural_scan_start_cb(struct ieee80211com *); static void ural_scan_end_cb(struct ieee80211com *); static void ural_set_channel_cb(struct ieee80211com *); +static void ural_cfg_tx_bcn(struct ural_softc *sc); +static void ural_cfg_disable_rf_tune(struct ural_softc *sc); +static void ural_cfg_set_bssid(struct ural_softc *sc, uint8_t *bssid); +static void ural_cfg_set_macaddr(struct ural_softc *sc, uint8_t *addr); +static void ural_cfg_set_txantenna(struct ural_softc *sc, uint8_t antenna); +static void ural_cfg_set_rxantenna(struct ural_softc *sc, uint8_t antenna); +static void ural_cfg_read_eeprom(struct ural_softc *sc); +static uint8_t ural_cfg_bbp_init(struct ural_softc *sc); +static void ural_cfg_amrr_start(struct ural_softc *sc); -static void - ural_cfg_tx_bcn(struct ural_softc *sc); - -static void - ural_cfg_disable_rf_tune(struct ural_softc *sc); - -static void - ural_cfg_set_bssid(struct ural_softc *sc, uint8_t *bssid); - -static void - ural_cfg_set_macaddr(struct ural_softc *sc, uint8_t *addr); - -static void - ural_cfg_set_txantenna(struct ural_softc *sc, uint8_t antenna); - -static void - ural_cfg_set_rxantenna(struct ural_softc *sc, uint8_t antenna); - -static void - ural_cfg_read_eeprom(struct ural_softc *sc); - -static uint8_t - ural_cfg_bbp_init(struct ural_softc *sc); - -static void - ural_cfg_amrr_start(struct ural_softc *sc); - /* various supported device vendors/products */ static const struct usb_devno ural_devs[] = { {USB_VENDOR_ASUS, USB_PRODUCT_ASUS_WL167G}, @@ -2005,7 +1938,8 @@ struct ural_config_copy *cc, uint16_t refcount) { enum { - N_RF5222 = (sizeof(ural_rf5222) / sizeof(ural_rf5222[0]))}; + N_RF5222 = (sizeof(ural_rf5222) / sizeof(ural_rf5222[0])), + }; uint32_t i; uint32_t chan; uint8_t power; @@ -2446,7 +2380,8 @@ ural_cfg_bbp_init(struct ural_softc *sc) { enum { - N_DEF_BBP = (sizeof(ural_def_bbp) / sizeof(ural_def_bbp[0]))}; + N_DEF_BBP = (sizeof(ural_def_bbp) / sizeof(ural_def_bbp[0])), + }; uint16_t i; uint8_t to; @@ -2516,7 +2451,8 @@ struct ural_config_copy *cc, uint16_t refcount) { enum { - N_DEF_MAC = (sizeof(ural_def_mac) / sizeof(ural_def_mac[0]))}; + N_DEF_MAC = (sizeof(ural_def_mac) / sizeof(ural_def_mac[0])), + }; uint16_t tmp; uint16_t i; uint8_t to;