From owner-p4-projects@FreeBSD.ORG Sun Feb 21 08:53:34 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3CB781065676; Sun, 21 Feb 2010 08:53:34 +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 EA81D106566B for ; Sun, 21 Feb 2010 08:53:33 +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 D5D718FC15 for ; Sun, 21 Feb 2010 08:53:33 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o1L8rXc1054453 for ; Sun, 21 Feb 2010 08:53:33 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o1L8rXij054451 for perforce@freebsd.org; Sun, 21 Feb 2010 08:53:33 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 21 Feb 2010 08:53:33 GMT Message-Id: <201002210853.o1L8rXij054451@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 Precedence: bulk Cc: Subject: PERFORCE change 174936 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Feb 2010 08:53:34 -0000 http://p4web.freebsd.org/chv.cgi?CH=174936 Change 174936 by hselasky@hselasky_laptop001 on 2010/02/21 08:52:41 USB WLAN: - integrate latest driver code from OpenBSD. - patch by: Akinori Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usbdevs#106 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_run.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_runreg.h#3 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_runvar.h#4 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#106 (text+ko) ==== @@ -544,6 +544,7 @@ vendor RIM 0x0fca Research In Motion vendor DYNASTREAM 0x0fcf Dynastream Innovations vendor QUALCOMM 0x1004 Qualcomm +vendor MOTOROLA4 0x100d Motorola vendor DESKNOTE 0x1019 Desknote vendor GIGABYTE 0x1044 GIGABYTE vendor WESTERN 0x1058 Western Digital @@ -2090,6 +2091,7 @@ product MOTOROLA2 E398 0x4810 E398 Mobile Phone product MOTOROLA2 USBLAN 0x600c USBLAN product MOTOROLA2 USBLAN2 0x6027 USBLAN +product MOTOROLA4 RT2770 0x9031 RT2770 /* MultiTech products */ product MULTITECH ATLAS 0xf101 MT5634ZBA-USB modem @@ -2749,6 +2751,7 @@ product SITECOMEU RT3070_4 0x003d RT3070 product SITECOMEU RT3070 0x003e RT3070 product SITECOMEU WL608 0x003f WL-608 +product SITECOMEU RT3071 0x0040 RT3071 product SITECOMEU RT3072_1 0x0041 RT3072 product SITECOMEU RT3072_2 0x0042 RT3072 product SITECOMEU RT3072_3 0x0047 RT3072 ==== //depot/projects/usb/src/sys/dev/usb/wlan/if_run.c#5 (text+ko) ==== @@ -1,8 +1,9 @@ /* $FreeBSD$ */ /*- - * Copyright (c) 2008,2009 Damien Bergamini - * ported to FreeBSD by Akinori Furukoshi + * Copyright (c) 2008,2010 Damien Bergamini + * ported to FreeBSD by Akinori Furukoshi + * USB Consulting, Hans Petter Selasky * * Permission to use, copy, modify, and distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -17,8 +18,6 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ -/* release date Jan. 09, 2010 */ - #include __FBSDID("$FreeBSD$"); @@ -188,6 +187,7 @@ { USB_VP(USB_VENDOR_MELCO, USB_PRODUCT_MELCO_WLIUCAG300N) }, { USB_VP(USB_VENDOR_MELCO, USB_PRODUCT_MELCO_WLIUCG300N) }, { USB_VP(USB_VENDOR_MELCO, USB_PRODUCT_MELCO_WLIUCGN) }, + { USB_VP(USB_VENDOR_MOTOROLA4, USB_PRODUCT_MOTOROLA4_RT2770) }, { USB_VP(USB_VENDOR_MSI, USB_PRODUCT_MSI_RT3070_1) }, { USB_VP(USB_VENDOR_MSI, USB_PRODUCT_MSI_RT3070_2) }, { USB_VP(USB_VENDOR_MSI, USB_PRODUCT_MSI_RT3070_3) }, @@ -234,6 +234,7 @@ { USB_VP(USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT3070_2) }, { USB_VP(USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT3070_3) }, { USB_VP(USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT3070_4) }, + { USB_VP(USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT3071) }, { USB_VP(USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT3072_1) }, { USB_VP(USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT3072_2) }, { USB_VP(USB_VENDOR_SITECOMEU, USB_PRODUCT_SITECOMEU_RT3072_3) }, @@ -340,10 +341,12 @@ static void run_rt2870_set_chan(struct run_softc *, u_int); static void run_rt3070_set_chan(struct run_softc *, u_int); static int run_set_chan(struct run_softc *, struct ieee80211_channel *); +static void run_set_agc(struct run_softc *, uint8_t); static void run_set_channel(struct ieee80211com *); static void run_scan_start(struct ieee80211com *); static void run_scan_end(struct ieee80211com *); static uint8_t run_rate2mcs(uint8_t rate); +static void run_rt3572_set_chan(struct run_softc *, u_int); static void run_update_beacon(struct ieee80211vap *, int); static void run_update_beacon_locked(struct ieee80211vap *, int); static void run_updateprot(struct ieee80211com *ic); @@ -369,6 +372,7 @@ static void run_init(void *); static void run_init_locked(struct run_softc *); static void run_stop(void *); +static void run_rt3070_rf_setup(struct run_softc *); static void run_delay(struct run_softc *, unsigned int); static const struct { @@ -394,8 +398,8 @@ struct { uint8_t n, r, k; -} run_rf3020_freqs[] = { - RT3070_RF3020 +} rt3070_freqs[] = { + RT3070_RF3052 }; static const struct { @@ -403,6 +407,8 @@ uint8_t val; } rt3070_def_rf[] = { RT3070_DEF_RF +},rt3572_def_rf[] = { + RT3572_DEF_RF }; static const struct usb_config run_config[RUN_N_XFER] = { @@ -498,6 +504,7 @@ struct usb_attach_arg *uaa = device_get_ivars(self); struct ieee80211com *ic; struct ifnet *ifp; + uint32_t ver; int i, ntries, error; uint8_t iface_index, bands; @@ -509,11 +516,10 @@ MTX_NETWORK_LOCK, MTX_DEF); iface_index = RT2860_IFACE_INDEX; - /* Rx transfer has own lock */ error = usbd_transfer_setup(uaa->device, &iface_index, sc->sc_xfer, run_config, RUN_N_XFER, sc, &sc->sc_mtx); if (error) { - device_printf(self, "could not allocate USB Tx transfers, " + device_printf(self, "could not allocate USB transfers, " "err=%s\n", usbd_errstr(error)); goto detach; } @@ -522,11 +528,11 @@ /* wait for the chip to settle */ for (ntries = 0; ntries < 100; ntries++) { - if (run_read(sc, RT2860_ASIC_VER_ID, &sc->mac_rev) != 0){ + if (run_read(sc, RT2860_ASIC_VER_ID, &ver) != 0){ RUN_UNLOCK(sc); goto detach; } - if (sc->mac_rev != 0 && sc->mac_rev != 0xffffffff) + if (ver != 0 && ver != 0xffffffff) break; run_delay(sc, 10); } @@ -536,13 +542,15 @@ RUN_UNLOCK(sc); goto detach; } + sc->mac_ver = ver >> 16; + sc->mac_rev = ver & 0xffff; /* retrieve RF rev. no and various other things from EEPROM */ run_read_eeprom(sc); printf("%s: MAC/BBP RT%04X (rev 0x%04X), RF %s (MIMO %dT%dR), " - "address %s\n", device_get_nameunit(sc->sc_dev), sc->mac_rev >> 16, - sc->mac_rev & 0xffff, run_get_rf(sc->rf_rev), sc->ntxchains, + "address %s\n", device_get_nameunit(sc->sc_dev), sc->mac_ver, + sc->mac_rev, run_get_rf(sc->rf_rev), sc->ntxchains, sc->nrxchains, ether_sprintf(sc->sc_bssid)); if ((error = run_load_microcode(sc)) != 0) { @@ -607,7 +615,9 @@ * Do this by own because h/w supports * more channels than ieee80211_init_channels() */ - if (sc->rf_rev == RT2860_RF_2750 || sc->rf_rev == RT2860_RF_2850) { + if (sc->rf_rev == RT2860_RF_2750 || + sc->rf_rev == RT2860_RF_2850 || + sc->rf_rev == RT3070_RF_3052) { /* set supported .11a rates */ for (i = 14; i < nitems(rt2860_rf2850); i++) { uint8_t chan = rt2860_rf2850[i].chan; @@ -823,10 +833,9 @@ * last half is for rt3071. */ base = sc->fwp->data; - if ((sc->mac_rev >> 16) != 0x2860 && - (sc->mac_rev >> 16) != 0x2872 && - (sc->mac_rev >> 16) != 0x3070 && - (sc->mac_rev >> 16) != 0x3572){ + if ((sc->mac_ver) != 0x2860 && + (sc->mac_ver) != 0x2872 && + (sc->mac_ver) != 0x3070){ base += 4096; printf("%s: You are using firmware RT3071.\n", device_get_nameunit(sc->sc_dev)); @@ -857,7 +866,7 @@ run_delay(sc, 10); run_write(sc, RT2860_H2M_MAILBOX, 0); - if ((error = run_mcu_cmd(sc, RT2860_MCU_CMD_BOOT, 0)) != 0) + if ((error = run_mcu_cmd(sc, RT2860_MCU_CMD_RFRESET, 0)) != 0) return error; /* wait until microcontroller is ready */ @@ -1270,7 +1279,7 @@ /* check whether the ROM is eFUSE ROM or EEPROM */ sc->sc_srom_read = run_eeprom_read_2; - if ((sc->mac_rev & 0xfff00000) >= 0x30700000) { + if (sc->mac_ver >= 0x3070) { run_read(sc, RT3070_EFUSE_CTRL, &tmp); DPRINTF("EFUSE_CTRL=0x%08x\n", tmp); if (tmp & RT3070_SEL_EFUSE) @@ -1292,21 +1301,32 @@ sc->sc_bssid[4] = val & 0xff; sc->sc_bssid[5] = val >> 8; - /* read default BBP settings */ - for (i = 0; i < 8; i++) { + /* read vender BBP settings */ + for (i = 0; i < 10; i++) { run_srom_read(sc, RT2860_EEPROM_BBP_BASE + i, &val); sc->bbp[i].val = val & 0xff; sc->bbp[i].reg = val >> 8; DPRINTF("BBP%d=0x%02x\n", sc->bbp[i].reg, sc->bbp[i].val); } + if (sc->mac_ver >= 0x3071) { + /* read vendor RF settings */ + for (i = 0; i < 10; i++) { + run_srom_read(sc, RT3071_EEPROM_RF_BASE + i, &val); + sc->rf[i].val = val & 0xff; + sc->rf[i].reg = val >> 8; + DPRINTF("RF%d=0x%02x\n", sc->rf[i].reg, + sc->rf[i].val); + } + } /* read RF frequency offset from EEPROM */ run_srom_read(sc, RT2860_EEPROM_FREQ_LEDS, &val); sc->freq = ((val & 0xff) != 0xff) ? val & 0xff : 0; DPRINTF("EEPROM freq offset %d\n", sc->freq & 0xff); - if ((sc->leds = val >> 8) != 0xff) { + if ((val >> 8) != 0xff) { /* read LEDs operating mode */ + sc->leds = val >> 8; run_srom_read(sc, RT2860_EEPROM_LED1, &sc->led[0]); run_srom_read(sc, RT2860_EEPROM_LED2, &sc->led[1]); run_srom_read(sc, RT2860_EEPROM_LED3, &sc->led[2]); @@ -1324,7 +1344,12 @@ run_srom_read(sc, RT2860_EEPROM_ANTENNA, &val); if (val == 0xffff) { DPRINTF("invalid EEPROM antenna info, using default\n"); - if ((sc->mac_rev >> 16) >= 0x3070) { + if (sc->mac_ver == 0x3572) { + /* default to RF3052 2T2R */ + sc->rf_rev = RT3070_RF_3052; + sc->ntxchains = 2; + sc->nrxchains = 2; + } else if (sc->mac_ver >= 0x3070) { /* default to RF3020 1T1R */ sc->rf_rev = RT3070_RF_3020; sc->ntxchains = 1; @@ -1343,13 +1368,18 @@ DPRINTF("EEPROM RF rev=0x%02x chains=%dT%dR\n", sc->rf_rev, sc->ntxchains, sc->nrxchains); - /* check if RF supports automatic Tx access gain control */ run_srom_read(sc, RT2860_EEPROM_CONFIG, &val); DPRINTF("EEPROM CFG 0x%04x\n", val); + /* check if driver should patch the DAC issue */ + if ((val >> 8) != 0xff) + sc->patch_dac = (val >> 15) & 1; if ((val & 0xff) != 0xff) { sc->ext_5ghz_lna = (val >> 3) & 1; sc->ext_2ghz_lna = (val >> 2) & 1; + /* check if RF supports automatic Tx access gain control */ sc->calib_2ghz = sc->calib_5ghz = (val >> 1) & 1; + /* check if we have a hardware radio switch */ + sc->rfswitch = val & 1; } /* read power settings for 2GHz channels */ @@ -1372,7 +1402,7 @@ rt2860_rf2850[i].chan, sc->txpow1[i], sc->txpow2[i]); } /* read power settings for 5GHz channels */ - for (i = 0; i < 36; i += 2) { + for (i = 0; i < 40; i += 2) { run_srom_read(sc, RT2860_EEPROM_PWR5GHZ_BASE1 + i / 2, &val); sc->txpow1[i + 14] = (int8_t)(val & 0xff); sc->txpow1[i + 15] = (int8_t)(val >> 8); @@ -1382,7 +1412,7 @@ sc->txpow2[i + 15] = (int8_t)(val >> 8); } /* fix broken Tx power entries */ - for (i = 0; i < 36; i++) { + for (i = 0; i < 40; i++) { if (sc->txpow1[14 + i] < -7 || sc->txpow1[14 + i] > 15) sc->txpow1[14 + i] = 5; if (sc->txpow2[14 + i] < -7 || sc->txpow2[14 + i] > 15) @@ -1431,14 +1461,32 @@ sc->rssi_2ghz[0] = val & 0xff; /* Ant A */ sc->rssi_2ghz[1] = val >> 8; /* Ant B */ run_srom_read(sc, RT2860_EEPROM_RSSI2_2GHZ, &val); - sc->rssi_2ghz[2] = val & 0xff; /* Ant C */ + if (sc->mac_ver >= 0x3070) { + /* + * On RT3070 chips (limited to 2 Rx chains), this ROM + * field contains the Tx mixer gain for the 2GHz band. + */ + if ((val & 0xff) != 0xff) + sc->txmixgain_2ghz = val & 0x7; + DPRINTF("tx mixer gain=%u (2GHz)\n", sc->txmixgain_2ghz); + } else + sc->rssi_2ghz[2] = val & 0xff; /* Ant C */ sc->lna[2] = val >> 8; /* channel group 2 */ run_srom_read(sc, RT2860_EEPROM_RSSI1_5GHZ, &val); sc->rssi_5ghz[0] = val & 0xff; /* Ant A */ sc->rssi_5ghz[1] = val >> 8; /* Ant B */ run_srom_read(sc, RT2860_EEPROM_RSSI2_5GHZ, &val); - sc->rssi_5ghz[2] = val & 0xff; /* Ant C */ + if (sc->mac_ver == 0x3572) { + /* + * On RT3572 chips (limited to 2 Rx chains), this ROM + * field contains the Tx mixer gain for the 5GHz band. + */ + if ((val & 0xff) != 0xff) + sc->txmixgain_5ghz = val & 0x7; + DPRINTF("tx mixer gain=%u (5GHz)\n", sc->txmixgain_5ghz); + } else + sc->rssi_5ghz[2] = val & 0xff; /* Ant C */ sc->lna[3] = val >> 8; /* channel group 3 */ run_srom_read(sc, RT2860_EEPROM_LNA, &val); @@ -2625,7 +2673,7 @@ dur = rt2860_rates[ridx].sp_ack_dur; else dur = rt2860_rates[ridx].lp_ack_dur; - *(uint16_t *)wh->i_dur = htole16(dur + sc->sifs); + *(uint16_t *)wh->i_dur = htole16(dur); } /* reserve slots for mgmt packets, just in case */ @@ -2992,9 +3040,26 @@ } static void +run_set_agc(struct run_softc *sc, uint8_t agc) +{ + uint8_t bbp; + + if (sc->mac_ver == 0x3572) { + run_bbp_read(sc, 27, &bbp); + bbp &= ~(0x3 << 5); + run_bbp_write(sc, 27, bbp | 0 << 5); /* select Rx0 */ + run_bbp_write(sc, 66, agc); + run_bbp_write(sc, 27, bbp | 1 << 5); /* select Rx1 */ + run_bbp_write(sc, 66, agc); + } else + run_bbp_write(sc, 66, agc); +} + +static void run_select_chan_group(struct run_softc *sc, int group) { uint32_t tmp; + uint8_t agc; run_bbp_write(sc, 62, 0x37 - sc->lna[group]); run_bbp_write(sc, 63, 0x37 - sc->lna[group]); @@ -3010,13 +3075,14 @@ run_bbp_write(sc, 75, 0x50); } } else { - if (sc->ext_5ghz_lna) { + if (sc->mac_ver == 0x3572) + run_bbp_write(sc, 82, 0x94); + else run_bbp_write(sc, 82, 0xf2); + if (sc->ext_5ghz_lna) run_bbp_write(sc, 75, 0x46); - } else { - run_bbp_write(sc, 82, 0xf2); + else run_bbp_write(sc, 75, 0x50); - } } run_read(sc, RT2860_TX_BAND_CFG, &tmp); @@ -3039,13 +3105,26 @@ if (sc->nrxchains > 1) tmp |= RT2860_LNA_PE_A1_EN; } - run_write(sc, RT2860_TX_PIN_CFG, tmp); + if (sc->mac_ver == 0x3572) { + run_rt3070_rf_write(sc, 8, 0x00); + run_write(sc, RT2860_TX_PIN_CFG, tmp); + run_rt3070_rf_write(sc, 8, 0x80); + } else + run_write(sc, RT2860_TX_PIN_CFG, tmp); /* set initial AGC value */ - if (group == 0) - run_bbp_write(sc, 66, 0x2e + sc->lna[0]); - else - run_bbp_write(sc, 66, 0x32 + (sc->lna[group] * 5) / 3); + if (group == 0) { /* 2GHz band */ + if (sc->mac_ver >= 0x3070) + agc = 0x1c + sc->lna[0] * 2; + else + agc = 0x2e + sc->lna[0]; + } else { /* 5GHz band */ + if (sc->mac_ver == 0x3572) + agc = 0x22 + (sc->lna[group] * 5) / 3; + else + agc = 0x32 + (sc->lna[group] * 5) / 3; + } + run_set_agc(sc, agc); } static void @@ -3108,18 +3187,22 @@ { int8_t txpow1, txpow2; uint8_t rf; + int i; /* RT3070 is 2GHz only */ KASSERT(chan >= 1 && chan <= 14, ("wrong channel selected\n")); + /* find the settings for this channel (we know it exists) */ + for (i = 0; rt2860_rf2850[i].chan != chan; i++); + /* use Tx power values from EEPROM */ - txpow1 = sc->txpow1[chan - 1]; - txpow2 = sc->txpow2[chan - 1]; + txpow1 = sc->txpow1[i]; + txpow2 = sc->txpow2[i]; - run_rt3070_rf_write(sc, 2, run_rf3020_freqs[chan - 1].n); - run_rt3070_rf_write(sc, 3, run_rf3020_freqs[chan - 1].k); + run_rt3070_rf_write(sc, 2, rt3070_freqs[i].n); + run_rt3070_rf_write(sc, 3, rt3070_freqs[i].k); run_rt3070_rf_read(sc, 6, &rf); - rf = (rf & ~0x03) | run_rf3020_freqs[chan - 1].r; + rf = (rf & ~0x03) | rt3070_freqs[i].r; run_rt3070_rf_write(sc, 6, rf); /* set Tx0 power */ @@ -3150,12 +3233,166 @@ run_rt3070_rf_write(sc, 23, rf); /* program RF filter */ - run_rt3070_rf_write(sc, 24, sc->rf24_20mhz); - run_rt3070_rf_write(sc, 31, sc->rf24_20mhz); + run_rt3070_rf_read(sc, 24, &rf); /* Tx */ + rf = (rf & ~0x3f) | sc->rf24_20mhz; + run_rt3070_rf_write(sc, 24, rf); + run_rt3070_rf_read(sc, 31, &rf); /* Rx */ + rf = (rf & ~0x3f) | sc->rf24_20mhz; + run_rt3070_rf_write(sc, 31, rf); + + /* enable RF tuning */ + run_rt3070_rf_read(sc, 7, &rf); + run_rt3070_rf_write(sc, 7, rf | 0x01); +} + +static void +run_rt3572_set_chan(struct run_softc *sc, u_int chan) +{ + int8_t txpow1, txpow2; + uint32_t tmp; + uint8_t rf; + int i; + + /* find the settings for this channel (we know it exists) */ + for (i = 0; rt2860_rf2850[i].chan != chan; i++); + + /* use Tx power values from EEPROM */ + txpow1 = sc->txpow1[i]; + txpow2 = sc->txpow2[i]; + + if (chan <= 14) { + run_bbp_write(sc, 25, sc->bbp25); + run_bbp_write(sc, 26, sc->bbp26); + } else { + /* enable IQ phase correction */ + run_bbp_write(sc, 25, 0x09); + run_bbp_write(sc, 26, 0xff); + } + + run_rt3070_rf_write(sc, 2, rt3070_freqs[i].n); + run_rt3070_rf_write(sc, 3, rt3070_freqs[i].k); + run_rt3070_rf_read(sc, 6, &rf); + rf = (rf & ~0x0f) | rt3070_freqs[i].r; + rf |= (chan <= 14) ? 0x08 : 0x04; + run_rt3070_rf_write(sc, 6, rf); + + /* set PLL mode */ + run_rt3070_rf_read(sc, 5, &rf); + rf &= ~(0x08 | 0x04); + rf |= (chan <= 14) ? 0x04 : 0x08; + run_rt3070_rf_write(sc, 5, rf); + + /* set Tx power for chain 0 */ + if (chan <= 14) + rf = 0x60 | txpow1; + else + rf = 0xe0 | (txpow1 & 0xc) << 1 | (txpow1 & 0x3); + run_rt3070_rf_write(sc, 12, rf); + + /* set Tx power for chain 1 */ + if (chan <= 14) + rf = 0x60 | txpow2; + else + rf = 0xe0 | (txpow2 & 0xc) << 1 | (txpow2 & 0x3); + run_rt3070_rf_write(sc, 13, rf); + + /* set Tx/Rx streams */ + run_rt3070_rf_read(sc, 1, &rf); + rf &= ~0xfc; + if (sc->ntxchains == 1) + rf |= 1 << 7 | 1 << 5; /* 1T: disable Tx chains 2 & 3 */ + else if (sc->ntxchains == 2) + rf |= 1 << 7; /* 2T: disable Tx chain 3 */ + if (sc->nrxchains == 1) + rf |= 1 << 6 | 1 << 4; /* 1R: disable Rx chains 2 & 3 */ + else if (sc->nrxchains == 2) + rf |= 1 << 6; /* 2R: disable Rx chain 3 */ + run_rt3070_rf_write(sc, 1, rf); + + /* set RF offset */ + run_rt3070_rf_read(sc, 23, &rf); + rf = (rf & ~0x7f) | sc->freq; + run_rt3070_rf_write(sc, 23, rf); + + /* program RF filter */ + rf = sc->rf24_20mhz; + run_rt3070_rf_write(sc, 24, rf); /* Tx */ + run_rt3070_rf_write(sc, 31, rf); /* Rx */ + + /* enable RF tuning */ + run_rt3070_rf_read(sc, 7, &rf); + rf = (chan <= 14) ? 0xd8 : ((rf & ~0xc8) | 0x14); + run_rt3070_rf_write(sc, 7, rf); + + /* TSSI */ + rf = (chan <= 14) ? 0xc3 : 0xc0; + run_rt3070_rf_write(sc, 9, rf); + + /* set loop filter 1 */ + run_rt3070_rf_write(sc, 10, 0xf1); + /* set loop filter 2 */ + run_rt3070_rf_write(sc, 11, (chan <= 14) ? 0xb9 : 0x00); + + /* set tx_mx2_ic */ + run_rt3070_rf_write(sc, 15, (chan <= 14) ? 0x53 : 0x43); + /* set tx_mx1_ic */ + if (chan <= 14) + rf = 0x48 | sc->txmixgain_2ghz; + else + rf = 0x78 | sc->txmixgain_5ghz; + run_rt3070_rf_write(sc, 16, rf); + + /* set tx_lo1 */ + run_rt3070_rf_write(sc, 17, 0x23); + /* set tx_lo2 */ + if (chan <= 14) + rf = 0x93; + else if (chan <= 64) + rf = 0xb7; + else if (chan <= 128) + rf = 0x74; + else + rf = 0x72; + run_rt3070_rf_write(sc, 19, rf); + + /* set rx_lo1 */ + if (chan <= 14) + rf = 0xb3; + else if (chan <= 64) + rf = 0xf6; + else if (chan <= 128) + rf = 0xf4; + else + rf = 0xf3; + run_rt3070_rf_write(sc, 20, rf); + + /* set pfd_delay */ + if (chan <= 14) + rf = 0x15; + else if (chan <= 64) + rf = 0x3d; + else + rf = 0x01; + run_rt3070_rf_write(sc, 25, rf); + + /* set rx_lo2 */ + run_rt3070_rf_write(sc, 26, (chan <= 14) ? 0x85 : 0x87); + /* set ldo_rf_vc */ + run_rt3070_rf_write(sc, 27, (chan <= 14) ? 0x00 : 0x01); + /* set drv_cc */ + run_rt3070_rf_write(sc, 29, (chan <= 14) ? 0x9b : 0x9f); + + run_read(sc, RT2860_GPIO_CTRL, &tmp); + tmp &= ~0x8080; + if (chan <= 14) + tmp |= 0x80; + run_write(sc, RT2860_GPIO_CTRL, tmp); /* enable RF tuning */ run_rt3070_rf_read(sc, 7, &rf); run_rt3070_rf_write(sc, 7, rf | 0x01); + + run_delay(sc, 2); } static void @@ -3164,13 +3401,11 @@ uint32_t tmp; if (aux) { - run_read(sc, RT2860_PCI_EECTRL, &tmp); - run_write(sc, RT2860_PCI_EECTRL, tmp & ~RT2860_C); + run_mcu_cmd(sc, RT2860_MCU_CMD_ANTSEL, 0); run_read(sc, RT2860_GPIO_CTRL, &tmp); run_write(sc, RT2860_GPIO_CTRL, (tmp & ~0x0808) | 0x08); } else { - run_read(sc, RT2860_PCI_EECTRL, &tmp); - run_write(sc, RT2860_PCI_EECTRL, tmp | RT2860_C); + run_mcu_cmd(sc, RT2860_MCU_CMD_ANTSEL, 1); run_read(sc, RT2860_GPIO_CTRL, &tmp); run_write(sc, RT2860_GPIO_CTRL, tmp & ~0x0808); } @@ -3186,14 +3421,13 @@ if (chan == 0 || chan == IEEE80211_CHAN_ANY) return EINVAL; - if ((sc->mac_rev >> 16) >= 0x3070) + if (sc->mac_ver == 0x3572) + run_rt3572_set_chan(sc, chan); + else if (sc->mac_ver >= 0x3070) run_rt3070_set_chan(sc, chan); else run_rt2870_set_chan(sc, chan); - /* 802.11a uses a 16 microseconds short interframe space */ - sc->sifs = IEEE80211_IS_CHAN_5GHZ(c) ? 16 : 10; - /* determine channel group */ if (chan <= 14) group = 0; @@ -3359,7 +3593,7 @@ struct run_softc *sc = arg; struct ieee80211vap *vap = &sc->sc_rvp->vap; - RUN_LOCK_ASSERT(sc, MA_OWNED); + RUN_LOCK(sc); if(vap->iv_state == IEEE80211_S_RUN && vap->iv_opmode != IEEE80211_M_STA) @@ -3370,6 +3604,8 @@ ieee80211_cancel_scan(vap); } else DPRINTF("timeout by unknown cause\n"); + + RUN_UNLOCK(sc); } static void @@ -3604,15 +3840,14 @@ } /* fix BBP84 for RT2860E */ - if ((sc->mac_rev >> 16) == 0x2860 && (sc->mac_rev & 0xffff) != 0x0101) - run_bbp_write(sc, 84, 0x19); + if (sc->mac_ver == 0x2860 && sc->mac_rev != 0x0101) + run_bbp_write(sc, 84, 0x19); - if ((sc->mac_rev >> 16) >= 0x3070) { + if (sc->mac_ver >= 0x3070) { run_bbp_write(sc, 79, 0x13); run_bbp_write(sc, 80, 0x05); run_bbp_write(sc, 81, 0x33); - /* XXX RT3090 needs more */ - } else if (sc->mac_rev == 0x28600100) { + } else if (sc->mac_ver == 0x2860 && sc->mac_rev == 0x0100) { run_bbp_write(sc, 69, 0x16); run_bbp_write(sc, 73, 0x12); } @@ -3623,7 +3858,7 @@ run_rt3070_rf_init(struct run_softc *sc) { uint32_t tmp; - uint8_t rf, bbp4; + uint8_t rf, target, bbp4; int i; run_rt3070_rf_read(sc, 30, &rf); @@ -3633,44 +3868,58 @@ run_rt3070_rf_write(sc, 30, rf & ~0x80); /* initialize RF registers to default value */ - for (i = 0; i < nitems(rt3070_def_rf); i++) { - run_rt3070_rf_write(sc, rt3070_def_rf[i].reg, - rt3070_def_rf[i].val); + if (sc->mac_ver == 0x3572) { + for (i = 0; i < nitems(rt3572_def_rf); i++) { + run_rt3070_rf_write(sc, rt3572_def_rf[i].reg, + rt3572_def_rf[i].val); + } + } else { + for (i = 0; i < nitems(rt3070_def_rf); i++) { + run_rt3070_rf_write(sc, rt3070_def_rf[i].reg, + rt3070_def_rf[i].val); + } } - if ((sc->mac_rev >> 16) == 0x3070) { + + if (sc->mac_ver == 0x3070) { /* change voltage from 1.2V to 1.35V for RT3070 */ run_read(sc, RT3070_LDO_CFG0, &tmp); tmp = (tmp & ~0x0f000000) | 0x0d000000; run_write(sc, RT3070_LDO_CFG0, tmp); - } else if ((sc->mac_rev >> 16) == 0x3071) { + } else if (sc->mac_ver == 0x3071) { run_rt3070_rf_read(sc, 6, &rf); run_rt3070_rf_write(sc, 6, rf | 0x40); run_rt3070_rf_write(sc, 31, 0x14); run_read(sc, RT3070_LDO_CFG0, &tmp); tmp &= ~0x1f000000; - if ((sc->mac_rev & 0xffff) < 0x0211) - tmp |= 0x0d000000; + if (sc->mac_rev < 0x0211) + tmp |= 0x0d000000; /* 1.3V */ else - tmp |= 0x01000000; + tmp |= 0x01000000; /* 1.2V */ run_write(sc, RT3070_LDO_CFG0, tmp); /* patch LNA_PE_G1 */ run_read(sc, RT3070_GPIO_SWITCH, &tmp); run_write(sc, RT3070_GPIO_SWITCH, tmp & ~0x20); - } else if((sc->mac_rev >> 16) == 0x3572){ - if ((sc->mac_rev & 0xffff) < 0x0211){ + } else if(sc->mac_ver == 0x3572){ + run_rt3070_rf_read(sc, 6, &rf); + run_rt3070_rf_write(sc, 6, rf | 0x40); + + if (sc->mac_rev < 0x0211){ + /* increase voltage from 1.2V to 1.35V */ run_read(sc, RT3070_LDO_CFG0, &tmp); tmp = (tmp & ~0x0f000000) | 0x0d000000; run_write(sc, RT3070_LDO_CFG0, tmp); } else { + /* increase voltage from 1.2V to 1.35V */ run_read(sc, RT3070_LDO_CFG0, &tmp); tmp = (tmp & ~0x1f000000) | 0x0d000000; run_write(sc, RT3070_LDO_CFG0, tmp); run_delay(sc, 1); /* wait for 1msec */ + /* decrease voltage back to 1.2V */ tmp = (tmp & ~0x1f000000) | 0x01000000; run_write(sc, RT3070_LDO_CFG0, tmp); } @@ -3682,27 +3931,47 @@ /* calibrate filter for 20MHz bandwidth */ sc->rf24_20mhz = 0x1f; /* default value */ - run_rt3070_filter_calib(sc, 0x07, 0x16, &sc->rf24_20mhz); + target = (sc->mac_ver < 0x3071) ? 0x16 : 0x13; + run_rt3070_filter_calib(sc, 0x07, target, &sc->rf24_20mhz); /* select 40MHz bandwidth */ run_bbp_read(sc, 4, &bbp4); run_bbp_write(sc, 4, (bbp4 & ~0x08) | 0x10); + run_rt3070_rf_read(sc, 31, &rf); + run_rt3070_rf_write(sc, 31, rf | 0x20); /* calibrate filter for 40MHz bandwidth */ sc->rf24_40mhz = 0x2f; /* default value */ - run_rt3070_filter_calib(sc, 0x27, 0x19, &sc->rf24_40mhz); + target = (sc->mac_ver < 0x3071) ? 0x19 : 0x15; + run_rt3070_filter_calib(sc, 0x27, target, &sc->rf24_40mhz); /* go back to 20MHz bandwidth */ run_bbp_read(sc, 4, &bbp4); run_bbp_write(sc, 4, bbp4 & ~0x18); - if ((sc->mac_rev & 0xffff) < 0x0211) + if (sc->mac_ver == 0x3572) { + /* save default BBP registers 25 and 26 values */ + run_bbp_read(sc, 25, &sc->bbp25); + run_bbp_read(sc, 26, &sc->bbp26); + } else if (sc->mac_rev < 0x0211) run_rt3070_rf_write(sc, 27, 0x03); run_read(sc, RT3070_OPT_14, &tmp); run_write(sc, RT3070_OPT_14, tmp | 1); - if ((sc->mac_rev >> 16) == 0x3071) { + if (sc->mac_ver == 0x3070 || sc->mac_ver == 0x3071) { + run_rt3070_rf_read(sc, 17, &rf); + rf &= ~RT3070_TX_LO1; + if ((sc->mac_ver == 0x3070 || + (sc->mac_ver == 0x3071 && sc->mac_rev >= 0x0211)) && + !sc->ext_2ghz_lna) + rf |= 0x20; /* fix for long range Rx issue */ + if (sc->txmixgain_2ghz >= 1) + rf = (rf & ~0x7) | sc->txmixgain_2ghz; + run_rt3070_rf_write(sc, 17, rf); + } + + if (sc->mac_rev == 0x3071) { run_rt3070_rf_read(sc, 1, &rf); rf &= ~(RT3070_RX0_PD | RT3070_TX0_PD); rf |= RT3070_RF_BLOCK | RT3070_RX1_PD | RT3070_TX1_PD; @@ -3711,21 +3980,18 @@ run_rt3070_rf_read(sc, 15, &rf); run_rt3070_rf_write(sc, 15, rf & ~RT3070_TX_LO2); - run_rt3070_rf_read(sc, 17, &rf); - rf &= ~RT3070_TX_LO1; - if ((sc->mac_rev & 0xffff) >= 0x0211 && !sc->ext_2ghz_lna) - rf |= 0x20; /* fix for long range Rx issue */ - run_rt3070_rf_write(sc, 17, rf); - run_rt3070_rf_read(sc, 20, &rf); run_rt3070_rf_write(sc, 20, rf & ~RT3070_RX_LO1); run_rt3070_rf_read(sc, 21, &rf); run_rt3070_rf_write(sc, 21, rf & ~RT3070_RX_LO2); + } + if (sc->mac_ver == 0x3070 || sc->mac_ver == 0x3071) { + /* fix Tx to Rx IQ glitch by raising RF voltage */ run_rt3070_rf_read(sc, 27, &rf); rf &= ~0x77; - if ((sc->mac_rev & 0xffff) < 0x0211) + if (sc->mac_rev < 0x0211) rf |= 0x03; run_rt3070_rf_write(sc, 27, rf); } @@ -3741,7 +4007,8 @@ int ntries; /* program filter */ - rf24 = init; /* initial filter value */ + run_rt3070_rf_read(sc, 24, &rf24); + rf24 = (rf24 & 0xc0) | init; /* initial filter value */ run_rt3070_rf_write(sc, 24, rf24); /* enable baseband loopback mode */ @@ -3796,6 +4063,86 @@ return 0; } +static void +run_rt3070_rf_setup(struct run_softc *sc) +{ + uint8_t bbp, rf; + int i; + + if (sc->mac_ver == 0x3572) { + /* enable DC filter */ + if (sc->mac_rev >= 0x0201) + run_bbp_write(sc, 103, 0xc0); + + run_bbp_read(sc, 138, &bbp); + if (sc->ntxchains == 1) + bbp |= 0x20; /* turn off DAC1 */ + if (sc->nrxchains == 1) + bbp &= ~0x02; /* turn off ADC1 */ + run_bbp_write(sc, 138, bbp); + + if (sc->mac_rev >= 0x0211) { + /* improve power consumption */ + run_bbp_read(sc, 31, &bbp); + run_bbp_write(sc, 31, bbp & ~0x03); + } + + run_rt3070_rf_read(sc, 16, &rf); + rf = (rf & ~0x07) | sc->txmixgain_2ghz; + run_rt3070_rf_write(sc, 16, rf); + + } else if (sc->mac_ver == 0x3071) { + /* enable DC filter */ + if (sc->mac_rev >= 0x0201) + run_bbp_write(sc, 103, 0xc0); + + run_bbp_read(sc, 138, &bbp); + if (sc->ntxchains == 1) + bbp |= 0x20; /* turn off DAC1 */ + if (sc->nrxchains == 1) + bbp &= ~0x02; /* turn off ADC1 */ + run_bbp_write(sc, 138, bbp); + + if (sc->mac_rev >= 0x0211) { + /* improve power consumption */ + run_bbp_read(sc, 31, &bbp); + run_bbp_write(sc, 31, bbp & ~0x03); + } + + run_write(sc, RT2860_TX_SW_CFG1, 0); + if (sc->mac_rev < 0x0211) { + run_write(sc, RT2860_TX_SW_CFG2, + sc->patch_dac ? 0x2c : 0x0f); + } else + run_write(sc, RT2860_TX_SW_CFG2, 0); + + } else if (sc->mac_ver == 0x3070) { + if (sc->mac_rev >= 0x0201) { + /* enable DC filter */ + run_bbp_write(sc, 103, 0xc0); + + /* improve power consumption */ + run_bbp_read(sc, 31, &bbp); + run_bbp_write(sc, 31, bbp & ~0x03); + } + + if (sc->mac_rev < 0x0211) { + run_write(sc, RT2860_TX_SW_CFG1, 0); + run_write(sc, RT2860_TX_SW_CFG2, 0x2c); + } else + run_write(sc, RT2860_TX_SW_CFG2, 0); + } + + /* initialize RF registers from ROM for >=RT3071*/ + if (sc->mac_ver >= 0x3071) { + for (i = 0; i < 10; i++) { + if (sc->rf[i].reg == 0 || sc->rf[i].reg == 0xff) + continue; + run_rt3070_rf_write(sc, sc->rf[i].reg, sc->rf[i].val); + } + } +} + static int run_txrx_enable(struct run_softc *sc) { @@ -3916,12 +4263,10 @@ run_write(sc, RT2860_WMM_CWMIN_CFG, 0x00002344); run_write(sc, RT2860_WMM_CWMAX_CFG, 0x000034aa); - if ((sc->mac_rev >> 16) >= 0x3070) { + if (sc->mac_ver >= 0x3070) { /* set delay of PA_PE assertion to 1us (unit of 0.25us) */ run_write(sc, RT2860_TX_SW_CFG0, 4 << RT2860_DLY_PAPE_EN_SHIFT); - run_write(sc, RT2860_TX_SW_CFG1, 0); - run_write(sc, RT2860_TX_SW_CFG2, 0x1f); } /* wait while MAC is busy */ @@ -3965,7 +4310,7 @@ tmp = (tmp & ~0xff) | 0x1e; run_write(sc, RT2860_US_CYC_CNT, tmp); - if ((sc->mac_rev >> 16) == 0x2860 && (sc->mac_rev & 0xffff) != 0x0101) + if (sc->mac_rev != 0x0101) run_write(sc, RT2860_TXOP_CTRL_CFG, 0x0000583f); run_write(sc, RT2860_WMM_TXOP0_CFG, 0); @@ -3987,6 +4332,9 @@ (void)run_mcu_cmd(sc, RT2860_MCU_CMD_LED2, sc->led[1]); (void)run_mcu_cmd(sc, RT2860_MCU_CMD_LED3, sc->led[2]); + if (sc->mac_ver >= 0x3070) + run_rt3070_rf_init(sc); + /* disable non-existing Rx chains */ run_bbp_read(sc, 3, &bbp3); bbp3 &= ~(1 << 3 | 1 << 4); @@ -4002,8 +4350,8 @@ bbp1 &= ~(1 << 3 | 1 << 4); run_bbp_write(sc, 1, bbp1); - if ((sc->mac_rev >> 16) >= 0x3070) - run_rt3070_rf_init(sc); + if (sc->mac_ver >= 0x3070) + run_rt3070_rf_setup(sc); /* select default channel */ vap->iv_bss->ni_chan = ic->ic_curchan; /* ic_bsschan?? */ ==== //depot/projects/usb/src/sys/dev/usb/wlan/if_runreg.h#3 (text+ko) ==== @@ -308,7 +308,8 @@ #define RT2860_MCU_CMD_LED1 0x52 >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Feb 21 08:55:13 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E60E0106568B; Sun, 21 Feb 2010 08:55:12 +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 AA7FA1065679 for ; Sun, 21 Feb 2010 08:55:12 +0000 (UTC) (envelope-from hselasky@c2i.net) Received: from swip.net (mailfe16.tele2.se [212.247.155.225]) by mx1.freebsd.org (Postfix) with ESMTP id 3A23F8FC08 for ; Sun, 21 Feb 2010 08:55:11 +0000 (UTC) X-Cloudmark-Score: 0.000000 [] X-Cloudmark-Analysis: v=1.0 c=1 a=XkPx-1urvFYA:10 a=RERtC8nhXGhYvIZhK0yWrQ==:17 a=6I5d2MoRAAAA:8 a=4drialKKb7EHqOv8wZ0A:9 a=jZy74iK1Y61zgZPAcI4A:7 a=AnvKauN3_cc417dWZyT-GpGh4kkA:4 Received: from [90.149.203.35] (account mc467741@c2i.net HELO laptop002.hselasky.homeunix.org) by mailfe16.swip.net (CommuniGate Pro SMTP 5.2.19) with ESMTPA id 602319189 for perforce@freebsd.org; Sun, 21 Feb 2010 09:55:09 +0100 From: Hans Petter Selasky To: Perforce Change Reviews Date: Sun, 21 Feb 2010 09:53:40 +0100 User-Agent: KMail/1.12.4 (FreeBSD/8.0-STABLE; KDE/4.3.4; amd64; ; ) References: <201002210853.o1L8rXij054451@repoman.freebsd.org> In-Reply-To: <201002210853.o1L8rXij054451@repoman.freebsd.org> X-Face: +~\`s("[*|O,="7?X@L.elg*F"OA\I/3%^p8g?ab%RN'(; _IjlA: hGE..Ew, XAQ*o#\/M~SC=S1-f9{EzRfT'|Hhll5Q]ha5Bt-s|oTlKMusi:1e[wJl}kd}GR Z0adGx-x_0zGbZj'e(Y[(UNle~)8CQWXW@:DX+9)_YlB[tIccCPN$7/L' MIME-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-15" Content-Transfer-Encoding: 7bit Message-Id: <201002210953.40178.hselasky@c2i.net> Cc: Subject: Re: PERFORCE change 174936 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: Sun, 21 Feb 2010 08:55:13 -0000 On Sunday 21 February 2010 09:53:33 Hans Petter Selasky wrote: > http://p4web.freebsd.org/chv.cgi?CH=174936 > > Change 174936 by hselasky@hselasky_laptop001 on 2010/02/21 08:52:41 > > > USB WLAN: > - integrate latest driver code from OpenBSD. > - patch by: Akinori > summary of changes applied OpenBSD commit Revision 1.36-1.57 * some Tx optimization * added RT3572 specific functions * better filter calibration for >= RT3071 * read more vendor settings for >= RT3070 * fixed the initial AGC value for >=RT3070 * use new command to select antenna (new firmware required) * added more channels for dual-band devices * added another device ID * firmware update RT2870 v. 0.12 -> 0.17 RT3071 v. 0.02 -> 0.17 * code clean up firmware update RT2870 v. 0.12 -> v. 0.17 RT3071 v. 0.02 -> v. 0.17 changed nonsense comment --HPS From owner-p4-projects@FreeBSD.ORG Mon Feb 22 08:43:28 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2D2F81065676; Mon, 22 Feb 2010 08:43:28 +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 CCD03106566B for ; Mon, 22 Feb 2010 08:43:27 +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 B85DB8FC0A for ; Mon, 22 Feb 2010 08:43:27 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o1M8hRHf039884 for ; Mon, 22 Feb 2010 08:43:27 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o1M8hReD039882 for perforce@freebsd.org; Mon, 22 Feb 2010 08:43:27 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 22 Feb 2010 08:43:27 GMT Message-Id: <201002220843.o1M8hReD039882@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 Precedence: bulk Cc: Subject: PERFORCE change 174961 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Feb 2010 08:43:28 -0000 http://p4web.freebsd.org/chv.cgi?CH=174961 Change 174961 by hselasky@hselasky_laptop001 on 2010/02/22 08:43:15 USB WLAN: - whitespace/style changes patch from Akinori. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/wlan/if_run.c#6 edit .. //depot/projects/usb/src/sys/dev/usb/wlan/if_runvar.h#5 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/wlan/if_run.c#6 (text+ko) ==== @@ -274,106 +274,110 @@ static usb_callback_t run_bulk_tx_callback4; static usb_callback_t run_bulk_tx_callback5; -static void run_bulk_tx_callbackN(struct usb_xfer *xfer, - usb_error_t error, unsigned int index); +static void run_bulk_tx_callbackN(struct usb_xfer *xfer, + usb_error_t error, unsigned int index); static struct ieee80211vap *run_vap_create(struct ieee80211com *, - const char name[IFNAMSIZ], int unit, int opmode, - int flags, const uint8_t bssid[IEEE80211_ADDR_LEN], - const uint8_t mac[IEEE80211_ADDR_LEN]); -static void run_vap_delete(struct ieee80211vap *); -static void run_setup_tx_list(struct run_softc *sc, struct run_endpoint_queue *pq); -static void run_unsetup_tx_list(struct run_softc *sc, struct run_endpoint_queue *pq); -static int run_load_microcode(struct run_softc *); -static int run_reset(struct run_softc *); -static usb_error_t run_do_request(struct run_softc *sc, - struct usb_device_request *req, void *data); -static int run_read(struct run_softc *, uint16_t, uint32_t *); -static int run_read_region_1(struct run_softc *, uint16_t, uint8_t *, - int); -static int run_write_2(struct run_softc *, uint16_t, uint16_t); -static int run_write(struct run_softc *, uint16_t, uint32_t); -static int run_write_region_1(struct run_softc *, uint16_t, - const uint8_t *, int); -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_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 *); -static int run_bbp_write(struct run_softc *, uint8_t, uint8_t); -static int run_mcu_cmd(struct run_softc *, uint8_t, uint16_t); -static const char * run_get_rf(int); -static int run_read_eeprom(struct run_softc *); + const char name[IFNAMSIZ], int unit, int opmode, int flags, + const uint8_t bssid[IEEE80211_ADDR_LEN], const uint8_t + mac[IEEE80211_ADDR_LEN]); +static void run_vap_delete(struct ieee80211vap *); +static void run_setup_tx_list(struct run_softc *, + struct run_endpoint_queue *); +static void run_unsetup_tx_list(struct run_softc *, + struct run_endpoint_queue *); +static int run_load_microcode(struct run_softc *); +static int run_reset(struct run_softc *); +static usb_error_t run_do_request(struct run_softc *, + struct usb_device_request *, void *); +static int run_read(struct run_softc *, uint16_t, uint32_t *); +static int run_read_region_1(struct run_softc *, uint16_t, uint8_t *, int); +static int run_write_2(struct run_softc *, uint16_t, uint16_t); +static int run_write(struct run_softc *, uint16_t, uint32_t); +static int run_write_region_1(struct run_softc *, uint16_t, + const uint8_t *, int); +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_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 *); +static int run_bbp_write(struct run_softc *, uint8_t, uint8_t); +static int run_mcu_cmd(struct run_softc *, uint8_t, uint16_t); +static const char *run_get_rf(int); +static int run_read_eeprom(struct run_softc *); static struct ieee80211_node *run_node_alloc(struct ieee80211vap *, const uint8_t mac[IEEE80211_ADDR_LEN]); -static int run_media_change(struct ifnet *); -static int run_newstate(struct ieee80211vap *, enum ieee80211_state, int); -static int run_wme_update(struct ieee80211com *); -static void run_wme_update_cb(void *, int); -static void run_key_update_begin(struct ieee80211vap *); -static void run_key_update_end(struct ieee80211vap *); -static int run_key_set(struct ieee80211vap *, const struct ieee80211_key *, +static int run_media_change(struct ifnet *); +static int run_newstate(struct ieee80211vap *, enum ieee80211_state, int); +static int run_wme_update(struct ieee80211com *); +static void run_wme_update_cb(void *, int); +static void run_key_update_begin(struct ieee80211vap *); +static void run_key_update_end(struct ieee80211vap *); +static int run_key_set(struct ieee80211vap *, const struct ieee80211_key *, const uint8_t mac[IEEE80211_ADDR_LEN]); -static int run_key_delete(struct ieee80211vap *, const struct ieee80211_key *); -static void run_amrr_start(struct run_softc *, struct ieee80211_node *); -static void run_amrr_to(void *); -static void run_amrr_cb(void *, int); -static void run_iter_func(void *, struct ieee80211_node *); -static void run_newassoc(struct ieee80211_node *, int); -static void run_rx_frame(struct run_softc *, struct mbuf *, uint32_t); -static void run_tx_free(struct run_endpoint_queue *pq, struct run_tx_data *, int); -static void run_set_tx_desc(struct run_softc *, struct run_tx_data *, - uint8_t, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t); -static int run_tx(struct run_softc *, struct mbuf *, - struct ieee80211_node *); -static int run_tx_mgt(struct run_softc *, struct mbuf *, struct ieee80211_node *); -static int run_sendprot(struct run_softc *, const struct mbuf *, - struct ieee80211_node *, int, int); -static int run_tx_param(struct run_softc *, struct mbuf *, - struct ieee80211_node *, const struct ieee80211_bpf_params *); -static int run_raw_xmit(struct ieee80211_node *, struct mbuf *, - const struct ieee80211_bpf_params *); -static void run_start(struct ifnet *); -static int run_ioctl(struct ifnet *, u_long, caddr_t); -static void run_select_chan_group(struct run_softc *, int); -static void run_set_rx_antenna(struct run_softc *, int); -static void run_rt2870_set_chan(struct run_softc *, u_int); -static void run_rt3070_set_chan(struct run_softc *, u_int); -static int run_set_chan(struct run_softc *, struct ieee80211_channel *); -static void run_set_agc(struct run_softc *, uint8_t); -static void run_set_channel(struct ieee80211com *); -static void run_scan_start(struct ieee80211com *); -static void run_scan_end(struct ieee80211com *); -static uint8_t run_rate2mcs(uint8_t rate); -static void run_rt3572_set_chan(struct run_softc *, u_int); -static void run_update_beacon(struct ieee80211vap *, int); -static void run_update_beacon_locked(struct ieee80211vap *, int); -static void run_updateprot(struct ieee80211com *ic); -static void run_usb_timeout_cb(void *, int); -static void run_reset_livelock(struct run_softc *); -static void run_enable_tsf_sync(struct run_softc *); -static void run_enable_mrr(struct run_softc *); -static void run_set_txpreamble(struct run_softc *); -static void run_set_basicrates(struct run_softc *); -static void run_set_leds(struct run_softc *, uint16_t); -static void run_set_bssid(struct run_softc *, const uint8_t *); -static void run_set_macaddr(struct run_softc *, const uint8_t *); -static void run_updateslot(struct ifnet *); -static void run_update_mcast(struct ifnet *); -static int8_t run_rssi2dbm(struct run_softc *, uint8_t, uint8_t); -static void run_update_promisc_locked(struct ifnet *); -static void run_update_promisc(struct ifnet *); -static int run_bbp_init(struct run_softc *); -static int run_rt3070_rf_init(struct run_softc *); -static int run_rt3070_filter_calib(struct run_softc *, uint8_t, uint8_t, - uint8_t *); -static int run_txrx_enable(struct run_softc *); -static void run_init(void *); -static void run_init_locked(struct run_softc *); -static void run_stop(void *); -static void run_rt3070_rf_setup(struct run_softc *); -static void run_delay(struct run_softc *, unsigned int); +static int run_key_delete(struct ieee80211vap *, + const struct ieee80211_key *); +static void run_amrr_start(struct run_softc *, struct ieee80211_node *); +static void run_amrr_to(void *); +static void run_amrr_cb(void *, int); +static void run_iter_func(void *, struct ieee80211_node *); +static void run_newassoc(struct ieee80211_node *, int); +static void run_rx_frame(struct run_softc *, struct mbuf *, uint32_t); +static void run_tx_free(struct run_endpoint_queue *pq, + struct run_tx_data *, int); +static void run_set_tx_desc(struct run_softc *, struct run_tx_data *, + uint8_t, uint8_t, uint8_t, uint8_t, uint8_t, uint8_t); +static int run_tx(struct run_softc *, struct mbuf *, + struct ieee80211_node *); +static int run_tx_mgt(struct run_softc *, struct mbuf *, + struct ieee80211_node *); +static int run_sendprot(struct run_softc *, const struct mbuf *, + struct ieee80211_node *, int, int); +static int run_tx_param(struct run_softc *, struct mbuf *, + struct ieee80211_node *, + const struct ieee80211_bpf_params *); +static int run_raw_xmit(struct ieee80211_node *, struct mbuf *, + const struct ieee80211_bpf_params *); +static void run_start(struct ifnet *); +static int run_ioctl(struct ifnet *, u_long, caddr_t); +static void run_set_agc(struct run_softc *, uint8_t); +static void run_select_chan_group(struct run_softc *, int); +static void run_set_rx_antenna(struct run_softc *, int); +static void run_rt2870_set_chan(struct run_softc *, u_int); +static void run_rt3070_set_chan(struct run_softc *, u_int); +static void run_rt3572_set_chan(struct run_softc *, u_int); +static int run_set_chan(struct run_softc *, struct ieee80211_channel *); +static void run_set_channel(struct ieee80211com *); +static void run_scan_start(struct ieee80211com *); +static void run_scan_end(struct ieee80211com *); +static uint8_t run_rate2mcs(uint8_t); +static void run_update_beacon(struct ieee80211vap *, int); +static void run_update_beacon_locked(struct ieee80211vap *, int); +static void run_updateprot(struct ieee80211com *); +static void run_usb_timeout_cb(void *, int); +static void run_reset_livelock(struct run_softc *); +static void run_enable_tsf_sync(struct run_softc *); +static void run_enable_mrr(struct run_softc *); +static void run_set_txpreamble(struct run_softc *); +static void run_set_basicrates(struct run_softc *); +static void run_set_leds(struct run_softc *, uint16_t); +static void run_set_bssid(struct run_softc *, const uint8_t *); +static void run_set_macaddr(struct run_softc *, const uint8_t *); +static void run_updateslot(struct ifnet *); +static int8_t run_rssi2dbm(struct run_softc *, uint8_t, uint8_t); +static void run_update_promisc_locked(struct ifnet *); +static void run_update_promisc(struct ifnet *); +static int run_bbp_init(struct run_softc *); +static int run_rt3070_rf_init(struct run_softc *); +static int run_rt3070_filter_calib(struct run_softc *, uint8_t, uint8_t, + uint8_t *); +static void run_rt3070_rf_setup(struct run_softc *); +static int run_txrx_enable(struct run_softc *); +static void run_init(void *); +static void run_init_locked(struct run_softc *); +static void run_stop(void *); +static void run_delay(struct run_softc *, unsigned int); static const struct { uint32_t reg; @@ -500,13 +504,13 @@ static int run_attach(device_t self) { - struct run_softc *sc = device_get_softc(self); - struct usb_attach_arg *uaa = device_get_ivars(self); - struct ieee80211com *ic; - struct ifnet *ifp; + struct run_softc *sc = device_get_softc(self); + struct usb_attach_arg *uaa = device_get_ivars(self); + struct ieee80211com *ic; + struct ifnet *ifp; uint32_t ver; - int i, ntries, error; - uint8_t iface_index, bands; + int i, ntries, error; + uint8_t iface_index, bands; device_set_usb_desc(self); sc->sc_udev = uaa->device; @@ -537,8 +541,8 @@ run_delay(sc, 10); } if (ntries == 100) { - printf("%s: timeout waiting for NIC to initialize\n", - device_get_nameunit(sc->sc_dev)); + device_printf(sc->sc_dev, + "timeout waiting for NIC to initialize\n"); RUN_UNLOCK(sc); goto detach; } @@ -548,14 +552,13 @@ /* retrieve RF rev. no and various other things from EEPROM */ run_read_eeprom(sc); - printf("%s: MAC/BBP RT%04X (rev 0x%04X), RF %s (MIMO %dT%dR), " - "address %s\n", device_get_nameunit(sc->sc_dev), sc->mac_ver, - sc->mac_rev, run_get_rf(sc->rf_rev), sc->ntxchains, - sc->nrxchains, ether_sprintf(sc->sc_bssid)); + device_printf(sc->sc_dev, + "MAC/BBP RT%04X (rev 0x%04X), RF %s (MIMO %dT%dR), address %s\n", + sc->mac_ver, sc->mac_rev, run_get_rf(sc->rf_rev), + sc->ntxchains, sc->nrxchains, ether_sprintf(sc->sc_bssid)); if ((error = run_load_microcode(sc)) != 0) { - printf("%s: could not load 8051 microcode\n", - device_get_nameunit(sc->sc_dev)); + device_printf(sc->sc_dev, "could not load 8051 microcode\n"); RUN_UNLOCK(sc); goto detach; } @@ -564,8 +567,7 @@ ifp = sc->sc_ifp = if_alloc(IFT_IEEE80211); if(ifp == NULL){ - printf("%s: can not if_alloc()\n", - device_get_nameunit(sc->sc_dev)); + device_printf(sc->sc_dev, "can not if_alloc()\n"); goto detach; } ic = ifp->if_l2com; @@ -637,7 +639,6 @@ ic->ic_set_channel = run_set_channel; ic->ic_node_alloc = run_node_alloc; ic->ic_newassoc = run_newassoc; - ic->ic_update_mcast = run_update_mcast; //ic->ic_updateslot = run_updateslot; ic->ic_wme.wme_update = run_wme_update; ic->ic_raw_xmit = run_raw_xmit; @@ -665,9 +666,9 @@ static int run_detach(device_t self) { - struct run_softc *sc = device_get_softc(self); - struct ifnet *ifp = sc->sc_ifp; - struct ieee80211com *ic; + struct run_softc *sc = device_get_softc(self); + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211com *ic; int i; /* stop all USB transfers */ @@ -696,9 +697,9 @@ const uint8_t bssid[IEEE80211_ADDR_LEN], const uint8_t mac[IEEE80211_ADDR_LEN]) { - struct run_softc *sc = ic->ic_ifp->if_softc; - struct run_vap *rvp; - struct ieee80211vap *vap; + struct run_softc *sc = ic->ic_ifp->if_softc; + struct run_vap *rvp; + struct ieee80211vap *vap; if (!TAILQ_EMPTY(&ic->ic_vaps)) /* only one at a time */ return NULL; @@ -739,10 +740,10 @@ static void run_vap_delete(struct ieee80211vap *vap) { - struct run_vap *rvp = RUN_VAP(vap); - struct ifnet *ifp; - struct ieee80211com *ic; - struct run_softc *sc; + struct run_vap *rvp = RUN_VAP(vap); + struct ifnet *ifp; + struct ieee80211com *ic; + struct run_softc *sc; if(vap == NULL) return; @@ -809,21 +810,26 @@ int run_load_microcode(struct run_softc *sc) { - usb_device_request_t req; - const u_char *base; - uint32_t tmp; - int ntries, error; + usb_device_request_t req; + const struct firmware *fw; + const u_char *base; + uint32_t tmp; + int ntries, error; + const uint64_t *temp; + uint64_t bytes; - if((sc->fwp = firmware_get("runfw")) == NULL){ - printf("%s: failed loadfirmware of file %s (error %d)\n", - device_get_nameunit(sc->sc_dev), "runfw", ENOENT); + fw = firmware_get("runfw"); + if(fw == NULL){ + device_printf(sc->sc_dev, + "failed loadfirmware of file %s\n", "runfw"); return ENOENT; } - if (sc->fwp->datasize != 8192) { - printf("%s: invalid firmware size (should be 8KB)\n", - device_get_nameunit(sc->sc_dev)); - return EINVAL; + if (fw->datasize != 8192) { + device_printf(sc->sc_dev, + "invalid firmware size (should be 8KB)\n"); + error = EINVAL; + goto fail; } /* @@ -832,22 +838,23 @@ * first half (4KB) is for rt2870, * last half is for rt3071. */ - base = sc->fwp->data; + base = fw->data; if ((sc->mac_ver) != 0x2860 && (sc->mac_ver) != 0x2872 && (sc->mac_ver) != 0x3070){ base += 4096; - printf("%s: You are using firmware RT3071.\n", - device_get_nameunit(sc->sc_dev)); + device_printf(sc->sc_dev, "loading RT3071 firmware\n"); } else - printf("%s: You are using firmware RT2870.\n", - device_get_nameunit(sc->sc_dev)); + device_printf(sc->sc_dev, "loading RT2870 firmware\n"); /* cheap sanity check */ - const uint64_t *temp = sc->fwp->data; - uint64_t bytes = *temp; - if(bytes != be64toh(0xffffff0210280210)) - return EINVAL; + temp = fw->data; + bytes = *temp; + if(bytes != be64toh(0xffffff0210280210)) { + device_printf(sc->sc_dev, "firmware checksum failed\n"); + error = EINVAL; + goto fail; + } run_read(sc, RT2860_ASIC_VER_ID, &tmp); /* write microcode image */ @@ -860,31 +867,37 @@ USETW(req.wValue, 8); USETW(req.wIndex, 0); USETW(req.wLength, 0); - if ((error = usbd_do_request(sc->sc_udev, &sc->sc_mtx, &req, NULL)) != 0) - return error; + if ((error = usbd_do_request(sc->sc_udev, &sc->sc_mtx, &req, NULL)) != 0) { + device_printf(sc->sc_dev, "firmware reset failed\n"); + goto fail; + } run_delay(sc, 10); run_write(sc, RT2860_H2M_MAILBOX, 0); if ((error = run_mcu_cmd(sc, RT2860_MCU_CMD_RFRESET, 0)) != 0) - return error; + goto fail; /* wait until microcontroller is ready */ for (ntries = 0; ntries < 1000; ntries++) { - if ((error = run_read(sc, RT2860_SYS_CTRL, &tmp)) != 0) - return error; + if ((error = run_read(sc, RT2860_SYS_CTRL, &tmp)) != 0) { + goto fail; + } if (tmp & RT2860_MCU_READY) break; run_delay(sc, 10); } if (ntries == 1000) { - printf("%s: timeout waiting for MCU to initialize\n", - device_get_nameunit(sc->sc_dev)); - return ETIMEDOUT; + device_printf(sc->sc_dev, + "timeout waiting for MCU to initialize\n"); + error = ETIMEDOUT; + goto fail; } DPRINTF("microcode successfully loaded after %d tries\n", ntries); - return 0; +fail: + firmware_put(fw, FIRMWARE_UNLOAD); + return (error); } int @@ -1272,10 +1285,10 @@ int run_read_eeprom(struct run_softc *sc) { - int8_t delta_2ghz, delta_5ghz; - uint32_t tmp; - uint16_t val; - int ridx, ant, i; + int8_t delta_2ghz, delta_5ghz; + uint32_t tmp; + uint16_t val; + int ridx, ant, i; /* check whether the ROM is eFUSE ROM or EEPROM */ sc->sc_srom_read = run_eeprom_read_2; @@ -1324,7 +1337,7 @@ sc->freq = ((val & 0xff) != 0xff) ? val & 0xff : 0; DPRINTF("EEPROM freq offset %d\n", sc->freq & 0xff); - if ((val >> 8) != 0xff) { + if (val >> 8 != 0xff) { /* read LEDs operating mode */ sc->leds = val >> 8; run_srom_read(sc, RT2860_EEPROM_LED1, &sc->led[0]); @@ -1528,12 +1541,12 @@ static int run_media_change(struct ifnet *ifp) { - const struct ieee80211_txparam *tp; - struct run_softc *sc = ifp->if_softc; - struct ieee80211com *ic = sc->sc_ifp->if_l2com; - struct ieee80211vap *vap = &sc->sc_rvp->vap; - uint8_t rate, ridx; - int error; + const struct ieee80211_txparam *tp; + struct run_softc *sc = ifp->if_softc; + struct ieee80211com *ic = sc->sc_ifp->if_l2com; + struct ieee80211vap *vap = &sc->sc_rvp->vap; + uint8_t rate, ridx; + int error; RUN_LOCK(sc); @@ -1565,14 +1578,14 @@ static int run_newstate(struct ieee80211vap *vap, enum ieee80211_state nstate, int arg) { - const struct ieee80211_txparam *tp; - struct ieee80211com *ic = vap->iv_ic; - struct run_softc *sc = ic->ic_ifp->if_softc; - struct run_vap *rvp = RUN_VAP(vap); - enum ieee80211_state ostate; - struct ieee80211_node *ni; - uint32_t tmp; - uint8_t wcid; + const struct ieee80211_txparam *tp; + struct ieee80211com *ic = vap->iv_ic; + struct run_softc *sc = ic->ic_ifp->if_softc; + struct run_vap *rvp = RUN_VAP(vap); + enum ieee80211_state ostate; + struct ieee80211_node *ni; + uint32_t tmp; + uint8_t wcid; ostate = vap->iv_state; DPRINTF("%s -> %s\n", @@ -1654,7 +1667,7 @@ static int run_wme_update(struct ieee80211com *ic) { - struct run_softc *sc = ic->ic_ifp->if_softc; + struct run_softc *sc = ic->ic_ifp->if_softc; ieee80211_runtask(ic, &sc->wme_task); @@ -1666,9 +1679,9 @@ static void run_wme_update_cb(void *arg, int pending) { - struct ieee80211com *ic = arg; - struct run_softc *sc = ic->ic_ifp->if_softc; - struct ieee80211_wme_state *wmesp = &ic->ic_wme; + struct ieee80211com *ic = arg; + struct run_softc *sc = ic->ic_ifp->if_softc; + struct ieee80211_wme_state *wmesp = &ic->ic_wme; int aci, error = 0; RUN_LOCK(sc); @@ -1743,14 +1756,14 @@ run_key_set(struct ieee80211vap *vap, const struct ieee80211_key *k, const uint8_t mac[IEEE80211_ADDR_LEN]) { - struct ieee80211com *ic = vap->iv_ic; - struct ifnet *ifp = ic->ic_ifp; - struct run_softc *sc = ifp->if_softc; - struct ieee80211_node *ni; - uint32_t attr; - uint16_t base, associd; - uint8_t mode, wcid, txmic, rxmic, iv[8]; - int error = 0; + struct ieee80211com *ic = vap->iv_ic; + struct ifnet *ifp = ic->ic_ifp; + struct run_softc *sc = ifp->if_softc; + struct ieee80211_node *ni; + uint32_t attr; + uint16_t base, associd; + uint8_t mode, wcid, txmic, rxmic, iv[8]; + int error = 0; RUN_LOCK(sc); @@ -1868,14 +1881,14 @@ static int run_key_delete(struct ieee80211vap *vap, const struct ieee80211_key *k) { - struct ieee80211com *ic = vap->iv_ic; - struct run_softc *sc = ic->ic_ifp->if_softc; - struct ieee80211_node *ni = vap->iv_bss; - struct ieee80211_node_table *nt = &ic->ic_sta; + struct ieee80211com *ic = vap->iv_ic; + struct run_softc *sc = ic->ic_ifp->if_softc; + struct ieee80211_node *ni = vap->iv_bss; + struct ieee80211_node_table *nt = &ic->ic_sta; uint32_t attr; uint8_t wcid; - int error = 0; - uint8_t nislocked, cislocked; + int error = 0; + uint8_t nislocked, cislocked; if((nislocked = IEEE80211_NODE_IS_LOCKED(nt))) IEEE80211_NODE_UNLOCK(nt); @@ -1913,10 +1926,10 @@ static void run_amrr_start(struct run_softc *sc, struct ieee80211_node *ni) { - struct ieee80211vap *vap = ni->ni_vap; - struct run_vap *rvp = RUN_VAP(vap); - uint32_t sta[3]; - uint8_t wcid; + struct ieee80211vap *vap = ni->ni_vap; + struct run_vap *rvp = RUN_VAP(vap); + uint32_t sta[3]; + uint8_t wcid; RUN_LOCK_ASSERT(sc, MA_OWNED); @@ -1938,7 +1951,7 @@ static void run_amrr_to(void *arg) { - struct run_vap *rvp = arg; + struct run_vap *rvp = arg; /* do it in a process context, so it can go sleep */ ieee80211_runtask(rvp->vap.iv_ic, &rvp->amrr_task); @@ -1949,10 +1962,10 @@ static void run_amrr_cb(void *arg, int pending) { - struct run_vap *rvp = arg; - struct ieee80211vap *vap = &rvp->vap; - struct ieee80211com *ic = vap->iv_ic; - struct run_softc *sc = ic->ic_ifp->if_softc; + struct run_vap *rvp = arg; + struct ieee80211vap *vap = &rvp->vap; + struct ieee80211com *ic = vap->iv_ic; + struct run_softc *sc = ic->ic_ifp->if_softc; if (ic->ic_opmode == IEEE80211_M_STA) run_iter_func(rvp, vap->iv_bss); @@ -1978,15 +1991,15 @@ static void run_iter_func(void *arg, struct ieee80211_node *ni) { - struct run_vap *rvp = arg; - struct ieee80211com *ic = rvp->vap.iv_ic; - struct ifnet *ifp = ic->ic_ifp; - struct run_softc *sc = ifp->if_softc; - struct ieee80211_node_table *nt = &ic->ic_sta; - struct ieee80211_amrr_node *amn = &rvp->amn[0]; /* make compiler happy */ - uint32_t sta[3], stat; - int error; - uint8_t wcid, mcs, pid; + struct run_vap *rvp = arg; + struct ieee80211com *ic = rvp->vap.iv_ic; + struct ifnet *ifp = ic->ic_ifp; + struct run_softc *sc = ifp->if_softc; + struct ieee80211_node_table *nt = &ic->ic_sta; + struct ieee80211_amrr_node *amn = &rvp->amn[0]; /* make compiler happy */ + uint32_t sta[3], stat; + int error; + uint8_t wcid, mcs, pid; if(ic->ic_opmode != IEEE80211_M_STA) IEEE80211_NODE_ITERATE_UNLOCK(nt); @@ -2011,11 +2024,11 @@ if (stat & RT2860_TXQ_OK) { amn->amn_success++; /* - * Check if there were retries, ie if the Tx success - * rate is different from the requested rate. Note - * that it works only because we do not allow rate - * fallback from OFDM to CCK. - */ + * Check if there were retries, ie if the Tx + * success rate is different from the requested + * rate. Note that it works only because we do + * not allow rate fallback from OFDM to CCK. + */ mcs = (stat >> RT2860_TXQ_MCS_SHIFT) & 0x7f; pid = (stat >> RT2860_TXQ_PID_SHIFT) & 0xf; if (mcs + 1 != pid) @@ -2024,7 +2037,8 @@ amn->amn_retrycnt++; ifp->if_oerrors++; } - run_read_region_1(sc, RT2860_TX_STAT_FIFO, (uint8_t *)&stat, sizeof stat); + run_read_region_1(sc, RT2860_TX_STAT_FIFO, + (uint8_t *)&stat, sizeof stat); } DPRINTFN(3, "retrycnt=%d txcnt=%d success=%d\n", amn->amn_retrycnt, amn->amn_txcnt, amn->amn_success); @@ -2070,10 +2084,10 @@ static void run_newassoc(struct ieee80211_node *ni, int isnew) { - struct run_node *rn = (void *)ni; - struct ieee80211_rateset *rs = &ni->ni_rates; - uint8_t rate; - int ridx, i, j; + struct run_node *rn = (void *)ni; + struct ieee80211_rateset *rs = &ni->ni_rates; + uint8_t rate; + int ridx, i, j; DPRINTF("new assoc isnew=%d addr=%s\n", isnew, ether_sprintf(ni->ni_macaddr)); @@ -2124,17 +2138,17 @@ static void run_rx_frame(struct run_softc *sc, struct mbuf *m, uint32_t dmalen) { - struct ifnet *ifp = sc->sc_ifp; - struct ieee80211vap *vap = &sc->sc_rvp->vap; - struct ieee80211com *ic = ifp->if_l2com; - struct ieee80211_frame *wh; - struct ieee80211_node *ni; - struct rt2870_rxd *rxd; - struct rt2860_rxwi *rxwi; - uint32_t flags; - uint16_t len, phy; - uint8_t ant, rssi; - int8_t nf; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211vap *vap = &sc->sc_rvp->vap; + struct ieee80211com *ic = ifp->if_l2com; + struct ieee80211_frame *wh; + struct ieee80211_node *ni; + struct rt2870_rxd *rxd; + struct rt2860_rxwi *rxwi; + uint32_t flags; + uint16_t len, phy; + uint8_t ant, rssi; + int8_t nf; rxwi = mtod(m, struct rt2860_rxwi *); len = le16toh(rxwi->len) & 0xfff; @@ -2236,12 +2250,12 @@ static void run_bulk_rx_callback(struct usb_xfer *xfer, usb_error_t error) { - struct run_softc *sc = usbd_xfer_softc(xfer); - struct ifnet *ifp = sc->sc_ifp; - struct mbuf *m = NULL; - struct mbuf *m0; - uint32_t dmalen; - int xferlen; + struct run_softc *sc = usbd_xfer_softc(xfer); + struct ifnet *ifp = sc->sc_ifp; + struct mbuf *m = NULL; + struct mbuf *m0; + uint32_t dmalen; + int xferlen; usbd_xfer_status(xfer, &xferlen, NULL, NULL, NULL); @@ -2382,17 +2396,17 @@ static void run_bulk_tx_callbackN(struct usb_xfer *xfer, usb_error_t error, unsigned int index) { - struct run_softc *sc = usbd_xfer_softc(xfer); - struct ifnet *ifp = sc->sc_ifp; - struct run_tx_data *data; - struct ieee80211vap *vap = NULL; - struct usb_page_cache *pc; + struct run_softc *sc = usbd_xfer_softc(xfer); + struct ifnet *ifp = sc->sc_ifp; + struct run_tx_data *data; + struct ieee80211vap *vap = NULL; + struct usb_page_cache *pc; struct run_endpoint_queue *pq = &sc->sc_epq[index]; - struct mbuf *m; - usb_frlength_t size; - unsigned int len; - int actlen; - int sumlen; + struct mbuf *m; + usb_frlength_t size; + unsigned int len; + int actlen; + int sumlen; usbd_xfer_status(xfer, &actlen, &sumlen, NULL, NULL); @@ -2540,14 +2554,14 @@ uint8_t wflags, uint8_t xflags, uint8_t opflags, uint8_t dflags, uint8_t type, uint8_t pad) { - struct mbuf *m = data->m; - struct ieee80211com *ic = sc->sc_ifp->if_l2com; - struct ieee80211vap *vap = &sc->sc_rvp->vap; - struct ieee80211_frame *wh; - struct rt2870_txd *txd; - struct rt2860_txwi *txwi; - int xferlen; - uint8_t mcs; + struct mbuf *m = data->m; + struct ieee80211com *ic = sc->sc_ifp->if_l2com; + struct ieee80211vap *vap = &sc->sc_rvp->vap; + struct ieee80211_frame *wh; + struct rt2870_txd *txd; + struct rt2860_txwi *txwi; + int xferlen; + uint8_t mcs; uint8_t ridx = data->ridx; /* get MCS code from rate index */ @@ -2594,22 +2608,22 @@ static int run_tx(struct run_softc *sc, struct mbuf *m, struct ieee80211_node *ni) { - struct ieee80211com *ic = sc->sc_ifp->if_l2com; - struct ieee80211vap *vap = &sc->sc_rvp->vap; - struct ieee80211_frame *wh; - const struct ieee80211_txparam *tp; - struct run_tx_data *data; - uint16_t qos; - uint16_t dur; - uint8_t type; - uint8_t tid; - uint8_t qid; - uint8_t qflags; - uint8_t pad; - uint8_t xflags = 0; - int hasqos; - int ridx; - int ctl_ridx; + struct ieee80211com *ic = sc->sc_ifp->if_l2com; + struct ieee80211vap *vap = &sc->sc_rvp->vap; + struct ieee80211_frame *wh; + const struct ieee80211_txparam *tp; + struct run_tx_data *data; + uint16_t qos; + uint16_t dur; + uint8_t type; + uint8_t tid; + uint8_t qid; + uint8_t qflags; + uint8_t pad; + uint8_t xflags = 0; + int hasqos; + int ridx; + int ctl_ridx; RUN_LOCK_ASSERT(sc, MA_OWNED); @@ -2624,7 +2638,7 @@ * seem to have only 4 TX bulk endpoints (Fukaumi Naoki). */ if ((hasqos = IEEE80211_QOS_HAS_SEQ(wh))) { - uint8_t *frm; + uint8_t *frm; if(IEEE80211_HAS_ADDR4(wh)) frm = ((struct ieee80211_qosframe_addr4 *)wh)->i_qos; @@ -2706,16 +2720,16 @@ static int run_tx_mgt(struct run_softc *sc, struct mbuf *m, struct ieee80211_node *ni) { - const struct ieee80211_txparam *tp; - struct ifnet *ifp = sc->sc_ifp; - struct ieee80211vap *vap = ni->ni_vap; - struct ieee80211com *ic = ifp->if_l2com; - struct run_tx_data *data; - struct ieee80211_frame *wh; - int ridx; - uint16_t dur; - uint8_t type; - uint8_t xflags = 0; + const struct ieee80211_txparam *tp; + struct ifnet *ifp = sc->sc_ifp; + struct ieee80211vap *vap = ni->ni_vap; + struct ieee80211com *ic = ifp->if_l2com; + struct run_tx_data *data; + struct ieee80211_frame *wh; + int ridx; + uint16_t dur; + uint8_t type; + uint8_t xflags = 0; RUN_LOCK_ASSERT(sc, MA_OWNED); @@ -2772,19 +2786,19 @@ run_sendprot(struct run_softc *sc, const struct mbuf *m, struct ieee80211_node *ni, int prot, int rate) { - struct ieee80211com *ic = ni->ni_ic; - struct ieee80211_frame *wh; - struct run_tx_data *data; - struct mbuf *mprot; - int ridx; - int protrate; - int ackrate; - int pktlen; - int isshort; - uint16_t dur; - uint8_t type; - uint8_t wflags; - uint8_t txflags = 0; + struct ieee80211com *ic = ni->ni_ic; + struct ieee80211_frame *wh; + struct run_tx_data *data; + struct mbuf *mprot; + int ridx; + int protrate; + int ackrate; + int pktlen; + int isshort; + uint16_t dur; + uint8_t type; + uint8_t wflags; + uint8_t txflags = 0; RUN_LOCK_ASSERT(sc, MA_OWNED); @@ -2853,15 +2867,15 @@ run_tx_param(struct run_softc *sc, struct mbuf *m, struct ieee80211_node *ni, const struct ieee80211_bpf_params *params) { - struct ieee80211com *ic = ni->ni_ic; - struct ieee80211_frame *wh; - struct run_tx_data *data; - uint8_t type; - uint8_t opflags; - uint8_t txflags; - int ridx; - int rate; - int error; + struct ieee80211com *ic = ni->ni_ic; + struct ieee80211_frame *wh; + struct run_tx_data *data; + uint8_t type; + uint8_t opflags; + uint8_t txflags; + int ridx; + int rate; + int error; RUN_LOCK_ASSERT(sc, MA_OWNED); @@ -2926,9 +2940,9 @@ run_raw_xmit(struct ieee80211_node *ni, struct mbuf *m, const struct ieee80211_bpf_params *params) { - struct ifnet *ifp = ni->ni_ic->ic_ifp; - struct run_softc *sc = ifp->if_softc; - int error; + struct ifnet *ifp = ni->ni_ic->ic_ifp; + struct run_softc *sc = ifp->if_softc; + int error; RUN_LOCK(sc); @@ -2972,9 +2986,9 @@ static void run_start(struct ifnet *ifp) { - struct run_softc *sc = ifp->if_softc; - struct ieee80211_node *ni; - struct mbuf *m; + struct run_softc *sc = ifp->if_softc; + struct ieee80211_node *ni; + struct mbuf *m; RUN_LOCK(sc); @@ -3003,10 +3017,10 @@ static int run_ioctl(struct ifnet *ifp, u_long cmd, caddr_t data) { - struct run_softc *sc = ifp->if_softc; - struct ieee80211com *ic = sc->sc_ifp->if_l2com; - struct ifreq *ifr = (struct ifreq *) data; - int error = 0, startall = 0; + struct run_softc *sc = ifp->if_softc; + struct ieee80211com *ic = sc->sc_ifp->if_l2com; + struct ifreq *ifr = (struct ifreq *) data; + int error = 0, startall = 0; switch (cmd) { case SIOCSIFFLAGS: @@ -3449,7 +3463,7 @@ static void run_set_channel(struct ieee80211com *ic) { - struct run_softc *sc = ic->ic_ifp->if_softc; + struct run_softc *sc = ic->ic_ifp->if_softc; RUN_LOCK(sc); run_set_chan(sc, ic->ic_curchan); @@ -3461,8 +3475,8 @@ static void run_scan_start(struct ieee80211com *ic) { - struct run_softc *sc = ic->ic_ifp->if_softc; - uint32_t tmp; + struct run_softc *sc = ic->ic_ifp->if_softc; + uint32_t tmp; RUN_LOCK(sc); @@ -3481,7 +3495,7 @@ static void run_scan_end(struct ieee80211com *ic) { - struct run_softc *sc = ic->ic_ifp->if_softc; + struct run_softc *sc = ic->ic_ifp->if_softc; RUN_LOCK(sc); @@ -3519,11 +3533,11 @@ static void run_update_beacon_locked(struct ieee80211vap *vap, int item) { - struct ieee80211com *ic = vap->iv_ic; - struct run_softc *sc = ic->ic_ifp->if_softc; - struct rt2860_txwi txwi; - struct mbuf *m; - int rate; + struct ieee80211com *ic = vap->iv_ic; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Feb 22 08:49:34 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 562DB1065694; Mon, 22 Feb 2010 08:49:34 +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 0F4291065676 for ; Mon, 22 Feb 2010 08:49:34 +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 F04EA8FC27 for ; Mon, 22 Feb 2010 08:49:33 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o1M8nX7U050706 for ; Mon, 22 Feb 2010 08:49:33 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o1M8nXGb050704 for perforce@freebsd.org; Mon, 22 Feb 2010 08:49:33 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 22 Feb 2010 08:49:33 GMT Message-Id: <201002220849.o1M8nXGb050704@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 Precedence: bulk Cc: Subject: PERFORCE change 174962 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Feb 2010 08:49:34 -0000 http://p4web.freebsd.org/chv.cgi?CH=174962 Change 174962 by hselasky@hselasky_laptop001 on 2010/02/22 08:48:42 USB serial: - bugfix for uvisor driver - it appears that some UVISOR devices do not handle when the clear stall command is issued at the beginning of the initial IN/OUT data transfers. Reason unknown, probably firmware fault. After patch stall is only cleared on data transfer errors. PR: usb/144199 Affected files ... .. //depot/projects/usb/src/sys/dev/usb/serial/uvisor.c#17 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/serial/uvisor.c#17 (text+ko) ==== @@ -345,11 +345,6 @@ DPRINTF("could not allocate all pipes\n"); goto detach; } - /* clear stall at first run */ - mtx_lock(&sc->sc_mtx); - usbd_xfer_set_stall(sc->sc_xfer[UVISOR_BULK_DT_WR]); - usbd_xfer_set_stall(sc->sc_xfer[UVISOR_BULK_DT_RD]); - mtx_unlock(&sc->sc_mtx); error = ucom_attach(&sc->sc_super_ucom, &sc->sc_ucom, 1, sc, &uvisor_callback, &sc->sc_mtx); From owner-p4-projects@FreeBSD.ORG Mon Feb 22 11:56:51 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 172591065676; Mon, 22 Feb 2010 11:56:51 +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 CD783106566C for ; Mon, 22 Feb 2010 11:56:50 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BA08D8FC15 for ; Mon, 22 Feb 2010 11:56:50 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o1MBuosk067734 for ; Mon, 22 Feb 2010 11:56:50 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o1MBuoPa067732 for perforce@freebsd.org; Mon, 22 Feb 2010 11:56:50 GMT (envelope-from pgj@FreeBSD.org) Date: Mon, 22 Feb 2010 11:56:50 GMT Message-Id: <201002221156.o1MBuoPa067732@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 174966 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Feb 2010 11:56:51 -0000 http://p4web.freebsd.org/chv.cgi?CH=174966 Change 174966 by pgj@Binturong on 2010/02/22 11:56:43 IFC Affected files ... .. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#44 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#45 integrate .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/share/sgml/freebsd.ent#28 integrate .. //depot/projects/docproj_hu/doc/share/sgml/mirrors.xml#14 integrate .. //depot/projects/docproj_hu/www/en/donations/donors.sgml#27 integrate .. //depot/projects/docproj_hu/www/en/donations/wantlist.sgml#16 integrate .. //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#84 integrate .. //depot/projects/docproj_hu/www/share/sgml/commercial.consult.xml#21 integrate .. //depot/projects/docproj_hu/www/share/sgml/commercial.isp.xml#19 integrate .. //depot/projects/docproj_hu/www/share/sgml/events.xml#26 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#85 integrate Differences ... ==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#44 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.497 2010/02/06 18:08:09 bschmidt Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.498 2010/02/16 13:19:10 linimon Exp $ --> aaron@FreeBSD.org"> @@ -36,7 +36,7 @@ akiyama@FreeBSD.org"> -alane@FreeBSD.org"> +alane@FreeBSD.org"> alc@FreeBSD.org"> @@ -178,7 +178,7 @@ ceri@FreeBSD.org"> -cg@FreeBSD.org"> +cg@FreeBSD.org"> charnier@FreeBSD.org"> @@ -460,7 +460,7 @@ itetcu@FreeBSD.org"> -itojun@itojun.org"> +itojun@FreeBSD.org"> ivoras@FreeBSD.org"> @@ -476,7 +476,7 @@ jayanth@FreeBSD.org"> -jb@FreeBSD.org"> +jb@FreeBSD.org"> jcamou@FreeBSD.org"> @@ -544,7 +544,7 @@ jmg@FreeBSD.org"> -jmz@FreeBSD.org"> +jmz@FreeBSD.org"> joe@FreeBSD.org"> ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/handbook/mirrors/chapter.sgml#45 (text+ko) ==== @@ -1,7 +1,7 @@ + - $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.71 2010/02/06 20:35:57 jkois Exp $ + $FreeBSD: www/share/sgml/commercial.consult.xml,v 1.72 2010/02/22 07:50:17 jkois Exp $ @@ -454,6 +454,20 @@ href="mailto:info@diewebmaster.at">info@diewebmaster.at + + + EscapeBox + http://www.escapebox.net/en/ + + More than 20 years of IT experience on demand! The EscapeBox + Germany GmbH, founded in 2002, is a small but agile company that + offers IT consulting services. We can support our clients both + from remote and on location, as desired. So, if you are looking + for capable freelancers for your projects, please do not hesitate + to contact + us today! + + Essenz Consulting ==== //depot/projects/docproj_hu/www/share/sgml/commercial.isp.xml#19 (text+ko) ==== @@ -1,12 +1,12 @@ - + - $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.56 2010/02/06 11:46:12 jkois Exp $ + $FreeBSD: www/share/sgml/commercial.isp.xml,v 1.57 2010/02/22 07:50:17 jkois Exp $ @@ -142,18 +142,6 @@ - - EscapeBox - http://www.escapebox.net/ - - The ISP-in-a-Box: Managed On-Demand UNIX Servers. Time efficient and - affordable! Relevant Internet software is pre-installed and maintained - centrally. User benefit: the convenience of a homepage account, combined - with the flexibility of a dedicated server. No hassle with security - updates etc. Resellers are welcome, too. - - - LF.net Netzwerksysteme GmbH http://www.LF.net/ ==== //depot/projects/docproj_hu/www/share/sgml/events.xml#26 (text+ko) ==== @@ -10,7 +10,7 @@ - $FreeBSD: www/share/sgml/events.xml,v 1.81 2010/01/27 22:46:51 brueffer Exp $ + $FreeBSD: www/share/sgml/events.xml,v 1.82 2010/02/20 11:22:05 brueffer Exp $ @@ -158,6 +158,29 @@ from commercial vendors. + + it 360° 2010 + http://www.it360.ca/ + + 2010 + 4 + 7 + + + 2010 + 4 + 7 + + + Canada + Toronto + + IT360° Conference & Expo 2010 is an interactive experience + for IT professionals and business executives to expand their mind and + their bottom line. The BSD Certification Group will offer their BSDA + certification exam. + + OpenExpo 2010 http://www.openexpo.ch/ ==== //depot/projects/docproj_hu/www/share/sgml/news.xml#85 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.295 2010/02/13 14:47:49 bcr Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.296 2010/02/20 11:16:23 danger Exp $ @@ -36,6 +36,22 @@ 2 + 15 + + + &os; 7.3-RC1 Available + +

The first Release Candidate build for the &os;-7.3 + release cycle is now available. ISO images for Tier-1 + architectures are now available + on most of the &os; + mirror sites.

+ + + + 12 From owner-p4-projects@FreeBSD.ORG Mon Feb 22 12:02:57 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4E9E51065672; Mon, 22 Feb 2010 12:02:57 +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 12E2F1065695 for ; Mon, 22 Feb 2010 12:02:57 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 01B048FC1B for ; Mon, 22 Feb 2010 12:02:57 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o1MC2uFU068151 for ; Mon, 22 Feb 2010 12:02:56 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o1MC2uO3068149 for perforce@freebsd.org; Mon, 22 Feb 2010 12:02:56 GMT (envelope-from pgj@FreeBSD.org) Date: Mon, 22 Feb 2010 12:02:56 GMT Message-Id: <201002221202.o1MC2uO3068149@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 174967 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Feb 2010 12:02:57 -0000 http://p4web.freebsd.org/chv.cgi?CH=174967 Change 174967 by pgj@Binturong on 2010/02/22 12:01:56 MFen (doc): 1.13 -> 1.15 hu_HU.ISO8859-2/articles/version-guide/article.sgml Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/version-guide/article.sgml#10 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/version-guide/article.sgml#10 (text+ko) ==== @@ -10,7 +10,7 @@
@@ -344,12 +344,6 @@ elõre a felhasználók, a külsõ alkalmazások fejlesztõi és maguk a &os; fejlesztõi is egyaránt. - - Nem más operációs rendszerek verzióival - történõ versenyfutás, hanem ezek a - megfontolások indokolják a szándékot, - hogy a jövõben az ütemezésünket - átszervezzük. From owner-p4-projects@FreeBSD.ORG Mon Feb 22 16:08:03 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB62E106568F; Mon, 22 Feb 2010 16:08:02 +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 9DCEE106566C for ; Mon, 22 Feb 2010 16:08:02 +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 89F1B8FC12 for ; Mon, 22 Feb 2010 16:08:02 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o1MG82ZW002013 for ; Mon, 22 Feb 2010 16:08:02 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o1MG82R8002011 for perforce@freebsd.org; Mon, 22 Feb 2010 16:08:02 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 22 Feb 2010 16:08:02 GMT Message-Id: <201002221608.o1MG82R8002011@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 Precedence: bulk Cc: Subject: PERFORCE change 174973 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Feb 2010 16:08:03 -0000 http://p4web.freebsd.org/chv.cgi?CH=174973 Change 174973 by hselasky@hselasky_laptop001 on 2010/02/22 16:07:26 USB serial: - add new device ID. PR: usb/144201 Affected files ... .. //depot/projects/usb/src/sys/dev/usb/serial/uvisor.c#18 edit .. //depot/projects/usb/src/sys/dev/usb/usbdevs#107 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/serial/uvisor.c#18 (text+ko) ==== @@ -263,6 +263,7 @@ static const struct usb_device_id uvisor_devs[] = { #define UVISOR_DEV(v,p,i) { USB_VPI(USB_VENDOR_##v, USB_PRODUCT_##v##_##p, i) } UVISOR_DEV(ACEECA, MEZ1000, UVISOR_FLAG_PALM4), + UVISOR_DEV(ALPHASMART, DANA_SYNC, UVISOR_FLAG_PALM4), UVISOR_DEV(GARMIN, IQUE_3600, UVISOR_FLAG_PALM4), UVISOR_DEV(FOSSIL, WRISTPDA, UVISOR_FLAG_PALM4), UVISOR_DEV(HANDSPRING, VISOR, UVISOR_FLAG_VISOR), ==== //depot/projects/usb/src/sys/dev/usb/usbdevs#107 (text+ko) ==== @@ -407,6 +407,7 @@ vendor CENTURY 0x07f7 Century Corp vendor ZOOM 0x0803 Zoom Telephonics vendor PCS 0x0810 Personal Communication Systems +vendor ALPHASMART 0x081e AlphaSmart, Inc. vendor BROADLOGIC 0x0827 BroadLogic vendor HANDSPRING 0x082d Handspring vendor PALM 0x0830 Palm Computing @@ -893,6 +894,10 @@ /* Allied Telesyn International products */ product ALLIEDTELESYN ATUSB100 0xb100 AT-USB100 +/* AlphaSmart, Inc. products */ +product ALPHASMART DANA_KB 0xdbac AlphaSmart Dana Keyboard +product ALPHASMART DANA_SYNC 0xdf00 AlphaSmart Dana HotSync + /* Amoi products */ product AMOI H01 0x0800 H01 3G modem product AMOI H01A 0x7002 H01A 3G modem From owner-p4-projects@FreeBSD.ORG Mon Feb 22 16:20:15 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C2471065694; Mon, 22 Feb 2010 16:20:15 +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 1797F1065672 for ; Mon, 22 Feb 2010 16:20:15 +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 03BE38FC0C for ; Mon, 22 Feb 2010 16:20:15 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o1MGKEUI002962 for ; Mon, 22 Feb 2010 16:20:14 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o1MGKElW002960 for perforce@freebsd.org; Mon, 22 Feb 2010 16:20:14 GMT (envelope-from hselasky@FreeBSD.org) Date: Mon, 22 Feb 2010 16:20:14 GMT Message-Id: <201002221620.o1MGKElW002960@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 Precedence: bulk Cc: Subject: PERFORCE change 174976 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Feb 2010 16:20:15 -0000 http://p4web.freebsd.org/chv.cgi?CH=174976 Change 174976 by hselasky@hselasky_laptop001 on 2010/02/22 16:20:14 USB template bugfix: - isochronous endpoint descriptors should have two more bytes which are zero by default. - patch by HPS @ Affected files ... .. //depot/projects/usb/src/sys/dev/usb/template/usb_template.c#13 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/template/usb_template.c#13 (text+ko) ==== @@ -162,15 +162,23 @@ const void **rd; uint16_t old_size; uint16_t mps; - uint8_t ea = 0; /* Endpoint Address */ - uint8_t et = 0; /* Endpiont Type */ + uint8_t ea; /* Endpoint Address */ + uint8_t et; /* Endpiont Type */ /* Reserve memory */ old_size = temp->size; - temp->size += sizeof(*ed); + + ea = (ted->bEndpointAddress & (UE_ADDR | UE_DIR_IN | UE_DIR_OUT)); + et = (ted->bmAttributes & UE_XFERTYPE); + + if (et == UE_ISOCHRONOUS) { + /* account for extra byte fields */ + temp->size += sizeof(*ed) + 2; + } else { + temp->size += sizeof(*ed); + } /* Scan all Raw Descriptors first */ - rd = ted->ppRawDesc; if (rd) { while (*rd) { @@ -192,8 +200,6 @@ /* escape for Zero Max Packet Size */ mps = 0; } - ea = (ted->bEndpointAddress & (UE_ADDR | UE_DIR_IN | UE_DIR_OUT)); - et = (ted->bmAttributes & UE_XFERTYPE); /* * Fill out the real USB endpoint descriptor @@ -201,7 +207,10 @@ */ if (temp->buf) { ed = USB_ADD_BYTES(temp->buf, old_size); - ed->bLength = sizeof(*ed); + if (et == UE_ISOCHRONOUS) + ed->bLength = sizeof(*ed) + 2; + else + ed->bLength = sizeof(*ed); ed->bDescriptorType = UDESC_ENDPOINT; ed->bEndpointAddress = ea; ed->bmAttributes = ted->bmAttributes; From owner-p4-projects@FreeBSD.ORG Tue Feb 23 07:13:11 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A9B391065670; Tue, 23 Feb 2010 07:13:11 +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 6BECE106568D for ; Tue, 23 Feb 2010 07:13:11 +0000 (UTC) (envelope-from mav@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 57EAE8FC13 for ; Tue, 23 Feb 2010 07:13:11 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o1N7DBIj026953 for ; Tue, 23 Feb 2010 07:13:11 GMT (envelope-from mav@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o1N7DAHU026951 for perforce@freebsd.org; Tue, 23 Feb 2010 07:13:10 GMT (envelope-from mav@freebsd.org) Date: Tue, 23 Feb 2010 07:13:10 GMT Message-Id: <201002230713.o1N7DAHU026951@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mav@freebsd.org using -f From: Alexander Motin To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 175002 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 23 Feb 2010 07:13:12 -0000 http://p4web.freebsd.org/chv.cgi?CH=175002 Change 175002 by mav@mav_mavbook on 2010/02/23 07:12:34 IFC Affected files ... .. //depot/projects/scottl-camlock/src/MAINTAINERS#8 integrate .. //depot/projects/scottl-camlock/src/bin/rmail/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/contrib/bc/AUTHORS#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/ChangeLog#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/Examples/ckbook.b#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/Examples/pi.b#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/Examples/primes.b#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/Examples/twins.b#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/FAQ#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/FREEBSD-upgrade#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/INSTALL#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/Makefile.am#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/Makefile.in#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/NEWS#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/README#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/Test/BUG.bc#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/Test/array.b#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/Test/arrayp.b#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/Test/aryprm.b#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/Test/atan.b#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/Test/checklib.b#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/Test/div.b#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/Test/exp.b#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/Test/fact.b#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/Test/jn.b#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/Test/ln.b#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/Test/mul.b#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/Test/raise.b#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/Test/signum#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/Test/sine.b#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/Test/sqrt.b#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/Test/sqrt1.b#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/Test/sqrt2.b#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/Test/testfn.b#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/Test/timetest#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/acconfig.h#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/aclocal.m4#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/bc/Makefile.am#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/bc/Makefile.in#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/bc/bc.y#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/bc/bcdefs.h#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/bc/const.h#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/bc/execute.c#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/bc/fix-libmath_h#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/bc/global.c#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/bc/global.h#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/bc/libmath.b#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/bc/libmath.h#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/bc/load.c#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/bc/main.c#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/bc/proto.h#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/bc/sbc.y#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/bc/scan.l#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/bc/storage.c#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/bc/util.c#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/config.h.in#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/configure#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/configure.in#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/dc/Makefile.am#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/dc/Makefile.in#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/dc/array.c#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/dc/dc-proto.h#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/dc/dc-regdef.h#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/dc/dc.c#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/dc/dc.h#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/dc/eval.c#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/dc/misc.c#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/dc/numeric.c#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/dc/stack.c#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/dc/string.c#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/doc/Makefile.am#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/doc/Makefile.in#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/doc/bc.1#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/doc/bc.texi#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/doc/dc.1#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/doc/dc.texi#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/h/number.h#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/install-sh#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/lib/Makefile.am#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/lib/Makefile.in#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/lib/number.c#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/lib/testmul.c#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/lib/vfprintf.c#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/missing#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/mkinstalldirs#2 delete .. //depot/projects/scottl-camlock/src/contrib/bc/stamp-h.in#2 delete .. //depot/projects/scottl-camlock/src/contrib/gdb/gdb/config/mips/nm-fbsd.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/gdb/gdb/config/mips/tm-fbsd.h#1 branch .. //depot/projects/scottl-camlock/src/contrib/gdb/gdb/mips-tdep.h#2 integrate .. //depot/projects/scottl-camlock/src/contrib/gdb/gdb/mipsfbsd-nat.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/gdb/gdb/mipsfbsd-tdep.c#1 branch .. //depot/projects/scottl-camlock/src/contrib/gdb/gdb/mipsfbsd-tdep.h#1 branch .. //depot/projects/scottl-camlock/src/etc/defaults/rc.conf#17 integrate .. //depot/projects/scottl-camlock/src/etc/mtree/BSD.usr.dist#9 integrate .. //depot/projects/scottl-camlock/src/etc/ppp/ppp.conf#3 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/Makefile#11 integrate .. //depot/projects/scottl-camlock/src/etc/rc.d/hastd#1 branch .. //depot/projects/scottl-camlock/src/games/Makefile.inc#2 integrate .. //depot/projects/scottl-camlock/src/games/bcd/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/games/bcd/bcd.c#2 integrate .. //depot/projects/scottl-camlock/src/games/caesar/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/games/caesar/caesar.c#2 integrate .. //depot/projects/scottl-camlock/src/games/fortune/fortune/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/games/fortune/fortune/fortune.6#3 integrate .. //depot/projects/scottl-camlock/src/games/fortune/fortune/fortune.c#3 integrate .. //depot/projects/scottl-camlock/src/games/fortune/fortune/pathnames.h#2 integrate .. //depot/projects/scottl-camlock/src/games/fortune/strfile/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/games/fortune/strfile/strfile.8#2 integrate .. //depot/projects/scottl-camlock/src/games/fortune/strfile/strfile.c#4 integrate .. //depot/projects/scottl-camlock/src/games/fortune/strfile/strfile.h#2 integrate .. //depot/projects/scottl-camlock/src/games/fortune/unstr/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/games/fortune/unstr/unstr.c#3 integrate .. //depot/projects/scottl-camlock/src/games/grdc/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/games/grdc/grdc.c#3 integrate .. //depot/projects/scottl-camlock/src/games/morse/morse.c#4 integrate .. //depot/projects/scottl-camlock/src/games/number/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/games/number/number.c#4 integrate .. //depot/projects/scottl-camlock/src/games/pom/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/games/pom/pom.c#3 integrate .. //depot/projects/scottl-camlock/src/games/ppt/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/games/ppt/ppt.c#2 integrate .. //depot/projects/scottl-camlock/src/games/primes/pattern.c#2 integrate .. //depot/projects/scottl-camlock/src/games/primes/pr_tbl.c#2 integrate .. //depot/projects/scottl-camlock/src/games/primes/primes.c#2 integrate .. //depot/projects/scottl-camlock/src/games/primes/primes.h#2 integrate .. //depot/projects/scottl-camlock/src/games/random/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/games/random/random.c#3 integrate .. //depot/projects/scottl-camlock/src/gnu/usr.bin/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/gnu/usr.bin/bc/Makefile#2 delete .. //depot/projects/scottl-camlock/src/gnu/usr.bin/bc/config.h#2 delete .. //depot/projects/scottl-camlock/src/gnu/usr.bin/dc/Makefile#2 delete .. //depot/projects/scottl-camlock/src/gnu/usr.bin/dc/doc/Makefile#2 delete .. //depot/projects/scottl-camlock/src/gnu/usr.bin/diff/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/gnu/usr.bin/diff3/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/gnu/usr.bin/gdb/arch/ia64/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/gnu/usr.bin/gdb/arch/ia64/init.c#2 integrate .. //depot/projects/scottl-camlock/src/gnu/usr.bin/gdb/arch/mips/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/gnu/usr.bin/gdb/arch/mips/init.c#2 integrate .. //depot/projects/scottl-camlock/src/gnu/usr.bin/gdb/kgdb/trgt_mips.c#2 integrate .. //depot/projects/scottl-camlock/src/gnu/usr.bin/sdiff/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/include/_ctype.h#3 integrate .. //depot/projects/scottl-camlock/src/include/a.out.h#2 integrate .. //depot/projects/scottl-camlock/src/include/ar.h#2 integrate .. //depot/projects/scottl-camlock/src/include/arpa/ftp.h#2 integrate .. //depot/projects/scottl-camlock/src/include/arpa/inet.h#3 integrate .. //depot/projects/scottl-camlock/src/include/arpa/nameser.h#3 integrate .. //depot/projects/scottl-camlock/src/include/arpa/nameser_compat.h#3 integrate .. //depot/projects/scottl-camlock/src/include/arpa/telnet.h#3 integrate .. //depot/projects/scottl-camlock/src/include/arpa/tftp.h#3 integrate .. //depot/projects/scottl-camlock/src/include/assert.h#3 integrate .. //depot/projects/scottl-camlock/src/include/ctype.h#3 integrate .. //depot/projects/scottl-camlock/src/include/db.h#3 integrate .. //depot/projects/scottl-camlock/src/include/dirent.h#4 integrate .. //depot/projects/scottl-camlock/src/include/dlfcn.h#4 integrate .. //depot/projects/scottl-camlock/src/include/err.h#2 integrate .. //depot/projects/scottl-camlock/src/include/fnmatch.h#2 integrate .. //depot/projects/scottl-camlock/src/include/fstab.h#2 integrate .. //depot/projects/scottl-camlock/src/include/fts.h#3 integrate .. //depot/projects/scottl-camlock/src/include/getopt.h#2 integrate .. //depot/projects/scottl-camlock/src/include/glob.h#2 integrate .. //depot/projects/scottl-camlock/src/include/grp.h#3 integrate .. //depot/projects/scottl-camlock/src/include/hesiod.h#2 integrate .. //depot/projects/scottl-camlock/src/include/limits.h#2 integrate .. //depot/projects/scottl-camlock/src/include/locale.h#2 integrate .. //depot/projects/scottl-camlock/src/include/memory.h#2 integrate .. //depot/projects/scottl-camlock/src/include/mpool.h#3 integrate .. //depot/projects/scottl-camlock/src/include/ndbm.h#3 integrate .. //depot/projects/scottl-camlock/src/include/netdb.h#3 integrate .. //depot/projects/scottl-camlock/src/include/nl_types.h#2 integrate .. //depot/projects/scottl-camlock/src/include/nlist.h#2 integrate .. //depot/projects/scottl-camlock/src/include/nsswitch.h#3 integrate .. //depot/projects/scottl-camlock/src/include/paths.h#4 integrate .. //depot/projects/scottl-camlock/src/include/protocols/dumprestore.h#3 integrate .. //depot/projects/scottl-camlock/src/include/protocols/routed.h#2 integrate .. //depot/projects/scottl-camlock/src/include/protocols/rwhod.h#2 integrate .. //depot/projects/scottl-camlock/src/include/protocols/talkd.h#2 integrate .. //depot/projects/scottl-camlock/src/include/protocols/timed.h#2 integrate .. //depot/projects/scottl-camlock/src/include/pwd.h#3 integrate .. //depot/projects/scottl-camlock/src/include/ranlib.h#2 integrate .. //depot/projects/scottl-camlock/src/include/regex.h#2 integrate .. //depot/projects/scottl-camlock/src/include/regexp.h#2 integrate .. //depot/projects/scottl-camlock/src/include/resolv.h#3 integrate .. //depot/projects/scottl-camlock/src/include/runetype.h#2 integrate .. //depot/projects/scottl-camlock/src/include/setjmp.h#3 integrate .. //depot/projects/scottl-camlock/src/include/signal.h#5 integrate .. //depot/projects/scottl-camlock/src/include/stab.h#2 integrate .. //depot/projects/scottl-camlock/src/include/stddef.h#2 integrate .. //depot/projects/scottl-camlock/src/include/stdio.h#5 integrate .. //depot/projects/scottl-camlock/src/include/stdlib.h#3 integrate .. //depot/projects/scottl-camlock/src/include/string.h#3 integrate .. //depot/projects/scottl-camlock/src/include/sysexits.h#2 integrate .. //depot/projects/scottl-camlock/src/include/tar.h#2 integrate .. //depot/projects/scottl-camlock/src/include/termios.h#2 integrate .. //depot/projects/scottl-camlock/src/include/time.h#3 integrate .. //depot/projects/scottl-camlock/src/include/timeconv.h#2 integrate .. //depot/projects/scottl-camlock/src/include/ttyent.h#2 integrate .. //depot/projects/scottl-camlock/src/include/unistd.h#6 integrate .. //depot/projects/scottl-camlock/src/include/utime.h#2 integrate .. //depot/projects/scottl-camlock/src/include/vis.h#2 integrate .. //depot/projects/scottl-camlock/src/include/wchar.h#3 integrate .. //depot/projects/scottl-camlock/src/lib/libarchive/archive_write_disk.3#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/sysctl.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/sysctl.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/sysctlbyname.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/sysctlnametomib.c#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/gen/tls.c#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc/nls/msgcat.c#5 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdio/printf.3#4 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdlib/malloc.c#10 integrate .. //depot/projects/scottl-camlock/src/lib/libc/stdtime/strptime.3#2 integrate .. //depot/projects/scottl-camlock/src/lib/libc/sys/unlink.2#3 integrate .. //depot/projects/scottl-camlock/src/lib/libc_r/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/lib/libjail/jail.c#5 integrate .. //depot/projects/scottl-camlock/src/lib/libkse/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/lib/libpam/modules/pam_echo/pam_echo.8#2 integrate .. //depot/projects/scottl-camlock/src/libexec/rtld-elf/arm/rtld_start.S#2 integrate .. //depot/projects/scottl-camlock/src/libexec/rtld-elf/powerpc/reloc.c#3 integrate .. //depot/projects/scottl-camlock/src/libexec/rtld-elf/powerpc/rtld_machdep.h#3 integrate .. //depot/projects/scottl-camlock/src/libexec/rtld-elf/powerpc/rtld_start.S#2 integrate .. //depot/projects/scottl-camlock/src/libexec/rtld-elf/rtld.c#10 integrate .. //depot/projects/scottl-camlock/src/release/picobsd/build/picobsd#6 integrate .. //depot/projects/scottl-camlock/src/release/picobsd/tinyware/login/pico-login.c#2 integrate .. //depot/projects/scottl-camlock/src/release/scripts/make-memstick.sh#1 branch .. //depot/projects/scottl-camlock/src/sbin/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sbin/atacontrol/atacontrol.c#7 integrate .. //depot/projects/scottl-camlock/src/sbin/camcontrol/camcontrol.c#39 integrate .. //depot/projects/scottl-camlock/src/sbin/devd/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sbin/devfs/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/devfs/devfs.8#3 integrate .. //depot/projects/scottl-camlock/src/sbin/ffsinfo/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/fsck_msdosfs/boot.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/fsck_msdosfs/check.c#2 integrate .. //depot/projects/scottl-camlock/src/sbin/fsck_msdosfs/dir.c#2 integrate .. //depot/projects/scottl-camlock/src/sbin/fsck_msdosfs/dosfs.h#2 integrate .. //depot/projects/scottl-camlock/src/sbin/fsck_msdosfs/ext.h#2 integrate .. //depot/projects/scottl-camlock/src/sbin/fsck_msdosfs/fat.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/fsck_msdosfs/fsck_msdosfs.8#3 integrate .. //depot/projects/scottl-camlock/src/sbin/fsck_msdosfs/main.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/gbde/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/ggate/ggatec/ggatec.c#2 integrate .. //depot/projects/scottl-camlock/src/sbin/ggate/ggated/ggated.c#4 integrate .. //depot/projects/scottl-camlock/src/sbin/ggate/ggatel/ggatel.c#2 integrate .. //depot/projects/scottl-camlock/src/sbin/ggate/shared/ggate.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/hastctl/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastctl/hastctl.8#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastctl/hastctl.c#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastd/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastd/activemap.c#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastd/activemap.h#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastd/control.c#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastd/control.h#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastd/ebuf.c#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastd/ebuf.h#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastd/hast.conf.5#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastd/hast.h#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastd/hast_proto.c#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastd/hast_proto.h#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastd/hastd.8#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastd/hastd.c#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastd/hastd.h#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastd/hooks.c#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastd/hooks.h#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastd/metadata.c#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastd/metadata.h#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastd/nv.c#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastd/nv.h#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastd/parse.y#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastd/pjdlog.c#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastd/pjdlog.h#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastd/primary.c#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastd/proto.c#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastd/proto.h#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastd/proto_common.c#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastd/proto_impl.h#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastd/proto_socketpair.c#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastd/proto_tcp4.c#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastd/proto_uds.c#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastd/rangelock.c#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastd/rangelock.h#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastd/secondary.c#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastd/subr.c#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastd/subr.h#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastd/synch.h#1 branch .. //depot/projects/scottl-camlock/src/sbin/hastd/token.l#1 branch .. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifconfig.8#11 integrate .. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifconfig.c#8 integrate .. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifieee80211.c#10 integrate .. //depot/projects/scottl-camlock/src/sbin/ifconfig/ifvlan.c#4 integrate .. //depot/projects/scottl-camlock/src/sbin/mknod/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/mount_std/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/newfs_msdos/newfs_msdos.8#3 integrate .. //depot/projects/scottl-camlock/src/sbin/newfs_msdos/newfs_msdos.c#3 integrate .. //depot/projects/scottl-camlock/src/sbin/restore/restore.h#2 integrate .. //depot/projects/scottl-camlock/src/sbin/sunlabel/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/sysctl/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/sbin/sysctl/sysctl.c#8 integrate .. //depot/projects/scottl-camlock/src/share/examples/Makefile#5 integrate .. //depot/projects/scottl-camlock/src/share/examples/hast/ucarp.sh#1 branch .. //depot/projects/scottl-camlock/src/share/examples/hast/ucarp_down.sh#1 branch .. //depot/projects/scottl-camlock/src/share/examples/hast/ucarp_up.sh#1 branch .. //depot/projects/scottl-camlock/src/share/examples/hast/vip-down.sh#1 branch .. //depot/projects/scottl-camlock/src/share/examples/hast/vip-up.sh#1 branch .. //depot/projects/scottl-camlock/src/share/man/man4/bwn.4#1 branch .. //depot/projects/scottl-camlock/src/share/man/man4/man4.powerpc/Makefile#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man4/man4.powerpc/smu.4#1 branch .. //depot/projects/scottl-camlock/src/share/man/man5/devfs.rules.5#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man5/rc.conf.5#14 integrate .. //depot/projects/scottl-camlock/src/share/man/man5/tmpfs.5#4 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/ieee80211_scan.9#3 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/locking.9#5 integrate .. //depot/projects/scottl-camlock/src/share/man/man9/netisr.9#3 integrate .. //depot/projects/scottl-camlock/src/share/misc/committers-src.dot#12 integrate .. //depot/projects/scottl-camlock/src/share/mk/bsd.cpu.mk#3 integrate .. //depot/projects/scottl-camlock/src/share/mk/bsd.prog.mk#3 integrate .. //depot/projects/scottl-camlock/src/share/mk/bsd.sys.mk#7 integrate .. //depot/projects/scottl-camlock/src/share/mk/sys.mk#4 integrate .. //depot/projects/scottl-camlock/src/share/syscons/keymaps/fr.dvorak.acc.kbd#2 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/busdma_machdep.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/amd64/pmap.c#39 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/GENERIC#33 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/conf/XENHVM#7 integrate .. //depot/projects/scottl-camlock/src/sys/amd64/include/sysarch.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/cpufunc.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/identcpu.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/pmap.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/arm/arm/support.S#7 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/AVILA#13 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/BWCT#7 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/CAMBRIA#9 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/CNS11XXNAS#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/CRB#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/DB-88F5XXX#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/DB-88F6XXX#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/EP80219#9 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/GUMSTIX#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/HL200#6 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/IQ31244#13 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/KB920X#13 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/NSLU#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/conf/SKYEYE#11 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/_inttypes.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/_stdint.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/armreg.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/bus.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/bus_dma.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/md_var.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/arm/include/ucontext.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/sa11x0.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/sa11x0_dmacreg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/sa11x0_gpioreg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/sa11x0_irq.S#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/sa11x0_irqhandler.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/sa11x0_ostreg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/sa11x0_ppcreg.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/sa11x0_reg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/arm/sa11x0/sa11x0_var.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/arm/xscale/ixp425/cambria_fled.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/powerpc/ofw/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/sys/boot/sparc64/loader/main.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/boot/zfs/zfs.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/cam/ata/ata_xpt.c#82 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt.c#152 integrate .. //depot/projects/scottl-camlock/src/sys/cam/cam_xpt_internal.h#18 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_cd.c#39 integrate .. //depot/projects/scottl-camlock/src/sys/cam/scsi/scsi_xpt.c#30 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/common/atomic/ia64/opensolaris_atomic.S#2 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/compat/linux/linux_stats.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/conf/NOTES#51 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files#66 integrate .. //depot/projects/scottl-camlock/src/sys/conf/files.mips#4 integrate .. //depot/projects/scottl-camlock/src/sys/conf/kmod.mk#19 integrate .. //depot/projects/scottl-camlock/src/sys/conf/ldscript.mips.cfe#2 integrate .. //depot/projects/scottl-camlock/src/sys/conf/options.mips#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aac_cam.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aacreg.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/dev/aac/aacvar.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/acpica/acpi_video.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.c#105 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ahci/ahci.h#38 integrate .. //depot/projects/scottl-camlock/src/sys/dev/alc/if_alc.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-all.c#52 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-pci.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/ata-sata.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ata/chipsets/ata-intel.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ah.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416_cal.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar9280.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar9280.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar9280_attach.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar9285.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar9285.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar9285_attach.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ath/ath_hal/ar5416/ar9285_reset.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/ath/if_ath.c#35 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bge/if_bge.c#38 integrate .. //depot/projects/scottl-camlock/src/sys/dev/bwn/if_bwn.c#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/bwn/if_bwnreg.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/bwn/if_bwnvar.h#1 branch .. //depot/projects/scottl-camlock/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/fb.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/dev/fb/vesa.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/dev/gem/if_gem.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/dev/isp/isp_freebsd.c#31 integrate .. //depot/projects/scottl-camlock/src/sys/dev/iwn/if_iwn.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/jme/if_jme.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mge/if_mge.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/brgphy.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mii/miidevs#17 integrate .. //depot/projects/scottl-camlock/src/sys/dev/msk/if_msk.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/dev/mxge/if_mxge.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/dev/re/if_re.c#30 integrate .. //depot/projects/scottl-camlock/src/sys/dev/siba/siba_core.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/dev/siba/sibareg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/siba/sibavar.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/dev/siis/siis.c#43 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/input/ukbd.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/quirk/usb_quirk.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/quirk/usb_quirk.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/u3g.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/uftdi.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/serial/umodem.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_msctest.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usb_msctest.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/dev/usb/usbdevs#44 integrate .. //depot/projects/scottl-camlock/src/sys/dev/xen/netfront/netfront.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/fs/ext2fs/ext2_vnops.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/fs/msdosfs/msdosfs_fat.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/fs/msdosfs/msdosfs_vnops.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/geom/gate/g_gate.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/geom/gate/g_gate.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/geom/geom_subr.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/geom/multipath/g_multipath.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/geom/stripe/g_stripe.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/GENERIC#32 integrate .. //depot/projects/scottl-camlock/src/sys/i386/conf/XEN#4 integrate .. //depot/projects/scottl-camlock/src/sys/i386/i386/pmap.c#43 integrate .. //depot/projects/scottl-camlock/src/sys/i386/xen/pmap.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/i386/xen/xen_machdep.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/acpica/madt.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/conf/GENERIC#22 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/bus_machdep.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/context.S#3 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/efi.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/exception.S#8 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/interrupt.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/locore.S#6 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/machdep.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/mp_machdep.c#14 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/pmap.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/sapic.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/support.S#6 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/ia64/syscall.S#4 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/bus.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/intr.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/md_var.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/pci_cfgreg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/pmap.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/ia64/include/vmparam.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_event.c#24 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_kthread.c#12 integrate .. //depot/projects/scottl-camlock/src/sys/kern/kern_subr.c#11 delete .. //depot/projects/scottl-camlock/src/sys/kern/link_elf_obj.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/kern/subr_hash.c#1 branch .. //depot/projects/scottl-camlock/src/sys/kern/subr_uio.c#1 branch .. //depot/projects/scottl-camlock/src/sys/kern/uipc_socket.c#31 integrate .. //depot/projects/scottl-camlock/src/sys/kern/uipc_syscalls.c#34 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_default.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/kern/vfs_mount.c#34 integrate .. //depot/projects/scottl-camlock/src/sys/mips/alchemy/obio.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/atheros/ar71xxreg.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/dev/rgmii/octeon_fpa.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/octeon_machdep.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/mips/cavium/octeon_pcmap_regs.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/ADM5120#5 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/ALCHEMY#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/IDT#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/MALTA#5 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/MALTA64#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/OCTEON1#5 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/OCTEON1-32#6 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/QEMU#5 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/SENTRY5#5 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/SWARM#5 integrate .. //depot/projects/scottl-camlock/src/sys/mips/conf/XLR#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/include/intr_machdep.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/bus_space_generic.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/elf_machdep.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/elf_trampoline.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/mips/exception.S#7 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/board.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/bus_space_rmi.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/bus_space_rmi_pci.c#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/rmi/files.xlr#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/interrupt.h#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/intr_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/iodi.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/pcibus.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/mips/rmi/xlr_pci.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/mips/sibyte/sb_asm.S#4 integrate .. //depot/projects/scottl-camlock/src/sys/mips/sibyte/sb_bus_space.h#1 branch .. //depot/projects/scottl-camlock/src/sys/mips/sibyte/sb_zbpci.c#5 integrate .. //depot/projects/scottl-camlock/src/sys/modules/Makefile#45 integrate .. //depot/projects/scottl-camlock/src/sys/modules/bwn/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/nfs_common/Makefile#1 branch .. //depot/projects/scottl-camlock/src/sys/modules/nfsclient/Makefile#11 integrate .. //depot/projects/scottl-camlock/src/sys/modules/nfsserver/Makefile#6 integrate .. //depot/projects/scottl-camlock/src/sys/net/bpf.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/net/if.c#43 integrate .. //depot/projects/scottl-camlock/src/sys/net/if.h#19 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_loop.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/net/if_vlan.c#28 integrate .. //depot/projects/scottl-camlock/src/sys/net/netisr.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/net/netisr.h#10 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/in_proto.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_input.c#28 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_mroute.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_options.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ip_var.h#18 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/ipfw/ip_fw_sockopt.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_indata.c#18 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_input.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_output.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_output.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctp_usrreq.c#16 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/sctputil.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/netinet/tcp_syncache.c#27 integrate .. //depot/projects/scottl-camlock/src/sys/netinet6/in6_pcb.c#22 integrate .. //depot/projects/scottl-camlock/src/sys/netipsec/keydb.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/nfs/nfs_common.c#10 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_kdtrace.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/nfsclient/nfs_vfsops.c#26 integrate .. //depot/projects/scottl-camlock/src/sys/nfsserver/nfs_srvsubs.c#20 integrate .. //depot/projects/scottl-camlock/src/sys/pc98/conf/GENERIC#26 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/machdep.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/mmu_oea.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/mmu_oea64.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/trap.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/aim/uma_machdep.c#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/booke/copyinout.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/booke/machdep.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/conf/GENERIC#28 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/conf/MPC85XX#9 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/sr.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/include/vmparam.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powermac/smu.c#2 integrate .. //depot/projects/scottl-camlock/src/sys/powerpc/powerpc/cpu.c#15 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/cache.h#6 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/cpu.h#7 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/md_var.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/pcpu.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/pmap.h#9 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/smp.h#8 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/tick.h#4 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/include/ver.h#5 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/cache.c#6 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/cheetah.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/identcpu.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/iommu.c#9 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/machdep.c#23 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/mp_locore.S#5 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/mp_machdep.c#13 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/nexus.c#11 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/pmap.c#21 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/spitfire.c#4 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/tick.c#8 integrate .. //depot/projects/scottl-camlock/src/sys/sparc64/sparc64/trap.c#19 integrate .. //depot/projects/scottl-camlock/src/sys/sun4v/conf/GENERIC#17 integrate .. //depot/projects/scottl-camlock/src/sys/sys/queue.h#12 integrate .. //depot/projects/scottl-camlock/src/sys/sys/sysctl.h#21 integrate .. //depot/projects/scottl-camlock/src/sys/sys/systm.h#24 integrate .. //depot/projects/scottl-camlock/src/sys/sys/timeb.h#3 integrate .. //depot/projects/scottl-camlock/src/sys/sys/user.h#13 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vm_init.c#7 integrate .. //depot/projects/scottl-camlock/src/sys/vm/vnode_pager.c#17 integrate .. //depot/projects/scottl-camlock/src/sys/xen/evtchn/evtchn_dev.c#2 integrate .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/expansion/arith2.0#2 integrate .. //depot/projects/scottl-camlock/src/tools/regression/bin/sh/expansion/arith3.0#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/kthread/kld/Makefile#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/kthread/kld/kthrdlk.c#1 branch .. //depot/projects/scottl-camlock/src/tools/regression/usr.bin/env/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/Makefile#9 integrate .. //depot/projects/scottl-camlock/src/usr.bin/cpio/bsdcpio.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/find/function.c#7 integrate .. //depot/projects/scottl-camlock/src/usr.bin/gencat/gencat.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/getent/getent.1#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/getent/getent.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/hexdump/hexdump.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/hexdump/od.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/jot/jot.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/kdump/kdump.c#7 integrate .. //depot/projects/scottl-camlock/src/usr.bin/netstat/Makefile#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/netstat/main.c#8 integrate .. //depot/projects/scottl-camlock/src/usr.bin/netstat/netisr.c#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/netstat/netstat.1#8 integrate .. //depot/projects/scottl-camlock/src/usr.bin/netstat/netstat.h#7 integrate .. //depot/projects/scottl-camlock/src/usr.bin/nl/nl.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/nl/nl.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/seq/Makefile#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/seq/seq.1#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/seq/seq.c#1 branch .. //depot/projects/scottl-camlock/src/usr.bin/stat/stat.1#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/stat/stat.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tar/test/test_option_T.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tar/test/test_option_s.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/tar/tree.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/unifdef/unifdef.1#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/unifdef/unifdef.c#6 integrate .. //depot/projects/scottl-camlock/src/usr.bin/unzip/unzip.1#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/unzip/unzip.c#5 integrate .. //depot/projects/scottl-camlock/src/usr.bin/usbhidaction/usbhidaction.1#3 integrate .. //depot/projects/scottl-camlock/src/usr.bin/usbhidaction/usbhidaction.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/usbhidctl/usbhid.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/usbhidctl/usbhidctl.1#2 integrate .. //depot/projects/scottl-camlock/src/usr.bin/xinstall/xinstall.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.bin/xlint/lint1/makeman#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/arp/arp.c#7 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/chown/chgrp.1#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/chown/chown.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/chown/chown.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/cxgbtool/Makefile#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/eeprom/eeprom.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/eeprom/eeprom.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/ftp-proxy/Makefile.inc#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/makefs/compat/pwcache.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/makefs/compat/strsuftoll.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/makefs/getid.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/mptable/mptable.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/mptutil/mpt_cam.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/mptutil/mpt_show.c#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/mtree/mtree.5#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/rpcbind/util.c#4 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/usbdevs/usbdevs.8#2 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/usbdevs/usbdevs.c#3 integrate .. //depot/projects/scottl-camlock/src/usr.sbin/yppoll/yppoll.8#2 integrate Differences ... ==== //depot/projects/scottl-camlock/src/MAINTAINERS#8 (text+ko) ==== @@ -1,4 +1,4 @@ -$FreeBSD: src/MAINTAINERS,v 1.156 2009/12/30 14:41:02 mjacob Exp $ +$FreeBSD: src/MAINTAINERS,v 1.157 2010/02/18 21:14:29 edwin Exp $ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements @@ -125,6 +125,12 @@ ncurses rafan Heads-up appreciated, try not to break it. *env(3) secteam Due to the problematic security history of this code, please have patches reviewed by secteam. +share/zoneinfo edwin Heads-up appreciated, since our data is coming + from a third party source. +usr.sbin/zic edwin Heads-up appreciated, since this code is + maintained by a third party source. +lib/libc/stdtime edwin Heads-up appreciated, since parts of this code + is maintained by a third party source. Following are the entries from the Makefiles, and a few other sources. Please remove stale entries from both their origin, and this file. ==== //depot/projects/scottl-camlock/src/bin/rmail/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/bin/rmail/Makefile,v 1.22 2005/06/10 06:12:49 des Exp $ +# $FreeBSD: src/bin/rmail/Makefile,v 1.23 2010/02/15 14:07:40 uqs Exp $ SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail .PATH: ${SENDMAIL_DIR}/rmail @@ -11,7 +11,7 @@ SRCS= rmail.c MAN= rmail.8 -WARNS?= 0 +WARNS?= 2 CFLAGS+=-I${SENDMAIL_DIR}/include -I. LIBSMDIR= ${.OBJDIR}/../../lib/libsm ==== //depot/projects/scottl-camlock/src/contrib/gdb/gdb/mips-tdep.h#2 (text+ko) ==== @@ -62,6 +62,17 @@ extern const struct mips_regnum *mips_regnum (struct gdbarch *gdbarch); enum { + MIPS_S0_REGNUM = 16, + MIPS_S1_REGNUM = 17, + MIPS_S2_REGNUM = 18, + MIPS_S3_REGNUM = 19, + MIPS_S4_REGNUM = 20, + MIPS_S5_REGNUM = 21, + MIPS_S6_REGNUM = 22, + MIPS_S7_REGNUM = 23, + MIPS_SP_REGNUM = 29, + MIPS_FP_REGNUM = 30, + MIPS_RA_REGNUM = 31, MIPS_EMBED_LO_REGNUM = 33, MIPS_EMBED_HI_REGNUM = 34, MIPS_EMBED_BADVADDR_REGNUM = 35, ==== //depot/projects/scottl-camlock/src/etc/defaults/rc.conf#17 (text+ko) ==== @@ -15,7 +15,7 @@ # For a more detailed explanation of all the rc.conf variables, please # refer to the rc.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/rc.conf,v 1.369 2010/02/08 18:51:24 emax Exp $ +# $FreeBSD: src/etc/defaults/rc.conf,v 1.370 2010/02/18 23:16:19 pjd Exp $ ############################################################## ### Important initial Boot-time options #################### @@ -260,6 +260,9 @@ inetd_enable="NO" # Run the network daemon dispatcher (YES/NO). inetd_program="/usr/sbin/inetd" # path to inetd, if you want a different one. inetd_flags="-wW -C 60" # Optional flags to inetd +hastd_enable="NO" # Run the HAST daemon (YES/NO). +hastd_program="/sbin/hastd" # path to hastd, if you want a different one. +hastd_flags="" # Optional flags to hastd. # # named. It may be possible to run named in a sandbox, man security for # details. ==== //depot/projects/scottl-camlock/src/etc/mtree/BSD.usr.dist#9 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.342 2010/01/22 23:19:48 delphij Exp $ +# $FreeBSD: src/etc/mtree/BSD.usr.dist,v 1.343 2010/02/19 02:34:25 delphij Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -215,6 +215,8 @@ .. find_interface .. + hast + .. hostapd .. ibcs2 ==== //depot/projects/scottl-camlock/src/etc/ppp/ppp.conf#3 (text+ko) ==== @@ -5,12 +5,12 @@ # # See /usr/share/examples/ppp/ for some examples # -# $FreeBSD: src/etc/ppp/ppp.conf,v 1.11 2008/07/19 20:00:18 marcel Exp $ +# $FreeBSD: src/etc/ppp/ppp.conf,v 1.12 2010/02/16 01:07:06 jkim Exp $ ################################################################# default: set log Phase Chat LCP IPCP CCP tun command - ident user-ppp VERSION (built COMPILATIONDATE) + ident user-ppp VERSION # Ensure that "device" references the correct serial port # for your modem. (cuau0 = COM1, cuau1 = COM2) ==== //depot/projects/scottl-camlock/src/etc/rc.d/Makefile#11 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/rc.d/Makefile,v 1.103 2010/02/03 16:18:42 ume Exp $ +# $FreeBSD: src/etc/rc.d/Makefile,v 1.104 2010/02/18 23:16:19 pjd Exp $ .include @@ -12,7 +12,7 @@ encswap \ faith fsck ftp-proxy ftpd \ gbde geli geli2 gssd \ - hcsecd \ + hastd hcsecd \ hostapd hostid hostid_save hostname \ inetd initrandom \ ip6addrctl ipfilter ipfs ipfw ipmon \ ==== //depot/projects/scottl-camlock/src/games/Makefile.inc#2 (text+ko) ==== @@ -1,5 +1,6 @@ # @(#)Makefile.inc 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/games/Makefile.inc,v 1.16 2002/10/21 10:05:14 markm Exp $ +# $FreeBSD: src/games/Makefile.inc,v 1.17 2010/02/15 14:32:00 uqs Exp $ BINDIR?= /usr/games FILESDIR?= ${SHAREDIR}/games +WARNS?= 6 ==== //depot/projects/scottl-camlock/src/games/bcd/Makefile#2 (text+ko) ==== @@ -1,8 +1,7 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/games/bcd/Makefile,v 1.6 2004/07/11 17:26:18 stefanf Exp $ +# $FreeBSD: src/games/bcd/Makefile,v 1.7 2010/02/15 14:32:00 uqs Exp $ PROG= bcd -WARNS?= 6 MAN= bcd.6 MLINKS= bcd.6 ppt.6 ==== //depot/projects/scottl-camlock/src/games/bcd/bcd.c#2 (text+ko) ==== @@ -13,11 +13,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -45,7 +41,7 @@ static char sccsid[] = "@(#)bcd.c 8.2 (Berkeley) 3/20/94"; #endif static const char rcsid[] = - "$FreeBSD: src/games/bcd/bcd.c,v 1.9 2004/07/11 17:26:18 stefanf Exp $"; + "$FreeBSD: src/games/bcd/bcd.c,v 1.10 2010/02/15 18:46:02 imp Exp $"; #endif /* not lint */ /* ==== //depot/projects/scottl-camlock/src/games/caesar/Makefile#2 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/games/caesar/Makefile,v 1.10 2005/05/01 19:34:22 stefanf Exp $ +# $FreeBSD: src/games/caesar/Makefile,v 1.11 2010/02/15 14:32:00 uqs Exp $ PROG= caesar DPADD= ${LIBM} @@ -8,6 +8,4 @@ MAN= caesar.6 MLINKS= caesar.6 rot13.6 -WARNS?= 6 - .include ==== //depot/projects/scottl-camlock/src/games/caesar/caesar.c#2 (text+ko) ==== @@ -18,11 +18,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -51,7 +47,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/games/caesar/caesar.c,v 1.14 2005/05/01 19:34:22 stefanf Exp $"); +__FBSDID("$FreeBSD: src/games/caesar/caesar.c,v 1.15 2010/02/15 18:46:02 imp Exp $"); #include #include ==== //depot/projects/scottl-camlock/src/games/fortune/fortune/Makefile#2 (text+ko) ==== @@ -1,9 +1,8 @@ # @(#)Makefile 8.1 (Berkeley) 5/31/93 -# $FreeBSD: src/games/fortune/fortune/Makefile,v 1.8 2005/02/17 18:06:37 ru Exp $ +# $FreeBSD: src/games/fortune/fortune/Makefile,v 1.9 2010/02/15 14:32:00 uqs Exp $ PROG= fortune MAN= fortune.6 -WARNS?= 2 CFLAGS+=-DDEBUG -I${.CURDIR}/../strfile .include ==== //depot/projects/scottl-camlock/src/games/fortune/fortune/fortune.6#3 (text+ko) ==== @@ -12,11 +12,7 @@ .\" 2. Redistributions in binary form must reproduce the above copyright .\" notice, this list of conditions and the following disclaimer in the .\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors +.\" 3. Neither the name of the University nor the names of its contributors .\" may be used to endorse or promote products derived from this software .\" without specific prior written permission. .\" @@ -33,7 +29,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)fortune.6 8.3 (Berkeley) 4/19/94 -.\" $FreeBSD: src/games/fortune/fortune/fortune.6,v 1.23 2008/08/07 20:07:30 ache Exp $ +.\" $FreeBSD: src/games/fortune/fortune/fortune.6,v 1.24 2010/02/15 15:10:21 uqs Exp $ .\" .Dd November 7, 2007 .Dt FORTUNE 6 ==== //depot/projects/scottl-camlock/src/games/fortune/fortune/fortune.c#3 (text+ko) ==== @@ -13,11 +13,7 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors + * 3. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * @@ -46,51 +42,52 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/games/fortune/fortune/fortune.c,v 1.32 2008/08/07 20:02:42 ache Exp $"); +__FBSDID("$FreeBSD: src/games/fortune/fortune/fortune.c,v 1.35 2010/02/21 21:03:15 uqs Exp $"); + +#include +#include -# include -# include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include -# include "strfile.h" -# include "pathnames.h" +#include "strfile.h" +#include "pathnames.h" -# define TRUE 1 -# define FALSE 0 -# define bool short +#define TRUE 1 +#define FALSE 0 +#define bool short -# define MINW 6 /* minimum wait if desired */ -# define CPERS 20 /* # of chars for each sec */ -# define SLEN 160 /* # of chars in short fortune */ +#define MINW 6 /* minimum wait if desired */ +#define CPERS 20 /* # of chars for each sec */ +#define SLEN 160 /* # of chars in short fortune */ -# define POS_UNKNOWN ((uint32_t) -1) /* pos for file unknown */ -# define NO_PROB (-1) /* no prob specified for file */ +#define POS_UNKNOWN ((uint32_t) -1) /* pos for file unknown */ +#define NO_PROB (-1) /* no prob specified for file */ -# ifdef DEBUG -# define DPRINTF(l,x) { if (Debug >= l) fprintf x; } -# undef NDEBUG -# else -# define DPRINTF(l,x) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Feb 25 13:47:09 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7EAE7106566B; Thu, 25 Feb 2010 13:47:09 +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 4323B1065675 for ; Thu, 25 Feb 2010 13:47:09 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 30A2D8FC26 for ; Thu, 25 Feb 2010 13:47:09 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o1PDl9c1073182 for ; Thu, 25 Feb 2010 13:47:09 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o1PDl8uG073180 for perforce@freebsd.org; Thu, 25 Feb 2010 13:47:08 GMT (envelope-from raj@freebsd.org) Date: Thu, 25 Feb 2010 13:47:08 GMT Message-Id: <201002251347.o1PDl8uG073180@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 175068 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Feb 2010 13:47:09 -0000 http://p4web.freebsd.org/chv.cgi?CH=175068 Change 175068 by raj@raj_fdt on 2010/02/25 13:46:28 Reorg libfdt: move it to the final location i.e. sys/contrib/libfdt Note this breaks the build [temporarily]. Affected files ... .. //depot/projects/fdt/sys/contrib/dtc/libfdt/Makefile.libfdt#2 delete .. //depot/projects/fdt/sys/contrib/dtc/libfdt/TODO#2 delete .. //depot/projects/fdt/sys/contrib/dtc/libfdt/fdt.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/libfdt/fdt.h#2 delete .. //depot/projects/fdt/sys/contrib/dtc/libfdt/fdt_ro.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/libfdt/fdt_rw.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/libfdt/fdt_strerror.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/libfdt/fdt_sw.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/libfdt/fdt_wip.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/libfdt/libfdt.h#2 delete .. //depot/projects/fdt/sys/contrib/dtc/libfdt/libfdt_env.h#3 delete .. //depot/projects/fdt/sys/contrib/dtc/libfdt/libfdt_internal.h#2 delete .. //depot/projects/fdt/sys/contrib/dtc/libfdt/version.lds#2 delete .. //depot/projects/fdt/sys/contrib/libfdt/Makefile.libfdt#1 branch .. //depot/projects/fdt/sys/contrib/libfdt/TODO#1 branch .. //depot/projects/fdt/sys/contrib/libfdt/fdt.c#1 branch .. //depot/projects/fdt/sys/contrib/libfdt/fdt.h#1 branch .. //depot/projects/fdt/sys/contrib/libfdt/fdt_ro.c#1 branch .. //depot/projects/fdt/sys/contrib/libfdt/fdt_rw.c#1 branch .. //depot/projects/fdt/sys/contrib/libfdt/fdt_strerror.c#1 branch .. //depot/projects/fdt/sys/contrib/libfdt/fdt_sw.c#1 branch .. //depot/projects/fdt/sys/contrib/libfdt/fdt_wip.c#1 branch .. //depot/projects/fdt/sys/contrib/libfdt/libfdt.h#1 branch .. //depot/projects/fdt/sys/contrib/libfdt/libfdt_env.h#1 branch .. //depot/projects/fdt/sys/contrib/libfdt/libfdt_internal.h#1 branch .. //depot/projects/fdt/sys/contrib/libfdt/version.lds#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Thu Feb 25 13:54:16 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC7031065694; Thu, 25 Feb 2010 13:54:16 +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 6FEB51065688 for ; Thu, 25 Feb 2010 13:54:16 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 54E618FC1D for ; Thu, 25 Feb 2010 13:54:16 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o1PDsGMm073798 for ; Thu, 25 Feb 2010 13:54:16 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o1PDsGAE073796 for perforce@freebsd.org; Thu, 25 Feb 2010 13:54:16 GMT (envelope-from raj@freebsd.org) Date: Thu, 25 Feb 2010 13:54:16 GMT Message-Id: <201002251354.o1PDsGAE073796@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 175069 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Feb 2010 13:54:16 -0000 http://p4web.freebsd.org/chv.cgi?CH=175069 Change 175069 by raj@raj_fdt on 2010/02/25 13:53:17 Reorg dtc: move it to the final location i.e. contrib/dtc Affected files ... .. //depot/projects/fdt/contrib/dtc/Documentation/dtc-paper.bib#1 branch .. //depot/projects/fdt/contrib/dtc/Documentation/dtc-paper.tex#1 branch .. //depot/projects/fdt/contrib/dtc/Documentation/dts-format.txt#1 branch .. //depot/projects/fdt/contrib/dtc/Documentation/manual.txt#1 branch .. //depot/projects/fdt/contrib/dtc/GPL#1 branch .. //depot/projects/fdt/contrib/dtc/Makefile#1 branch .. //depot/projects/fdt/contrib/dtc/Makefile.convert-dtsv0#1 branch .. //depot/projects/fdt/contrib/dtc/Makefile.dtc#1 branch .. //depot/projects/fdt/contrib/dtc/Makefile.ftdump#1 branch .. //depot/projects/fdt/contrib/dtc/README.license#1 branch .. //depot/projects/fdt/contrib/dtc/TODO#1 branch .. //depot/projects/fdt/contrib/dtc/checks.c#1 branch .. //depot/projects/fdt/contrib/dtc/convert-dtsv0-lexer.l#1 branch .. //depot/projects/fdt/contrib/dtc/data.c#1 branch .. //depot/projects/fdt/contrib/dtc/dtc-lexer.l#1 branch .. //depot/projects/fdt/contrib/dtc/dtc-parser.y#1 branch .. //depot/projects/fdt/contrib/dtc/dtc.c#1 branch .. //depot/projects/fdt/contrib/dtc/dtc.h#1 branch .. //depot/projects/fdt/contrib/dtc/flattree.c#1 branch .. //depot/projects/fdt/contrib/dtc/fstree.c#1 branch .. //depot/projects/fdt/contrib/dtc/ftdump.c#1 branch .. //depot/projects/fdt/contrib/dtc/livetree.c#1 branch .. //depot/projects/fdt/contrib/dtc/scripts/setlocalversion#1 branch .. //depot/projects/fdt/contrib/dtc/srcpos.c#1 branch .. //depot/projects/fdt/contrib/dtc/srcpos.h#1 branch .. //depot/projects/fdt/contrib/dtc/tests/Makefile.tests#1 branch .. //depot/projects/fdt/contrib/dtc/tests/add_subnode_with_nops.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/aliases.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/asm_tree_dump.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/bad-empty-ranges.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/bad-name-property.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/bad-ncells.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/bad-reg-ranges.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/bad-string-props.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/base01.asm#1 branch .. //depot/projects/fdt/contrib/dtc/tests/base01.cmd#1 branch .. //depot/projects/fdt/contrib/dtc/tests/base01.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/base01.stderr#1 branch .. //depot/projects/fdt/contrib/dtc/tests/boot-cpuid.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/comments-cmp.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/comments.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/data.S#1 branch .. //depot/projects/fdt/contrib/dtc/tests/default-addr-size.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/del_node.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/del_property.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/dtbs_equal_ordered.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/dtc-checkfails.sh#1 branch .. //depot/projects/fdt/contrib/dtc/tests/dtc-fatal.sh#1 branch .. //depot/projects/fdt/contrib/dtc/tests/dumptrees.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/dup-nodename.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/dup-phandle.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/dup-propname.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/empty.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/escapes.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/extra-terminating-null.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/extra-terminating-null.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/find_property.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/get_alias.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/get_mem_rsv.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/get_name.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/get_path.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/get_phandle.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/getprop.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/incbin.bin#1 branch .. //depot/projects/fdt/contrib/dtc/tests/incbin.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/incbin.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/include0.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/include1.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/include2.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/include3.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/include4.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/include5.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/include6.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/include7.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/include8.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/label01.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/mangle-layout.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/mangle-layout.supp#1 branch .. //depot/projects/fdt/contrib/dtc/tests/minusone-phandle.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/move_and_save.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/node_check_compatible.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/node_offset_by_compatible.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/node_offset_by_phandle.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/node_offset_by_prop_value.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/nonexist-label-ref.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/nonexist-node-ref.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/nop_node.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/nop_property.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/nopulate.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/notfound.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/obsolete-chosen-interrupt-controller.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/open_pack.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/open_pack.supp#1 branch .. //depot/projects/fdt/contrib/dtc/tests/parent_offset.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/path-references.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/path-references.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/path_offset.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/path_offset_aliases.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/prop-after-subnode.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/references.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/references.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/references_dts0.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/reg-ranges-root.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/root_node.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/run_tests.sh#1 branch .. //depot/projects/fdt/contrib/dtc/tests/rw_tree1.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/set_name.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/setprop.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/setprop_inplace.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/string_escapes.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/subnode_offset.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/supernode_atdepth_offset.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/sw_tree1.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/test01.asm#1 branch .. //depot/projects/fdt/contrib/dtc/tests/test01.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/test01.stderr#1 branch .. //depot/projects/fdt/contrib/dtc/tests/test_kernel_dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/test_tree1.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/test_tree1_dts0.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/testdata.h#1 branch .. //depot/projects/fdt/contrib/dtc/tests/tests.h#1 branch .. //depot/projects/fdt/contrib/dtc/tests/tests.sh#1 branch .. //depot/projects/fdt/contrib/dtc/tests/testutils.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/trees.S#1 branch .. //depot/projects/fdt/contrib/dtc/tests/truncated_property.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/value-labels.c#1 branch .. //depot/projects/fdt/contrib/dtc/tests/value-labels.dts#1 branch .. //depot/projects/fdt/contrib/dtc/tests/zero-phandle.dts#1 branch .. //depot/projects/fdt/contrib/dtc/treesource.c#1 branch .. //depot/projects/fdt/contrib/dtc/util.c#1 branch .. //depot/projects/fdt/contrib/dtc/util.h#1 branch .. //depot/projects/fdt/sys/contrib/dtc/Documentation/dtc-paper.bib#2 delete .. //depot/projects/fdt/sys/contrib/dtc/Documentation/dtc-paper.tex#2 delete .. //depot/projects/fdt/sys/contrib/dtc/Documentation/dts-format.txt#2 delete .. //depot/projects/fdt/sys/contrib/dtc/Documentation/manual.txt#2 delete .. //depot/projects/fdt/sys/contrib/dtc/GPL#2 delete .. //depot/projects/fdt/sys/contrib/dtc/Makefile#2 delete .. //depot/projects/fdt/sys/contrib/dtc/Makefile.convert-dtsv0#2 delete .. //depot/projects/fdt/sys/contrib/dtc/Makefile.dtc#2 delete .. //depot/projects/fdt/sys/contrib/dtc/Makefile.ftdump#2 delete .. //depot/projects/fdt/sys/contrib/dtc/README.license#2 delete .. //depot/projects/fdt/sys/contrib/dtc/TODO#2 delete .. //depot/projects/fdt/sys/contrib/dtc/checks.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/convert-dtsv0-lexer.l#2 delete .. //depot/projects/fdt/sys/contrib/dtc/data.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/dtc-lexer.l#3 delete .. //depot/projects/fdt/sys/contrib/dtc/dtc-parser.y#3 delete .. //depot/projects/fdt/sys/contrib/dtc/dtc.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/dtc.h#2 delete .. //depot/projects/fdt/sys/contrib/dtc/flattree.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/fstree.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/ftdump.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/livetree.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/scripts/setlocalversion#2 delete .. //depot/projects/fdt/sys/contrib/dtc/srcpos.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/srcpos.h#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/Makefile.tests#3 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/add_subnode_with_nops.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/aliases.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/asm_tree_dump.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/bad-empty-ranges.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/bad-name-property.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/bad-ncells.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/bad-reg-ranges.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/bad-string-props.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/base01.asm#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/base01.cmd#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/base01.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/base01.stderr#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/boot-cpuid.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/comments-cmp.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/comments.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/data.S#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/default-addr-size.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/del_node.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/del_property.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/dtbs_equal_ordered.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/dtc-checkfails.sh#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/dtc-fatal.sh#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/dumptrees.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/dup-nodename.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/dup-phandle.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/dup-propname.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/empty.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/escapes.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/extra-terminating-null.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/extra-terminating-null.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/find_property.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/get_alias.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/get_mem_rsv.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/get_name.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/get_path.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/get_phandle.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/getprop.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/incbin.bin#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/incbin.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/incbin.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/include0.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/include1.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/include2.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/include3.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/include4.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/include5.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/include6.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/include7.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/include8.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/label01.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/mangle-layout.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/mangle-layout.supp#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/minusone-phandle.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/move_and_save.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/node_check_compatible.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/node_offset_by_compatible.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/node_offset_by_phandle.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/node_offset_by_prop_value.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/nonexist-label-ref.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/nonexist-node-ref.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/nop_node.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/nop_property.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/nopulate.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/notfound.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/obsolete-chosen-interrupt-controller.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/open_pack.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/open_pack.supp#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/parent_offset.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/path-references.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/path-references.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/path_offset.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/path_offset_aliases.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/prop-after-subnode.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/references.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/references.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/references_dts0.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/reg-ranges-root.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/root_node.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/run_tests.sh#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/rw_tree1.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/set_name.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/setprop.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/setprop_inplace.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/string_escapes.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/subnode_offset.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/supernode_atdepth_offset.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/sw_tree1.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/test01.asm#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/test01.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/test01.stderr#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/test_kernel_dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/test_tree1.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/test_tree1_dts0.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/testdata.h#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/tests.h#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/tests.sh#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/testutils.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/trees.S#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/truncated_property.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/value-labels.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/value-labels.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/tests/zero-phandle.dts#2 delete .. //depot/projects/fdt/sys/contrib/dtc/treesource.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/util.c#2 delete .. //depot/projects/fdt/sys/contrib/dtc/util.h#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu Feb 25 14:23:46 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4EE391065672; Thu, 25 Feb 2010 14:23:46 +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 1387E106564A for ; Thu, 25 Feb 2010 14:23:46 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 007768FC14 for ; Thu, 25 Feb 2010 14:23:46 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o1PENjN0077691 for ; Thu, 25 Feb 2010 14:23:45 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o1PENjoR077689 for perforce@freebsd.org; Thu, 25 Feb 2010 14:23:45 GMT (envelope-from raj@freebsd.org) Date: Thu, 25 Feb 2010 14:23:45 GMT Message-Id: <201002251423.o1PENjoR077689@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 175071 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Feb 2010 14:23:46 -0000 http://p4web.freebsd.org/chv.cgi?CH=175071 Change 175071 by raj@raj_fdt on 2010/02/25 14:23:40 Adjust build infrastructure after the dtc/libfdt files reorg. Affected files ... .. //depot/projects/fdt/gnu/usr.bin/dtc/Makefile#3 edit .. //depot/projects/fdt/sys/boot/fdt/Makefile#2 edit .. //depot/projects/fdt/sys/boot/uboot/lib/Makefile#3 edit .. //depot/projects/fdt/sys/conf/Makefile.arm#4 edit .. //depot/projects/fdt/sys/conf/Makefile.powerpc#3 edit .. //depot/projects/fdt/sys/conf/files#14 edit .. //depot/projects/fdt/sys/conf/files.arm#5 edit .. //depot/projects/fdt/sys/conf/files.powerpc#18 edit .. //depot/projects/fdt/sys/dev/fdt/fdt_common.h#7 edit .. //depot/projects/fdt/sys/dev/ofw/ofw_fdt.c#5 edit Differences ... ==== //depot/projects/fdt/gnu/usr.bin/dtc/Makefile#3 (text+ko) ==== @@ -1,7 +1,8 @@ .include -DTCDIR= ${.CURDIR}/../../../sys/contrib/dtc -.PATH: ${DTCDIR} ${DTCDIR}/libfdt ${DTCDIR}/tests +DTCDIR= ${.CURDIR}/../../../contrib/dtc +LIBFDTDIR= ${.CURDIR}/../../../sys/contrib/libfdt +.PATH: ${DTCDIR} ${LIBFDTDIR} ${DTCDIR}/tests PROG= dtc @@ -11,7 +12,7 @@ fdt_sw.c fdt_wip.c $(DTCDIR)/version_gen.h CFLAGS = -Wall -g -Os -fPIC -Wpointer-arith -Wcast-qual -CFLAGS+= -I. -I${.CURDIR} -I${DTCDIR} -I${DTCDIR}/libfdt +CFLAGS+= -I. -I${.CURDIR} -I${DTCDIR} -I${LIBFDTDIR} VERSIONMAJ!= awk '/^VERSION =/ { print $$3 }' $(DTCDIR)/Makefile VERSIONMIN!= awk '/^PATCHLEVEL =/ { print $$3 }' $(DTCDIR)/Makefile ==== //depot/projects/fdt/sys/boot/fdt/Makefile#2 (text+ko) ==== @@ -1,6 +1,6 @@ # $FreeBSD$ -.PATH: ${.CURDIR}/../../contrib/dtc/libfdt/ +.PATH: ${.CURDIR}/../../contrib/libfdt/ LIB= fdt INTERNALLIB= @@ -9,7 +9,7 @@ #CFLAGS+= -I${.CURDIR}/../common -I${.CURDIR}/../.. -I. #CFLAGS+= -I${.CURDIR}/../../../lib/libstand -CFLAGS+= -I${.CURDIR}/../../contrib/dtc/libfdt/ +CFLAGS+= -I${.CURDIR}/../../contrib/libfdt/ CFLAGS+= -ffreestanding ==== //depot/projects/fdt/sys/boot/uboot/lib/Makefile#3 (text+ko) ==== @@ -14,7 +14,7 @@ CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ # Pick up FDT includes -CFLAGS+= -I${.CURDIR}/../../../../sys/contrib/dtc/libfdt/ +CFLAGS+= -I${.CURDIR}/../../../../sys/contrib/libfdt/ # Pick up the bootstrap header for some interface items CFLAGS+= -I${.CURDIR}/../../common -I${.CURDIR}/../../.. -I. ==== //depot/projects/fdt/sys/conf/Makefile.arm#4 (text+ko) ==== @@ -30,7 +30,7 @@ .endif .include "$S/conf/kern.pre.mk" -INCLUDES+= -I$S/contrib/dtc/libfdt +INCLUDES+= -I$S/contrib/libfdt SYSTEM_LD:= ${SYSTEM_LD:$S/conf/ldscript.$M=ldscript.$M} SYSTEM_DEP:= ${SYSTEM_DEP:$S/conf/ldscript.$M=ldscript.$M} ==== //depot/projects/fdt/sys/conf/Makefile.powerpc#3 (text+ko) ==== @@ -32,7 +32,7 @@ CFLAGS+= -msoft-float -INCLUDES+= -I$S/contrib/dtc/libfdt +INCLUDES+= -I$S/contrib/libfdt DDB_ENABLED!= grep DDB opt_ddb.h || true .if !empty(DDB_ENABLED) ==== //depot/projects/fdt/sys/conf/files#14 (text+ko) ==== @@ -299,6 +299,12 @@ compile-with "${NORMAL_C} -I$S/contrib/ipfilter" contrib/ipfilter/netinet/mlfk_ipl.c optional ipfilter inet \ compile-with "${NORMAL_C} -I$S/contrib/ipfilter" +contrib/libfdt/fdt.c optional fdt +contrib/libfdt/fdt_ro.c optional fdt +contrib/libfdt/fdt_rw.c optional fdt +contrib/libfdt/fdt_strerror.c optional fdt +contrib/libfdt/fdt_sw.c optional fdt +contrib/libfdt/fdt_wip.c optional fdt contrib/ngatm/netnatm/api/cc_conn.c optional ngatm_ccatm \ compile-with "${NORMAL_C_NOWERROR} -I$S/contrib/ngatm" contrib/ngatm/netnatm/api/cc_data.c optional ngatm_ccatm \ @@ -955,6 +961,9 @@ dev/exca/exca.c optional cbb dev/fatm/if_fatm.c optional fatm pci dev/fb/splash.c optional splash +dev/fdt/fdt_common.c optional fdt +dev/fdt/fdtbus.c optional fdt +dev/fdt/simplebus.c optional fdt dev/fe/if_fe.c optional fe dev/fe/if_fe_pccard.c optional fe pccard dev/firewire/firewire.c optional firewire ==== //depot/projects/fdt/sys/conf/files.arm#5 (text+ko) ==== @@ -47,16 +47,7 @@ arm/fpe-arm/armfpe_glue.S optional armfpe arm/fpe-arm/armfpe_init.c optional armfpe arm/fpe-arm/armfpe.S optional armfpe -contrib/dtc/libfdt/fdt.c optional fdt -contrib/dtc/libfdt/fdt_ro.c optional fdt -contrib/dtc/libfdt/fdt_rw.c optional fdt -contrib/dtc/libfdt/fdt_strerror.c optional fdt -contrib/dtc/libfdt/fdt_sw.c optional fdt -contrib/dtc/libfdt/fdt_wip.c optional fdt dev/fdt/fdt_arm.c optional fdt -dev/fdt/fdt_common.c optional fdt -dev/fdt/fdtbus.c optional fdt -dev/fdt/simplebus.c optional fdt dev/hwpmc/hwpmc_arm.c optional hwpmc dev/ofw/openfirm.c optional fdt dev/ofw/openfirmio.c optional fdt ==== //depot/projects/fdt/sys/conf/files.powerpc#18 (text+ko) ==== @@ -14,13 +14,6 @@ no-obj no-implicit-rule before-depend \ clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8" # - -contrib/dtc/libfdt/fdt.c optional fdt -contrib/dtc/libfdt/fdt_ro.c optional fdt -contrib/dtc/libfdt/fdt_rw.c optional fdt -contrib/dtc/libfdt/fdt_strerror.c optional fdt -contrib/dtc/libfdt/fdt_sw.c optional fdt -contrib/dtc/libfdt/fdt_wip.c optional fdt crypto/blowfish/bf_enc.c optional crypto | ipsec crypto/des/des_enc.c optional crypto | ipsec | netsmb dev/bm/if_bm.c optional bm powermac @@ -31,10 +24,7 @@ dev/adb/adb_if.m optional adb dev/cfi/cfi_bus_fdt.c optional cfi fdt dev/fb/fb.c optional sc -dev/fdt/fdt_common.c optional fdt dev/fdt/fdt_powerpc.c optional fdt -dev/fdt/fdtbus.c optional fdt -dev/fdt/simplebus.c optional fdt dev/hwpmc/hwpmc_powerpc.c optional hwpmc dev/kbd/kbd.c optional sc dev/ofw/openfirm.c optional aim | fdt ==== //depot/projects/fdt/sys/dev/fdt/fdt_common.h#7 (text+ko) ==== @@ -30,7 +30,7 @@ #ifndef _FDT_COMMON_H_ #define _FDT_COMMON_H_ -#include "../../contrib/dtc/libfdt/libfdt_env.h" +#include #include #define DI_MAX_INTR_NUM 8 ==== //depot/projects/fdt/sys/dev/ofw/ofw_fdt.c#5 (text+ko) ==== @@ -35,7 +35,7 @@ #include #include -#include +#include #include From owner-p4-projects@FreeBSD.ORG Thu Feb 25 14:52:15 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6834B1065674; Thu, 25 Feb 2010 14:52:15 +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 0B4AA106566C for ; Thu, 25 Feb 2010 14:52:15 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ECAE38FC23 for ; Thu, 25 Feb 2010 14:52:14 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o1PEqEiV080137 for ; Thu, 25 Feb 2010 14:52:14 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o1PEqED6080135 for perforce@freebsd.org; Thu, 25 Feb 2010 14:52:14 GMT (envelope-from raj@freebsd.org) Date: Thu, 25 Feb 2010 14:52:14 GMT Message-Id: <201002251452.o1PEqED6080135@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 175074 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Feb 2010 14:52:15 -0000 http://p4web.freebsd.org/chv.cgi?CH=175074 Change 175074 by raj@raj_fdt on 2010/02/25 14:51:57 Clean up Orion/88F5XXX and fix build. Affected files ... .. //depot/projects/fdt/sys/arm/mv/orion/db88f5xxx.c#2 edit .. //depot/projects/fdt/sys/arm/mv/orion/orion.c#2 edit Differences ... ==== //depot/projects/fdt/sys/arm/mv/orion/db88f5xxx.c#2 (text+ko) ==== @@ -150,6 +150,7 @@ }; #endif +#if 0 /* * mv_gpio_config row structure: * , , @@ -182,62 +183,7 @@ }; #endif -void -platform_mpp_init(void) -{ - - /* - * MPP configuration for DB-88F5281 - * - * MPP[2]: PCI_REQn[3] - * MPP[3]: PCI_GNTn[3] - * MPP[4]: PCI_REQn[4] - * MPP[5]: PCI_GNTn[4] - * MPP[6]: - * MPP[7]: - * MPP[8]: - * MPP[9]: - * MPP[14]: NAND Flash REn[2] - * MPP[15]: NAND Flash WEn[2] - * MPP[16]: UA1_RXD - * MPP[17]: UA1_TXD - * MPP[18]: UA1_CTS - * MPP[19]: UA1_RTS - * - * Others: GPIO - * - * entries are not documented, not on the schematics etc. - */ - bus_space_write_4(obio_tag, MV_MPP_BASE, MPP_CONTROL0, 0x33222203); - bus_space_write_4(obio_tag, MV_MPP_BASE, MPP_CONTROL1, 0x44000033); - bus_space_write_4(obio_tag, MV_MPP_BASE, MPP_CONTROL2, 0x00000000); - -#if 0 - /* - * MPP configuration for DB-88F5182 - * - * MPP[2]: PCI_REQn[3] - * MPP[3]: PCI_GNTn[3] - * MPP[4]: PCI_REQn[4] - * MPP[5]: PCI_GNTn[4] - * MPP[6]: SATA0_ACT - * MPP[7]: SATA1_ACT - * MPP[12]: SATA0_PRESENT - * MPP[13]: SATA1_PRESENT - * MPP[14]: NAND_FLASH_REn[2] - * MPP[15]: NAND_FLASH_WEn[2] - * MPP[16]: UA1_RXD - * MPP[17]: UA1_TXD - * MPP[18]: UA1_CTS - * MPP[19]: UA1_RTS - * - * Others: GPIO - */ - bus_space_write_4(obio_tag, MV_MPP_BASE, MPP_CONTROL0, 0x55222203); - bus_space_write_4(obio_tag, MV_MPP_BASE, MPP_CONTROL1, 0x44550000); - bus_space_write_4(obio_tag, MV_MPP_BASE, MPP_CONTROL2, 0x00000000); #endif -} static void platform_identify(void *dummy) ==== //depot/projects/fdt/sys/arm/mv/orion/orion.c#2 (text+ko) ==== @@ -44,61 +44,6 @@ extern const struct obio_pci_irq_map pci_irq_map[]; -struct obio_device obio_devices[] = { - { "ic", MV_IC_BASE, MV_IC_SIZE, - { -1 }, - { -1 }, - CPU_PM_CTRL_NONE - }, - { "timer", MV_TIMERS_BASE, MV_TIMERS_SIZE, - { MV_INT_BRIDGE, -1 }, - { -1 }, - CPU_PM_CTRL_NONE - }, - { "gpio", MV_GPIO_BASE, MV_GPIO_SIZE, - { MV_INT_GPIO7_0, MV_INT_GPIO15_8, - MV_INT_GPIO23_16, MV_INT_GPIO31_24, -1 }, - { -1 }, - CPU_PM_CTRL_NONE - }, - { "uart", MV_UART0_BASE, MV_UART_SIZE, - { MV_INT_UART0, -1 }, - { -1 }, - CPU_PM_CTRL_NONE - }, - { "uart", MV_UART1_BASE, MV_UART_SIZE, - { MV_INT_UART1, -1 }, - { -1 }, - CPU_PM_CTRL_NONE - }, - { "idma", MV_IDMA_BASE, MV_IDMA_SIZE, - { MV_INT_IDMA_ERR, MV_INT_IDMA0, MV_INT_IDMA1, - MV_INT_IDMA2, MV_INT_IDMA3, -1 }, - { -1 }, - CPU_PM_CTRL_NONE - }, - { "ehci", MV_USB0_BASE, MV_USB_SIZE, - { MV_INT_USB_BERR, MV_INT_USB_CI, -1 }, - { -1 }, - CPU_PM_CTRL_NONE - }, - { "mge", MV_ETH0_BASE, MV_ETH_SIZE, - { MV_INT_GBERX, MV_INT_GBETX, MV_INT_GBEMISC, - MV_INT_GBESUM, MV_INT_GBEERR, -1 }, - { -1 }, - CPU_PM_CTRL_NONE - }, - { "twsi", MV_TWSI0_BASE, MV_TWSI_SIZE, - { -1 }, { -1 }, - CPU_PM_CTRL_NONE - }, - { "sata", MV_SATAHC_BASE, MV_SATAHC_SIZE, - { MV_INT_SATA, -1 }, { -1 }, - CPU_PM_CTRL_NONE - }, - { NULL, 0, 0, { 0 } } -}; - const struct obio_pci mv_pci_info[] = { { MV_TYPE_PCIE, MV_PCIE_BASE, MV_PCIE_SIZE, @@ -126,22 +71,7 @@ { -1, 0 } }; -const struct decode_win cpu_win_tbl[] = { - /* Device bus BOOT */ - { 1, 0x0f, MV_DEV_BOOT_PHYS_BASE, MV_DEV_BOOT_SIZE, -1 }, - - /* Device bus CS0 */ - { 1, 0x1e, MV_DEV_CS0_PHYS_BASE, MV_DEV_CS0_SIZE, -1 }, - - /* Device bus CS1 */ - { 1, 0x1d, MV_DEV_CS1_PHYS_BASE, MV_DEV_CS1_SIZE, -1 }, - - /* Device bus CS2 */ - { 1, 0x1b, MV_DEV_CS2_PHYS_BASE, MV_DEV_CS2_SIZE, -1 }, -}; -const struct decode_win *cpu_wins = cpu_win_tbl; -int cpu_wins_no = sizeof(cpu_win_tbl) / sizeof(struct decode_win); - +/* TODO convert this to DT-derived approach. */ /* * Note: the decode windows table for IDMA does not explicitly have DRAM * entries, which are not statically defined: active DDR banks (== windows) From owner-p4-projects@FreeBSD.ORG Thu Feb 25 14:53:16 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 881561065674; Thu, 25 Feb 2010 14:53:16 +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 4BF2D106564A for ; Thu, 25 Feb 2010 14:53:16 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1F1A18FC1C for ; Thu, 25 Feb 2010 14:53:16 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o1PErGVf080197 for ; Thu, 25 Feb 2010 14:53:16 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o1PErFhD080195 for perforce@freebsd.org; Thu, 25 Feb 2010 14:53:15 GMT (envelope-from raj@freebsd.org) Date: Thu, 25 Feb 2010 14:53:15 GMT Message-Id: <201002251453.o1PErFhD080195@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 175075 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Feb 2010 14:53:16 -0000 http://p4web.freebsd.org/chv.cgi?CH=175075 Change 175075 by raj@raj_fdt on 2010/02/25 14:53:13 Enable FDT support for SHEEVAPLUG kernel (and clean up) Affected files ... .. //depot/projects/fdt/sys/arm/conf/SHEEVAPLUG#2 edit .. //depot/projects/fdt/sys/arm/mv/kirkwood/sheevaplug.c#2 edit Differences ... ==== //depot/projects/fdt/sys/arm/conf/SHEEVAPLUG#2 (text+ko) ==== @@ -13,6 +13,7 @@ #makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions WERROR="-Werror" +options FDT #Flattened Device Tree options SCHED_4BSD #4BSD scheduler options INET #InterNETworking options INET6 #IPv6 communications protocols ==== //depot/projects/fdt/sys/arm/mv/kirkwood/sheevaplug.c#2 (text+ko) ==== @@ -94,50 +94,6 @@ { 0, 0, 0, 0, 0, } }; -const struct gpio_config mv_gpio_config[] = { - { -1, -1, -1 } -}; - -void -platform_mpp_init(void) -{ - - /* - * MPP configuration for Sheeva Plug - * - * MPP[0]: NF_IO[2] - * MPP[1]: NF_IO[3] - * MPP[2]: NF_IO[4] - * MPP[3]: NF_IO[5] - * MPP[4]: NF_IO[6] - * MPP[5]: NF_IO[7] - * MPP[6]: SYSRST_OUTn - * MPP[8]: UA0_RTS - * MPP[9]: UA0_CTS - * MPP[10]: UA0_TXD - * MPP[11]: UA0_RXD - * MPP[12]: SD_CLK - * MPP[13]: SD_CMD - * MPP[14]: SD_D[0] - * MPP[15]: SD_D[1] - * MPP[16]: SD_D[2] - * MPP[17]: SD_D[3] - * MPP[18]: NF_IO[0] - * MPP[19]: NF_IO[1] - * MPP[29]: TSMP[9] - * - * Others: GPIO - */ - - bus_space_write_4(obio_tag, MV_MPP_BASE, MPP_CONTROL0, 0x01111111); - bus_space_write_4(obio_tag, MV_MPP_BASE, MPP_CONTROL1, 0x11113322); - bus_space_write_4(obio_tag, MV_MPP_BASE, MPP_CONTROL2, 0x00001111); - bus_space_write_4(obio_tag, MV_MPP_BASE, MPP_CONTROL3, 0x00100000); - bus_space_write_4(obio_tag, MV_MPP_BASE, MPP_CONTROL4, 0x00000000); - bus_space_write_4(obio_tag, MV_MPP_BASE, MPP_CONTROL5, 0x00000000); - bus_space_write_4(obio_tag, MV_MPP_BASE, MPP_CONTROL6, 0x00000000); -} - static void platform_identify(void *dummy) { From owner-p4-projects@FreeBSD.ORG Thu Feb 25 14:55:18 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B23891065673; Thu, 25 Feb 2010 14:55:18 +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 76006106566B for ; Thu, 25 Feb 2010 14:55:18 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 494848FC17 for ; Thu, 25 Feb 2010 14:55:18 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o1PEtIpk080366 for ; Thu, 25 Feb 2010 14:55:18 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o1PEtIi8080364 for perforce@freebsd.org; Thu, 25 Feb 2010 14:55:18 GMT (envelope-from raj@freebsd.org) Date: Thu, 25 Feb 2010 14:55:18 GMT Message-Id: <201002251455.o1PEtIi8080364@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 175076 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Feb 2010 14:55:18 -0000 http://p4web.freebsd.org/chv.cgi?CH=175076 Change 175076 by raj@raj_fdt on 2010/02/25 14:54:19 Initial version of the DTS file for the DB-88F5182 board. Affected files ... .. //depot/projects/fdt/sys/boot/fdt/dts/db88f5182.dts#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Feb 25 14:55:20 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5FE04106574D; Thu, 25 Feb 2010 14:55:18 +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 A2737106566C for ; Thu, 25 Feb 2010 14:55:18 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7597D8FC19 for ; Thu, 25 Feb 2010 14:55:18 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o1PEtIi4080371 for ; Thu, 25 Feb 2010 14:55:18 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o1PEtI5h080369 for perforce@freebsd.org; Thu, 25 Feb 2010 14:55:18 GMT (envelope-from raj@freebsd.org) Date: Thu, 25 Feb 2010 14:55:18 GMT Message-Id: <201002251455.o1PEtI5h080369@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 175077 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Feb 2010 14:55:20 -0000 http://p4web.freebsd.org/chv.cgi?CH=175077 Change 175077 by raj@raj_fdt on 2010/02/25 14:54:43 Initial version of the DTS file for the DB-88F5281 board. Affected files ... .. //depot/projects/fdt/sys/boot/fdt/dts/db88f5281.dts#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Feb 25 14:55:21 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 53C09106581A; Thu, 25 Feb 2010 14:55:20 +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 44625106570A for ; Thu, 25 Feb 2010 14:55:18 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A1E3E8FC1A for ; Thu, 25 Feb 2010 14:55:18 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o1PEtIDE080376 for ; Thu, 25 Feb 2010 14:55:18 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o1PEtIr5080374 for perforce@freebsd.org; Thu, 25 Feb 2010 14:55:18 GMT (envelope-from raj@freebsd.org) Date: Thu, 25 Feb 2010 14:55:18 GMT Message-Id: <201002251455.o1PEtIr5080374@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 175078 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Feb 2010 14:55:21 -0000 http://p4web.freebsd.org/chv.cgi?CH=175078 Change 175078 by raj@raj_fdt on 2010/02/25 14:55:07 Initial version of the DTS file for the SheevaPlug device. Affected files ... .. //depot/projects/fdt/sys/boot/fdt/dts/sheevaplug.dts#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Thu Feb 25 20:31:57 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 167011065673; Thu, 25 Feb 2010 20:31:57 +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 B6BC3106564A for ; Thu, 25 Feb 2010 20:31:56 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A44068FC12 for ; Thu, 25 Feb 2010 20:31:56 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o1PKVuQO021496 for ; Thu, 25 Feb 2010 20:31:56 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o1PKVu5F021494 for perforce@freebsd.org; Thu, 25 Feb 2010 20:31:56 GMT (envelope-from pgj@FreeBSD.org) Date: Thu, 25 Feb 2010 20:31:56 GMT Message-Id: <201002252031.o1PKVu5F021494@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 175089 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Feb 2010 20:31:57 -0000 http://p4web.freebsd.org/chv.cgi?CH=175089 Change 175089 by pgj@Binturong on 2010/02/25 20:31:47 IFC Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/version-guide/article.sgml#11 integrate .. //depot/projects/docproj_hu/www/en/cgi/search.cgi#2 integrate .. //depot/projects/docproj_hu/www/en/releases/7.3R/Makefile#1 branch .. //depot/projects/docproj_hu/www/en/releases/7.3R/docbook.css#1 branch .. //depot/projects/docproj_hu/www/en/releases/7.3R/schedule.sgml#1 branch .. //depot/projects/docproj_hu/www/en/releases/Makefile#5 integrate .. //depot/projects/docproj_hu/www/en/releng/index.sgml#36 integrate .. //depot/projects/docproj_hu/www/en/where.sgml#7 integrate .. //depot/projects/docproj_hu/www/share/sgml/release.ent#21 integrate Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/articles/version-guide/article.sgml#11 (text+ko) ==== @@ -24,7 +24,7 @@ - $FreeBSD: doc/hu_HU.ISO8859-2/articles/version-guide/article.sgml,v 1.8 2008/06/25 11:28:04 gabor Exp $ + $FreeBSD: doc/hu_HU.ISO8859-2/articles/version-guide/article.sgml,v 1.9 2010/02/22 12:06:15 pgj Exp $ &tm-attrib.freebsd; ==== //depot/projects/docproj_hu/www/en/cgi/search.cgi#2 (text+ko) ==== @@ -15,7 +15,7 @@ # Disclaimer: # This is pretty ugly in places. # -# $FreeBSD: www/en/cgi/search.cgi,v 1.27 2006/03/24 01:51:18 kuriyama Exp $ +# $FreeBSD: www/en/cgi/search.cgi,v 1.28 2010/02/25 09:50:44 wosch Exp $ $server_root = '/usr/local/www'; @@ -248,7 +248,7 @@ # print ""; print "Score: $score; "; $_ = $date; - /(...?)(..)(..)/ && ($yr = $1 + 1900, $mo = $months[$2 - 1], $dy = $3); + /^(..?)(..)(..)$/ && ($yr = $1 + ($1 > 69 ? 1900 : 2000), $mo = $months[$2 - 1], $dy = $3); print "Lines: $lines; "; print "${dy}-${mo}-${yr}; "; print "Archive: $file"; ==== //depot/projects/docproj_hu/www/en/releases/Makefile#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: www/en/releases/Makefile,v 1.54 2009/09/23 20:03:59 blackend Exp $ +# $FreeBSD: www/en/releases/Makefile,v 1.55 2010/02/23 20:57:17 hrs Exp $ .if exists(../Makefile.conf) .include "../Makefile.conf" @@ -15,7 +15,8 @@ SUBDIR+= 4.6.2R 4.7R 4.8R 4.9R 4.10R 4.11R SUBDIR+= 5.0R 5.1R 5.2R 5.2.1R 5.3R 5.4R 5.5R SUBDIR+= 6.0R 6.1R 6.2R 6.3R 6.4R -SUBDIR+= 7.0R 7.1R 7.2R 8.0R +SUBDIR+= 7.0R 7.1R 7.2R 7.3R +SUBDIR+= 8.0R .if defined $(NEW_BUILD) SUBDIR= ==== //depot/projects/docproj_hu/www/en/releng/index.sgml#36 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -48,15 +48,10 @@ - May 2009 - FreeBSD 7.2 - released on schedule - - - - November 2009 - FreeBSD 8.0 - Released. + March 2010 + &os; 7.3 + RC1 is available @@ -100,9 +95,16 @@ RELENG_7 + Open + committers + Development branch for 7-STABLE. + + + + RELENG_7_3 Frozen &contact.re; - Development branch for 7-STABLE. + Frozen in preparation for 7.3-RELEASE. ==== //depot/projects/docproj_hu/www/en/where.sgml#7 (text+ko) ==== @@ -1,5 +1,5 @@ + @@ -175,20 +175,17 @@ Version & Platform Distribution ISO - Schedule - + Status page FreeBSD &betarel.current;-&betarel.vers; - [View] + [View] @@ -202,24 +199,28 @@ [Distribution] [ISO] + pc98 [Distribution] [ISO] + sparc64 ==== //depot/projects/docproj_hu/www/share/sgml/release.ent#21 (text+ko) ==== @@ -1,4 +1,4 @@ - + - - - - + + + + @@ -196,6 +196,32 @@ egyaránt. + + it 360° 2010 + http://www.it360.ca/ + + 2010 + 4 + 7 + + + 2010 + 4 + 7 + + + Kanada + Toronto + + Az IT360° Conference & Expo 2010 + elnevezésû rendezvény IT szakemberek és + felsõvezetõk részére szánt + ismeretterjesztés és felzárkoztatás. + Itt képviselteti magát a BSD Certification Group, + és a helyszínen lehetõség nyílik + BSDA minõsítõ vizsgát tenni. + + OpenExpo 2010 http://www.openexpo.ch/ ==== //depot/projects/docproj_hu/www/hu/share/sgml/news.xml#85 (text+ko) ==== @@ -5,7 +5,7 @@ @@ -22,6 +22,24 @@ 2 + 15 + + + Megjelent a &os; 7.3-RC1! + +

Mostantól letölthetõvé vált + a &os; 7.3 elsõ kiadásra jelölt + változata. A &os; + tükrözések + többségérõl már elérhetõek + ISO formátumú lemezképek az összes + Tier 1 architektúrára.

+ + + + 12 ==== //depot/projects/docproj_hu/www/hu/where.sgml#22 (text+ko) ==== @@ -8,7 +8,7 @@ @@ -203,20 +203,17 @@ Verzió és platform Disztribúció ISO - Ütemterv - + Jelenlegi állapot &os; &betarel.current;-&betarel.vers; - [Megtekint] + [Megtekint] @@ -230,24 +227,28 @@ [Disztribúció] [ISO] + pc98 [Disztribúció] [ISO] + sparc64 From owner-p4-projects@FreeBSD.ORG Fri Feb 26 19:56:45 2010 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 675621065674; Fri, 26 Feb 2010 19:56:45 +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 2BBE5106564A for ; Fri, 26 Feb 2010 19:56:45 +0000 (UTC) (envelope-from raj@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 19AFD8FC15 for ; Fri, 26 Feb 2010 19:56:45 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id o1QJuiA3011557 for ; Fri, 26 Feb 2010 19:56:44 GMT (envelope-from raj@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id o1QJuiNX011555 for perforce@freebsd.org; Fri, 26 Feb 2010 19:56:44 GMT (envelope-from raj@freebsd.org) Date: Fri, 26 Feb 2010 19:56:44 GMT Message-Id: <201002261956.o1QJuiNX011555@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to raj@freebsd.org using -f From: Rafal Jaworowski To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 175134 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 26 Feb 2010 19:56:45 -0000 http://p4web.freebsd.org/chv.cgi?CH=175134 Change 175134 by raj@raj_fdt on 2010/02/26 19:56:11 Fix missing closing brackets at pin-map prop. Affected files ... .. //depot/projects/fdt/sys/boot/fdt/dts/db88f5182.dts#2 edit .. //depot/projects/fdt/sys/boot/fdt/dts/db88f5281.dts#2 edit .. //depot/projects/fdt/sys/boot/fdt/dts/sheevaplug.dts#2 edit Differences ... ==== //depot/projects/fdt/sys/boot/fdt/dts/db88f5182.dts#2 (text+ko) ==== @@ -148,7 +148,7 @@ 16 0 /* MPP[16]: UA1_RXD */ 17 0 /* MPP[17]: UA1_TXD */ 18 0 /* MPP[18]: UA1_CTS */ - 19 0 /* MPP[19]: UA1_RTS */ + 19 0 >; /* MPP[19]: UA1_RTS */ }; GPIO: gpio@10100 { ==== //depot/projects/fdt/sys/boot/fdt/dts/db88f5281.dts#2 (text+ko) ==== @@ -148,7 +148,7 @@ 16 0 /* MPP[16]: UA1_RXD */ 17 0 /* MPP[17]: UA1_TXD */ 18 0 /* MPP[18]: UA1_CTS */ - 19 0 /* MPP[19]: UA1_RTS */ + 19 0 >; /* MPP[19]: UA1_RTS */ }; GPIO: gpio@10100 { ==== //depot/projects/fdt/sys/boot/fdt/dts/sheevaplug.dts#2 (text+ko) ==== @@ -161,7 +161,7 @@ 17 1 /* MPP[17]: SD_D[3] */ 18 1 /* MPP[18]: NF_IO[0] */ 19 1 /* MPP[19]: NF_IO[1] */ - 29 1 /* MPP[29]: TSMP[9] */ + 29 1 >; /* MPP[29]: TSMP[9] */ }; GPIO: gpio@10100 {