From owner-p4-projects@FreeBSD.ORG Tue Jan 6 11:17:27 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5003B1065673; Tue, 6 Jan 2009 11:17:27 +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 103B6106566C for ; Tue, 6 Jan 2009 11:17:27 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F24F28FC19 for ; Tue, 6 Jan 2009 11:17:26 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n06BHQ9X037704 for ; Tue, 6 Jan 2009 11:17:26 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n06BHQe5037702 for perforce@freebsd.org; Tue, 6 Jan 2009 11:17:26 GMT (envelope-from weongyo@FreeBSD.org) Date: Tue, 6 Jan 2009 11:17:26 GMT Message-Id: <200901061117.n06BHQe5037702@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 155708 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: Tue, 06 Jan 2009 11:17:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=155708 Change 155708 by weongyo@weongyo_ws on 2009/01/06 11:16:34 reduce delays to initialize the device more fast. This is tested with my device. Affected files ... .. //depot/projects/vap/sys/dev/usb/if_urtw.c#9 edit Differences ... ==== //depot/projects/vap/sys/dev/usb/if_urtw.c#9 (text+ko) ==== @@ -969,7 +969,7 @@ urtw_write16_m(sc, URTW_RF_PINS_OUTPUT, URTW_RF_PINS_MAGIC5); urtw_write16_m(sc, URTW_RF_PINS_SELECT, URTW_RF_PINS_MAGIC5); urtw_write16_m(sc, URTW_RF_PINS_ENABLE, URTW_RF_PINS_MAGIC5); - usbd_delay_ms(sc->sc_udev, 1100); + usbd_delay_ms(sc->sc_udev, 500); urtw_8225_write(sc, URTW_8225_ADDR_0_MAGIC, URTW_8225_ADDR_0_DATA_MAGIC1); @@ -1534,7 +1534,7 @@ error = urtw_intr_disable(sc); if (error) goto fail; - usbd_delay_ms(sc->sc_udev, 200); + usbd_delay_ms(sc->sc_udev, 100); error = urtw_write8e(sc, 0x18, 0x10); if (error != 0) @@ -1545,12 +1545,12 @@ error = urtw_write8e(sc, 0x18, 0x00); if (error != 0) goto fail; - usbd_delay_ms(sc->sc_udev, 200); + usbd_delay_ms(sc->sc_udev, 100); urtw_read8_m(sc, URTW_CMD, &data); data = (data & 0x2) | URTW_CMD_RST; urtw_write8_m(sc, URTW_CMD, data); - usbd_delay_ms(sc->sc_udev, 200); + usbd_delay_ms(sc->sc_udev, 100); urtw_read8_m(sc, URTW_CMD, &data); if (data & URTW_CMD_RST) { @@ -1561,7 +1561,7 @@ error = urtw_set_mode(sc, URTW_EPROM_CMD_LOAD); if (error) goto fail; - usbd_delay_ms(sc->sc_udev, 200); + usbd_delay_ms(sc->sc_udev, 100); error = urtw_8180_set_anaparam(sc, URTW_8225_ANAPARAM_ON); if (error) @@ -2537,8 +2537,7 @@ urtw_write16_m(sc, URTW_RF_PINS_SELECT, 0x80); urtw_write16_m(sc, URTW_RF_PINS_ENABLE, 0x80); - usbd_delay_ms(sc->sc_udev, 100); - usbd_delay_ms(sc->sc_udev, 1000); + usbd_delay_ms(sc->sc_udev, 500); fail: return (error); } @@ -3082,41 +3081,35 @@ if (error) goto fail; - usbd_delay_ms(sc->sc_udev, 1000); + usbd_delay_ms(sc->sc_udev, 500); for (i = 0; i < N(urtw_8225v2_rf_part1); i++) { urtw_8225_write(sc, urtw_8225v2_rf_part1[i].reg, urtw_8225v2_rf_part1[i].val); - usbd_delay_ms(sc->sc_udev, 1); } - usbd_delay_ms(sc->sc_udev, 100); + usbd_delay_ms(sc->sc_udev, 50); urtw_8225_write(sc, URTW_8225_ADDR_0_MAGIC, URTW_8225_ADDR_0_DATA_MAGIC1); for (i = 0; i < 95; i++) { urtw_8225_write(sc, URTW_8225_ADDR_1_MAGIC, (uint8_t)(i + 1)); - usbd_delay_ms(sc->sc_udev, 1); urtw_8225_write(sc, URTW_8225_ADDR_2_MAGIC, urtw_8225v2_rxgain[i]); - usbd_delay_ms(sc->sc_udev, 1); } urtw_8225_write(sc, URTW_8225_ADDR_3_MAGIC, URTW_8225_ADDR_3_DATA_MAGIC1); - usbd_delay_ms(sc->sc_udev, 1); urtw_8225_write(sc, URTW_8225_ADDR_5_MAGIC, URTW_8225_ADDR_5_DATA_MAGIC1); - usbd_delay_ms(sc->sc_udev, 1); urtw_8225_write(sc, URTW_8225_ADDR_0_MAGIC, URTW_8225_ADDR_0_DATA_MAGIC2); - usbd_delay_ms(sc->sc_udev, 1); urtw_8225_write(sc, URTW_8225_ADDR_2_MAGIC, URTW_8225_ADDR_2_DATA_MAGIC1); - usbd_delay_ms(sc->sc_udev, 200); + usbd_delay_ms(sc->sc_udev, 100); urtw_8225_write(sc, URTW_8225_ADDR_2_MAGIC, URTW_8225_ADDR_2_DATA_MAGIC2); - usbd_delay_ms(sc->sc_udev, 200); + usbd_delay_ms(sc->sc_udev, 100); error = urtw_8225_read(sc, URTW_8225_ADDR_6_MAGIC, &data32); if (error != 0) @@ -3126,32 +3119,28 @@ if (!(data32 & URTW_8225_ADDR_6_DATA_MAGIC2)) { urtw_8225_write(sc, URTW_8225_ADDR_2_MAGIC, URTW_8225_ADDR_2_DATA_MAGIC1); - usbd_delay_ms(sc->sc_udev, 200); + usbd_delay_ms(sc->sc_udev, 100); urtw_8225_write(sc, URTW_8225_ADDR_2_MAGIC, URTW_8225_ADDR_2_DATA_MAGIC2); - usbd_delay_ms(sc->sc_udev, 100); + usbd_delay_ms(sc->sc_udev, 50); error = urtw_8225_read(sc, URTW_8225_ADDR_6_MAGIC, &data32); if (error != 0) goto fail; if (!(data32 & URTW_8225_ADDR_6_DATA_MAGIC2)) device_printf(sc->sc_dev, "RF calibration failed\n"); } - usbd_delay_ms(sc->sc_udev, 200); + usbd_delay_ms(sc->sc_udev, 100); urtw_8225_write(sc, URTW_8225_ADDR_0_MAGIC, URTW_8225_ADDR_0_DATA_MAGIC6); for (i = 0; i < 128; i++) { urtw_8187_write_phy_ofdm(sc, 0xb, urtw_8225_agc[i]); - usbd_delay_ms(sc->sc_udev, 1); urtw_8187_write_phy_ofdm(sc, 0xa, (uint8_t)i + 0x80); - usbd_delay_ms(sc->sc_udev, 1); } - usbd_delay_ms(sc->sc_udev, 1); for (i = 0; i < N(urtw_8225v2_rf_part2); i++) { urtw_8187_write_phy_ofdm(sc, urtw_8225v2_rf_part2[i].reg, urtw_8225v2_rf_part2[i].val); - usbd_delay_ms(sc->sc_udev, 1); } error = urtw_8225v2_setgain(sc, 4); @@ -3161,7 +3150,6 @@ for (i = 0; i < N(urtw_8225v2_rf_part3); i++) { urtw_8187_write_phy_cck(sc, urtw_8225v2_rf_part3[i].reg, urtw_8225v2_rf_part3[i].val); - usbd_delay_ms(sc->sc_udev, 1); } urtw_write8_m(sc, URTW_ADDR_MAGIC4, 0x0d); @@ -3171,9 +3159,7 @@ goto fail; urtw_8187_write_phy_cck(sc, 0x10, 0x9b); - usbd_delay_ms(sc->sc_udev, 1); urtw_8187_write_phy_ofdm(sc, 0x26, 0x90); - usbd_delay_ms(sc->sc_udev, 1); /* TX ant A, 0x0 for B */ error = urtw_8185_tx_antenna(sc, 0x3);