From owner-p4-projects@FreeBSD.ORG Sun May 13 00:40:57 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B06D916A409; Sun, 13 May 2007 00:40:57 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4AC7D16A403 for ; Sun, 13 May 2007 00:40:57 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 22B4613C46C for ; Sun, 13 May 2007 00:40:57 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4D0evYe085987 for ; Sun, 13 May 2007 00:40:57 GMT (envelope-from ivoras@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4D0euiu085965 for perforce@freebsd.org; Sun, 13 May 2007 00:40:56 GMT (envelope-from ivoras@FreeBSD.org) Date: Sun, 13 May 2007 00:40:56 GMT Message-Id: <200705130040.l4D0euiu085965@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ivoras@FreeBSD.org using -f From: Ivan Voras To: Perforce Change Reviews Cc: Subject: PERFORCE change 119738 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, 13 May 2007 00:40:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=119738 Change 119738 by ivoras@ivoras_finstall on 2007/05/13 00:40:28 finstall GUI application skeleton Affected files ... .. //depot/projects/soc2007/ivoras_finstall/installer/finstall.py#1 add .. //depot/projects/soc2007/ivoras_finstall/installer/glade/mainwin.glade#1 add .. //depot/projects/soc2007/ivoras_finstall/installer/img/logo.jpg#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Sun May 13 03:38:37 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D14A516A406; Sun, 13 May 2007 03:38:36 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 993E216A400 for ; Sun, 13 May 2007 03:38:36 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 89B4513C447 for ; Sun, 13 May 2007 03:38:36 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4D3caDC026584 for ; Sun, 13 May 2007 03:38:36 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4D3calv026581 for perforce@freebsd.org; Sun, 13 May 2007 03:38:36 GMT (envelope-from sephe@FreeBSD.org) Date: Sun, 13 May 2007 03:38:36 GMT Message-Id: <200705130338.l4D3calv026581@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 119740 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, 13 May 2007 03:38:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=119740 Change 119740 by sephe@sephe_zealot:sam_wifi on 2007/05/13 03:38:02 Add ieee80211_ht.c Affected files ... .. //depot/projects/wifi/sys/modules/wlan/Makefile#8 edit Differences ... ==== //depot/projects/wifi/sys/modules/wlan/Makefile#8 (text+ko) ==== @@ -6,7 +6,8 @@ SRCS= ieee80211.c ieee80211_crypto.c ieee80211_crypto_none.c \ ieee80211_freebsd.c ieee80211_input.c ieee80211_ioctl.c \ ieee80211_node.c ieee80211_output.c ieee80211_power.c \ - ieee80211_proto.c ieee80211_scan.c ieee80211_regdomain.c + ieee80211_proto.c ieee80211_scan.c ieee80211_regdomain.c \ + ieee80211_ht.c SRCS+= bus_if.h device_if.h opt_compat.h opt_inet.h opt_ipx.h .if !defined(KERNBUILDDIR) From owner-p4-projects@FreeBSD.ORG Sun May 13 03:40:40 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 11C2A16A408; Sun, 13 May 2007 03:40:40 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B4F4F16A400 for ; Sun, 13 May 2007 03:40:39 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A563513C447 for ; Sun, 13 May 2007 03:40:39 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4D3edZ5026747 for ; Sun, 13 May 2007 03:40:39 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4D3edtE026743 for perforce@freebsd.org; Sun, 13 May 2007 03:40:39 GMT (envelope-from sephe@FreeBSD.org) Date: Sun, 13 May 2007 03:40:39 GMT Message-Id: <200705130340.l4D3edtE026743@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 119741 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, 13 May 2007 03:40:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=119741 Change 119741 by sephe@sephe_zealot:sam_wifi on 2007/05/13 03:39:41 u_intX_t -> uintX_t Approved by: sam Affected files ... .. //depot/projects/wifi/sys/net80211/_ieee80211.h#20 edit Differences ... ==== //depot/projects/wifi/sys/net80211/_ieee80211.h#20 (text+ko) ==== @@ -109,9 +109,9 @@ * Channels are specified by frequency and attributes. */ struct ieee80211_channel { - u_int32_t ic_flags; /* see below */ - u_int16_t ic_freq; /* setting in Mhz */ - u_int8_t ic_ieee; /* IEEE channel number */ + uint32_t ic_flags; /* see below */ + uint16_t ic_freq; /* setting in Mhz */ + uint8_t ic_ieee; /* IEEE channel number */ int8_t ic_maxregpower; /* maximum regulatory tx power in dBm */ int8_t ic_maxpower; /* maximum tx power in .5 dBm */ int8_t ic_minpower; /* minimum tx power in .5 dBm */ @@ -248,8 +248,8 @@ #define IEEE80211_RATE_MAXSIZE 15 /* max rates we'll handle */ struct ieee80211_rateset { - u_int8_t rs_nrates; - u_int8_t rs_rates[IEEE80211_RATE_MAXSIZE]; + uint8_t rs_nrates; + uint8_t rs_rates[IEEE80211_RATE_MAXSIZE]; }; /* @@ -261,8 +261,8 @@ #define IEEE80211_HTRATE_MAXSIZE 127 struct ieee80211_htrateset { - u_int8_t rs_nrates; - u_int8_t rs_rates[IEEE80211_HTRATE_MAXSIZE]; + uint8_t rs_nrates; + uint8_t rs_rates[IEEE80211_HTRATE_MAXSIZE]; }; /* @@ -276,10 +276,10 @@ int8_t rssi11a; /* rssi thresh for 11a bss */ int8_t rssi11b; /* for 11g sta in 11b bss */ int8_t rssi11bOnly; /* for 11b sta */ - u_int8_t pad1; - u_int8_t rate11a; /* rate thresh for 11a bss */ - u_int8_t rate11b; /* for 11g sta in 11b bss */ - u_int8_t rate11bOnly; /* for 11b sta */ - u_int8_t pad2; + uint8_t pad1; + uint8_t rate11a; /* rate thresh for 11a bss */ + uint8_t rate11b; /* for 11g sta in 11b bss */ + uint8_t rate11bOnly; /* for 11b sta */ + uint8_t pad2; }; #endif /* _NET80211__IEEE80211_H_ */ From owner-p4-projects@FreeBSD.ORG Sun May 13 03:42:43 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5911D16A407; Sun, 13 May 2007 03:42:43 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1033416A405 for ; Sun, 13 May 2007 03:42:43 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 00B4A13C459 for ; Sun, 13 May 2007 03:42:43 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4D3ggvo027527 for ; Sun, 13 May 2007 03:42:42 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4D3ggUt027524 for perforce@freebsd.org; Sun, 13 May 2007 03:42:42 GMT (envelope-from sephe@FreeBSD.org) Date: Sun, 13 May 2007 03:42:42 GMT Message-Id: <200705130342.l4D3ggUt027524@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 119742 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, 13 May 2007 03:42:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=119742 Change 119742 by sephe@sephe_zealot:sam_wifi on 2007/05/13 03:42:36 u_intX_t -> uintX_t Approved by: sam Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211.c#52 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211.c#52 (text+ko) ==== @@ -88,7 +88,7 @@ SLIST_HEAD(ieee80211_list, ieee80211com); static struct ieee80211_list ieee80211_list = SLIST_HEAD_INITIALIZER(ieee80211_list); -static u_int8_t ieee80211_vapmap[32]; /* enough for 256 */ +static uint8_t ieee80211_vapmap[32]; /* enough for 256 */ static struct mtx ieee80211_vap_mtx; MTX_SYSINIT(ieee80211, &ieee80211_vap_mtx, "net80211 instances", MTX_DEF); @@ -97,7 +97,7 @@ { #define N(a) (sizeof(a)/sizeof(a[0])) int i; - u_int8_t b; + uint8_t b; mtx_lock(&ieee80211_vap_mtx); ic->ic_vap = 0; @@ -683,7 +683,7 @@ * Find an instance by it's mac address. */ struct ieee80211com * -ieee80211_find_vap(const u_int8_t mac[IEEE80211_ADDR_LEN]) +ieee80211_find_vap(const uint8_t mac[IEEE80211_ADDR_LEN]) { struct ieee80211com *ic; From owner-p4-projects@FreeBSD.ORG Sun May 13 03:51:57 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C89216A405; Sun, 13 May 2007 03:51:57 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A7ADF16A400 for ; Sun, 13 May 2007 03:51:55 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 976AB13C447 for ; Sun, 13 May 2007 03:51:55 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4D3ptAQ028966 for ; Sun, 13 May 2007 03:51:55 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4D3ptCs028963 for perforce@freebsd.org; Sun, 13 May 2007 03:51:55 GMT (envelope-from sephe@FreeBSD.org) Date: Sun, 13 May 2007 03:51:55 GMT Message-Id: <200705130351.l4D3ptCs028963@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 119743 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, 13 May 2007 03:51:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=119743 Change 119743 by sephe@sephe_zealot:sam_wifi on 2007/05/13 03:50:59 u_intX_t -> uintX_t Approved by: sam Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211.h#21 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211.h#21 (text+ko) ==== @@ -44,11 +44,11 @@ /* IEEE 802.11 PLCP header */ struct ieee80211_plcp_hdr { - u_int16_t i_sfd; - u_int8_t i_signal; - u_int8_t i_service; - u_int16_t i_length; - u_int16_t i_crc; + uint16_t i_sfd; + uint8_t i_signal; + uint8_t i_service; + uint16_t i_length; + uint16_t i_crc; } __packed; #define IEEE80211_PLCP_SFD 0xF3A0 @@ -58,52 +58,52 @@ * generic definitions for IEEE 802.11 frames */ struct ieee80211_frame { - u_int8_t i_fc[2]; - u_int8_t i_dur[2]; - u_int8_t i_addr1[IEEE80211_ADDR_LEN]; - u_int8_t i_addr2[IEEE80211_ADDR_LEN]; - u_int8_t i_addr3[IEEE80211_ADDR_LEN]; - u_int8_t i_seq[2]; + uint8_t i_fc[2]; + uint8_t i_dur[2]; + uint8_t i_addr1[IEEE80211_ADDR_LEN]; + uint8_t i_addr2[IEEE80211_ADDR_LEN]; + uint8_t i_addr3[IEEE80211_ADDR_LEN]; + uint8_t i_seq[2]; /* possibly followed by addr4[IEEE80211_ADDR_LEN]; */ /* see below */ } __packed; struct ieee80211_qosframe { - u_int8_t i_fc[2]; - u_int8_t i_dur[2]; - u_int8_t i_addr1[IEEE80211_ADDR_LEN]; - u_int8_t i_addr2[IEEE80211_ADDR_LEN]; - u_int8_t i_addr3[IEEE80211_ADDR_LEN]; - u_int8_t i_seq[2]; - u_int8_t i_qos[2]; + uint8_t i_fc[2]; + uint8_t i_dur[2]; + uint8_t i_addr1[IEEE80211_ADDR_LEN]; + uint8_t i_addr2[IEEE80211_ADDR_LEN]; + uint8_t i_addr3[IEEE80211_ADDR_LEN]; + uint8_t i_seq[2]; + uint8_t i_qos[2]; /* possibly followed by addr4[IEEE80211_ADDR_LEN]; */ /* see below */ } __packed; struct ieee80211_qoscntl { - u_int8_t i_qos[2]; + uint8_t i_qos[2]; }; struct ieee80211_frame_addr4 { - u_int8_t i_fc[2]; - u_int8_t i_dur[2]; - u_int8_t i_addr1[IEEE80211_ADDR_LEN]; - u_int8_t i_addr2[IEEE80211_ADDR_LEN]; - u_int8_t i_addr3[IEEE80211_ADDR_LEN]; - u_int8_t i_seq[2]; - u_int8_t i_addr4[IEEE80211_ADDR_LEN]; + uint8_t i_fc[2]; + uint8_t i_dur[2]; + uint8_t i_addr1[IEEE80211_ADDR_LEN]; + uint8_t i_addr2[IEEE80211_ADDR_LEN]; + uint8_t i_addr3[IEEE80211_ADDR_LEN]; + uint8_t i_seq[2]; + uint8_t i_addr4[IEEE80211_ADDR_LEN]; } __packed; struct ieee80211_qosframe_addr4 { - u_int8_t i_fc[2]; - u_int8_t i_dur[2]; - u_int8_t i_addr1[IEEE80211_ADDR_LEN]; - u_int8_t i_addr2[IEEE80211_ADDR_LEN]; - u_int8_t i_addr3[IEEE80211_ADDR_LEN]; - u_int8_t i_seq[2]; - u_int8_t i_addr4[IEEE80211_ADDR_LEN]; - u_int8_t i_qos[2]; + uint8_t i_fc[2]; + uint8_t i_dur[2]; + uint8_t i_addr1[IEEE80211_ADDR_LEN]; + uint8_t i_addr2[IEEE80211_ADDR_LEN]; + uint8_t i_addr3[IEEE80211_ADDR_LEN]; + uint8_t i_seq[2]; + uint8_t i_addr4[IEEE80211_ADDR_LEN]; + uint8_t i_qos[2]; } __packed; #define IEEE80211_FC0_VERSION_MASK 0x03 @@ -199,50 +199,50 @@ * WME/802.11e information element. */ struct ieee80211_wme_info { - u_int8_t wme_id; /* IEEE80211_ELEMID_VENDOR */ - u_int8_t wme_len; /* length in bytes */ - u_int8_t wme_oui[3]; /* 0x00, 0x50, 0xf2 */ - u_int8_t wme_type; /* OUI type */ - u_int8_t wme_subtype; /* OUI subtype */ - u_int8_t wme_version; /* spec revision */ - u_int8_t wme_info; /* QoS info */ + uint8_t wme_id; /* IEEE80211_ELEMID_VENDOR */ + uint8_t wme_len; /* length in bytes */ + uint8_t wme_oui[3]; /* 0x00, 0x50, 0xf2 */ + uint8_t wme_type; /* OUI type */ + uint8_t wme_subtype; /* OUI subtype */ + uint8_t wme_version; /* spec revision */ + uint8_t wme_info; /* QoS info */ } __packed; /* * WME/802.11e Tspec Element */ struct ieee80211_wme_tspec { - u_int8_t ts_id; - u_int8_t ts_len; - u_int8_t ts_oui[3]; - u_int8_t ts_oui_type; - u_int8_t ts_oui_subtype; - u_int8_t ts_version; - u_int8_t ts_tsinfo[3]; - u_int8_t ts_nom_msdu[2]; - u_int8_t ts_max_msdu[2]; - u_int8_t ts_min_svc[4]; - u_int8_t ts_max_svc[4]; - u_int8_t ts_inactv_intv[4]; - u_int8_t ts_susp_intv[4]; - u_int8_t ts_start_svc[4]; - u_int8_t ts_min_rate[4]; - u_int8_t ts_mean_rate[4]; - u_int8_t ts_max_burst[4]; - u_int8_t ts_min_phy[4]; - u_int8_t ts_peak_rate[4]; - u_int8_t ts_delay[4]; - u_int8_t ts_surplus[2]; - u_int8_t ts_medium_time[2]; + uint8_t ts_id; + uint8_t ts_len; + uint8_t ts_oui[3]; + uint8_t ts_oui_type; + uint8_t ts_oui_subtype; + uint8_t ts_version; + uint8_t ts_tsinfo[3]; + uint8_t ts_nom_msdu[2]; + uint8_t ts_max_msdu[2]; + uint8_t ts_min_svc[4]; + uint8_t ts_max_svc[4]; + uint8_t ts_inactv_intv[4]; + uint8_t ts_susp_intv[4]; + uint8_t ts_start_svc[4]; + uint8_t ts_min_rate[4]; + uint8_t ts_mean_rate[4]; + uint8_t ts_max_burst[4]; + uint8_t ts_min_phy[4]; + uint8_t ts_peak_rate[4]; + uint8_t ts_delay[4]; + uint8_t ts_surplus[2]; + uint8_t ts_medium_time[2]; } __packed; /* * WME AC parameter field */ struct ieee80211_wme_acparams { - u_int8_t acp_aci_aifsn; - u_int8_t acp_logcwminmax; - u_int16_t acp_txop; + uint8_t acp_aci_aifsn; + uint8_t acp_logcwminmax; + uint16_t acp_txop; } __packed; #define WME_NUM_AC 4 /* 4 AC categories */ @@ -275,15 +275,15 @@ * WME Parameter Element */ struct ieee80211_wme_param { - u_int8_t param_id; - u_int8_t param_len; - u_int8_t param_oui[3]; - u_int8_t param_oui_type; - u_int8_t param_oui_sybtype; - u_int8_t param_version; - u_int8_t param_qosInfo; + uint8_t param_id; + uint8_t param_len; + uint8_t param_oui[3]; + uint8_t param_oui_type; + uint8_t param_oui_sybtype; + uint8_t param_version; + uint8_t param_qosInfo; #define WME_QOSINFO_COUNT 0x0f /* Mask for param count field */ - u_int8_t param_reserved; + uint8_t param_reserved; struct ieee80211_wme_acparams params_acParams[WME_NUM_AC]; } __packed; @@ -291,10 +291,10 @@ * Management Notification Frame */ struct ieee80211_mnf { - u_int8_t mnf_category; - u_int8_t mnf_action; - u_int8_t mnf_dialog; - u_int8_t mnf_status; + uint8_t mnf_category; + uint8_t mnf_action; + uint8_t mnf_dialog; + uint8_t mnf_status; } __packed; #define MNF_SETUP_REQ 0 #define MNF_SETUP_RESP 1 @@ -305,8 +305,8 @@ */ /* generic frame format */ struct ieee80211_action { - u_int8_t ia_category; - u_int8_t ia_action; + uint8_t ia_category; + uint8_t ia_action; } __packed; #define IEEE80211_ACTION_CAT_QOS 0 /* QoS */ @@ -319,7 +319,7 @@ /* HT - recommended transmission channel width */ struct ieee80211_action_ht_txchwidth { struct ieee80211_action at_header; - u_int8_t at_chwidth; + uint8_t at_chwidth; } __packed; #define IEEE80211_A_HT_TXCHWIDTH_20 0 @@ -328,8 +328,8 @@ /* HT - MIMO Power Save */ struct ieee80211_action_ht_mimopowersave { struct ieee80211_action am_header; - u_int8_t am_enable; - u_int8_t am_mode; + uint8_t am_enable; + uint8_t am_mode; } __packed; /* Block Ack actions */ @@ -363,26 +363,26 @@ /* BA - ADDBA request */ struct ieee80211_action_ba_addbarequest { struct ieee80211_action rq_header; - u_int8_t rq_dialogtoken; - u_int16_t rq_baparamset; - u_int16_t rq_batimeout; /* in TUs */ - u_int16_t rq_baseqctl; + uint8_t rq_dialogtoken; + uint16_t rq_baparamset; + uint16_t rq_batimeout; /* in TUs */ + uint16_t rq_baseqctl; } __packed; /* BA - ADDBA response */ struct ieee80211_action_ba_addbaresponse { struct ieee80211_action rs_header; - u_int8_t rs_dialogtoken; - u_int16_t rs_statuscode; - u_int16_t rs_baparamset; - u_int16_t rs_batimeout; /* in TUs */ + uint8_t rs_dialogtoken; + uint16_t rs_statuscode; + uint16_t rs_baparamset; + uint16_t rs_batimeout; /* in TUs */ } __packed; /* BA - DELBA */ struct ieee80211_action_ba_delba { struct ieee80211_action dl_header; - u_int16_t dl_baparamset; - u_int16_t dl_reasoncode; + uint16_t dl_baparamset; + uint16_t dl_reasoncode; } __packed; /* BAR Control */ @@ -393,66 +393,66 @@ #define IEEE80211_BAR_NOACK 0x0001 /* no-ack policy */ struct ieee80211_ba_request { - u_int16_t rq_barctl; - u_int16_t rq_barseqctl; + uint16_t rq_barctl; + uint16_t rq_barseqctl; } __packed; /* * Control frames. */ struct ieee80211_frame_min { - u_int8_t i_fc[2]; - u_int8_t i_dur[2]; - u_int8_t i_addr1[IEEE80211_ADDR_LEN]; - u_int8_t i_addr2[IEEE80211_ADDR_LEN]; + uint8_t i_fc[2]; + uint8_t i_dur[2]; + uint8_t i_addr1[IEEE80211_ADDR_LEN]; + uint8_t i_addr2[IEEE80211_ADDR_LEN]; /* FCS */ } __packed; struct ieee80211_frame_rts { - u_int8_t i_fc[2]; - u_int8_t i_dur[2]; - u_int8_t i_ra[IEEE80211_ADDR_LEN]; - u_int8_t i_ta[IEEE80211_ADDR_LEN]; + uint8_t i_fc[2]; + uint8_t i_dur[2]; + uint8_t i_ra[IEEE80211_ADDR_LEN]; + uint8_t i_ta[IEEE80211_ADDR_LEN]; /* FCS */ } __packed; struct ieee80211_frame_cts { - u_int8_t i_fc[2]; - u_int8_t i_dur[2]; - u_int8_t i_ra[IEEE80211_ADDR_LEN]; + uint8_t i_fc[2]; + uint8_t i_dur[2]; + uint8_t i_ra[IEEE80211_ADDR_LEN]; /* FCS */ } __packed; struct ieee80211_frame_ack { - u_int8_t i_fc[2]; - u_int8_t i_dur[2]; - u_int8_t i_ra[IEEE80211_ADDR_LEN]; + uint8_t i_fc[2]; + uint8_t i_dur[2]; + uint8_t i_ra[IEEE80211_ADDR_LEN]; /* FCS */ } __packed; struct ieee80211_frame_pspoll { - u_int8_t i_fc[2]; - u_int8_t i_aid[2]; - u_int8_t i_bssid[IEEE80211_ADDR_LEN]; - u_int8_t i_ta[IEEE80211_ADDR_LEN]; + uint8_t i_fc[2]; + uint8_t i_aid[2]; + uint8_t i_bssid[IEEE80211_ADDR_LEN]; + uint8_t i_ta[IEEE80211_ADDR_LEN]; /* FCS */ } __packed; struct ieee80211_frame_cfend { /* NB: also CF-End+CF-Ack */ - u_int8_t i_fc[2]; - u_int8_t i_dur[2]; /* should be zero */ - u_int8_t i_ra[IEEE80211_ADDR_LEN]; - u_int8_t i_bssid[IEEE80211_ADDR_LEN]; + uint8_t i_fc[2]; + uint8_t i_dur[2]; /* should be zero */ + uint8_t i_ra[IEEE80211_ADDR_LEN]; + uint8_t i_bssid[IEEE80211_ADDR_LEN]; /* FCS */ } __packed; struct ieee80211_frame_bar { - u_int8_t i_fc[2]; - u_int8_t i_dur[2]; - u_int8_t i_ra[IEEE80211_ADDR_LEN]; - u_int8_t i_ta[IEEE80211_ADDR_LEN]; - u_int16_t i_ctl; - u_int16_t i_seq; + uint8_t i_fc[2]; + uint8_t i_dur[2]; + uint8_t i_ra[IEEE80211_ADDR_LEN]; + uint8_t i_ta[IEEE80211_ADDR_LEN]; + uint16_t i_ctl; + uint16_t i_seq; /* FCS */ } __packed; @@ -468,7 +468,7 @@ * octet information[length] */ -typedef u_int8_t *ieee80211_mgt_beacon_t; +typedef uint8_t *ieee80211_mgt_beacon_t; #define IEEE80211_BEACON_INTERVAL(beacon) \ ((beacon)[8] | ((beacon)[9] << 8)) @@ -494,19 +494,19 @@ * 802.11i/WPA information element (maximally sized). */ struct ieee80211_ie_wpa { - u_int8_t wpa_id; /* IEEE80211_ELEMID_VENDOR */ - u_int8_t wpa_len; /* length in bytes */ - u_int8_t wpa_oui[3]; /* 0x00, 0x50, 0xf2 */ - u_int8_t wpa_type; /* OUI type */ - u_int16_t wpa_version; /* spec revision */ - u_int32_t wpa_mcipher[1]; /* multicast/group key cipher */ - u_int16_t wpa_uciphercnt; /* # pairwise key ciphers */ - u_int32_t wpa_uciphers[8];/* ciphers */ - u_int16_t wpa_authselcnt; /* authentication selector cnt*/ - u_int32_t wpa_authsels[8];/* selectors */ - u_int16_t wpa_caps; /* 802.11i capabilities */ - u_int16_t wpa_pmkidcnt; /* 802.11i pmkid count */ - u_int16_t wpa_pmkids[8]; /* 802.11i pmkids */ + uint8_t wpa_id; /* IEEE80211_ELEMID_VENDOR */ + uint8_t wpa_len; /* length in bytes */ + uint8_t wpa_oui[3]; /* 0x00, 0x50, 0xf2 */ + uint8_t wpa_type; /* OUI type */ + uint16_t wpa_version; /* spec revision */ + uint32_t wpa_mcipher[1]; /* multicast/group key cipher */ + uint16_t wpa_uciphercnt; /* # pairwise key ciphers */ + uint32_t wpa_uciphers[8];/* ciphers */ + uint16_t wpa_authselcnt; /* authentication selector cnt*/ + uint32_t wpa_authsels[8];/* selectors */ + uint16_t wpa_caps; /* 802.11i capabilities */ + uint16_t wpa_pmkidcnt; /* 802.11i pmkid count */ + uint16_t wpa_pmkids[8]; /* 802.11i pmkids */ } __packed; /* @@ -514,14 +514,14 @@ * NB: these reflect D1.10 */ struct ieee80211_ie_htcap { - u_int8_t hc_id; /* element ID */ - u_int8_t hc_len; /* length in bytes */ - u_int16_t hc_cap; /* HT caps (see below) */ - u_int8_t hc_param; /* HT params (see below) */ - u_int8_t hc_mcsset[16]; /* supported MCS set */ - u_int16_t hc_extcap; /* extended HT capabilities */ - u_int32_t hc_txbf; /* txbf capabilities */ - u_int8_t hc_antenna; /* antenna capabilities */ + uint8_t hc_id; /* element ID */ + uint8_t hc_len; /* length in bytes */ + uint16_t hc_cap; /* HT caps (see below) */ + uint8_t hc_param; /* HT params (see below) */ + uint8_t hc_mcsset[16]; /* supported MCS set */ + uint16_t hc_extcap; /* extended HT capabilities */ + uint32_t hc_txbf; /* txbf capabilities */ + uint8_t hc_antenna; /* antenna capabilities */ } __packed; /* HT capability flags (ht_cap) */ @@ -589,13 +589,13 @@ * 802.11n HT Information IE */ struct ieee80211_ie_htinfo { - u_int8_t hi_id; /* element ID */ - u_int8_t hi_len; /* length in bytes */ - u_int8_t hi_ctrlchannel; /* primary channel */ - u_int8_t hi_byte1; /* ht ie byte 1 */ - u_int16_t hi_byte23; /* ht ie bytes 2+3 */ - u_int16_t hi_byte45; /* ht ie bytes 4+5 */ - u_int8_t hi_basicmcsset[16]; /* basic MCS set */ + uint8_t hi_id; /* element ID */ + uint8_t hi_len; /* length in bytes */ + uint8_t hi_ctrlchannel; /* primary channel */ + uint8_t hi_byte1; /* ht ie byte 1 */ + uint16_t hi_byte23; /* ht ie bytes 2+3 */ + uint16_t hi_byte45; /* ht ie bytes 4+5 */ + uint8_t hi_basicmcsset[16]; /* basic MCS set */ } __packed; /* byte1 */ @@ -676,22 +676,22 @@ }; struct ieee80211_tim_ie { - u_int8_t tim_ie; /* IEEE80211_ELEMID_TIM */ - u_int8_t tim_len; - u_int8_t tim_count; /* DTIM count */ - u_int8_t tim_period; /* DTIM period */ - u_int8_t tim_bitctl; /* bitmap control */ - u_int8_t tim_bitmap[1]; /* variable-length bitmap */ + uint8_t tim_ie; /* IEEE80211_ELEMID_TIM */ + uint8_t tim_len; + uint8_t tim_count; /* DTIM count */ + uint8_t tim_period; /* DTIM period */ + uint8_t tim_bitctl; /* bitmap control */ + uint8_t tim_bitmap[1]; /* variable-length bitmap */ } __packed; struct ieee80211_country_ie { - u_int8_t ie; /* IEEE80211_ELEMID_COUNTRY */ - u_int8_t len; - u_int8_t cc[3]; /* ISO CC+(I)ndoor/(O)utdoor */ + uint8_t ie; /* IEEE80211_ELEMID_COUNTRY */ + uint8_t len; + uint8_t cc[3]; /* ISO CC+(I)ndoor/(O)utdoor */ struct { - u_int8_t schan; /* starting channel */ - u_int8_t nchan; /* number channels */ - u_int8_t maxtxpwr; /* tx power cap */ + uint8_t schan; /* starting channel */ + uint8_t nchan; /* number channels */ + uint8_t maxtxpwr; /* tx power cap */ } __packed band[4]; /* up to 4 sub bands */ } __packed; @@ -699,13 +699,13 @@ * Atheros advanced capability information element. */ struct ieee80211_ath_ie { - u_int8_t ath_id; /* IEEE80211_ELEMID_VENDOR */ - u_int8_t ath_len; /* length in bytes */ - u_int8_t ath_oui[3]; /* 0x00, 0x03, 0x7f */ - u_int8_t ath_oui_type; /* OUI type */ - u_int8_t ath_oui_subtype; /* OUI subtype */ - u_int8_t ath_version; /* spec revision */ - u_int8_t ath_capability; /* capability info */ + uint8_t ath_id; /* IEEE80211_ELEMID_VENDOR */ + uint8_t ath_len; /* length in bytes */ + uint8_t ath_oui[3]; /* 0x00, 0x03, 0x7f */ + uint8_t ath_oui_type; /* OUI type */ + uint8_t ath_oui_subtype; /* OUI subtype */ + uint8_t ath_version; /* spec revision */ + uint8_t ath_capability; /* capability info */ #define ATHEROS_CAP_TURBO_PRIME 0x01 /* dynamic turbo--aka Turbo' */ #define ATHEROS_CAP_COMPRESSION 0x02 /* data compression */ #define ATHEROS_CAP_FAST_FRAME 0x04 /* fast (jumbo) frames */ @@ -714,7 +714,7 @@ #define ATHEROS_CAP_BURST 0x20 /* Bursting - not negotiated */ #define ATHEROS_CAP_WME 0x40 /* CWMin tuning */ #define ATHEROS_CAP_BOOST 0x80 /* use turbo/!turbo mode */ - u_int8_t ath_defkeyix[2]; + uint8_t ath_defkeyix[2]; } __packed; #define IEEE80211_CHALLENGE_LEN 128 @@ -789,7 +789,7 @@ * octet chal.text[253] */ -typedef u_int8_t *ieee80211_mgt_auth_t; +typedef uint8_t *ieee80211_mgt_auth_t; #define IEEE80211_AUTH_ALGORITHM(auth) \ ((auth)[0] | ((auth)[1] << 8)) From owner-p4-projects@FreeBSD.ORG Sun May 13 03:52:59 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1653116A407; Sun, 13 May 2007 03:52:57 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 806A116A406 for ; Sun, 13 May 2007 03:52:57 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6E83D13C457 for ; Sun, 13 May 2007 03:52:57 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4D3qvwx029122 for ; Sun, 13 May 2007 03:52:57 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4D3qv69029119 for perforce@freebsd.org; Sun, 13 May 2007 03:52:57 GMT (envelope-from sephe@FreeBSD.org) Date: Sun, 13 May 2007 03:52:57 GMT Message-Id: <200705130352.l4D3qv69029119@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 119744 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, 13 May 2007 03:52:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=119744 Change 119744 by sephe@sephe_zealot:sam_wifi on 2007/05/13 03:52:20 u_intX_t -> uintX_t Approved by: sam Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_acl.c#7 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_acl.c#7 (text+ko) ==== @@ -70,7 +70,7 @@ struct acl { TAILQ_ENTRY(acl) acl_list; LIST_ENTRY(acl) acl_hash; - u_int8_t acl_macaddr[IEEE80211_ADDR_LEN]; + uint8_t acl_macaddr[IEEE80211_ADDR_LEN]; }; struct aclstate { acl_lock_t as_lock; @@ -83,7 +83,7 @@ /* simple hash is enough for variation of macaddr */ #define ACL_HASH(addr) \ - (((const u_int8_t *)(addr))[IEEE80211_ADDR_LEN - 1] % ACL_HASHSIZE) + (((const uint8_t *)(addr))[IEEE80211_ADDR_LEN - 1] % ACL_HASHSIZE) MALLOC_DEFINE(M_80211_ACL, "acl", "802.11 station acl"); @@ -118,7 +118,7 @@ } static __inline struct acl * -_find_acl(struct aclstate *as, const u_int8_t *macaddr) +_find_acl(struct aclstate *as, const uint8_t *macaddr) { struct acl *acl; int hash; @@ -143,7 +143,7 @@ } static int -acl_check(struct ieee80211com *ic, const u_int8_t mac[IEEE80211_ADDR_LEN]) +acl_check(struct ieee80211com *ic, const uint8_t mac[IEEE80211_ADDR_LEN]) { struct aclstate *as = ic->ic_as; @@ -159,7 +159,7 @@ } static int -acl_add(struct ieee80211com *ic, const u_int8_t mac[IEEE80211_ADDR_LEN]) +acl_add(struct ieee80211com *ic, const uint8_t mac[IEEE80211_ADDR_LEN]) { struct aclstate *as = ic->ic_as; struct acl *acl, *new; @@ -197,7 +197,7 @@ } static int -acl_remove(struct ieee80211com *ic, const u_int8_t mac[IEEE80211_ADDR_LEN]) +acl_remove(struct ieee80211com *ic, const uint8_t mac[IEEE80211_ADDR_LEN]) { struct aclstate *as = ic->ic_as; struct acl *acl; From owner-p4-projects@FreeBSD.ORG Sun May 13 04:05:17 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4DA7F16A404; Sun, 13 May 2007 04:05:16 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7FBA916A400 for ; Sun, 13 May 2007 04:05:13 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6EF7313C458 for ; Sun, 13 May 2007 04:05:13 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4D45DrD032519 for ; Sun, 13 May 2007 04:05:13 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4D45C0j032510 for perforce@freebsd.org; Sun, 13 May 2007 04:05:12 GMT (envelope-from sephe@FreeBSD.org) Date: Sun, 13 May 2007 04:05:12 GMT Message-Id: <200705130405.l4D45C0j032510@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 119745 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, 13 May 2007 04:05:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=119745 Change 119745 by sephe@sephe_zealot:sam_wifi on 2007/05/13 04:04:14 u_intX_t -> uintX_t Approved by: sam Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_crypto.c#22 edit .. //depot/projects/wifi/sys/net80211/ieee80211_crypto.h#15 edit .. //depot/projects/wifi/sys/net80211/ieee80211_crypto_ccmp.c#12 edit .. //depot/projects/wifi/sys/net80211/ieee80211_crypto_none.c#9 edit .. //depot/projects/wifi/sys/net80211/ieee80211_crypto_tkip.c#15 edit .. //depot/projects/wifi/sys/net80211/ieee80211_crypto_wep.c#12 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto.c#22 (text+ko) ==== @@ -90,7 +90,7 @@ } static int null_key_set(struct ieee80211com *ic, const struct ieee80211_key *k, - const u_int8_t mac[IEEE80211_ADDR_LEN]) + const uint8_t mac[IEEE80211_ADDR_LEN]) { return 1; } @@ -131,7 +131,7 @@ static __inline int dev_key_set(struct ieee80211com *ic, const struct ieee80211_key *key, - const u_int8_t mac[IEEE80211_ADDR_LEN]) + const uint8_t mac[IEEE80211_ADDR_LEN]) { return ic->ic_crypto.cs_key_set(ic, key, mac); } @@ -467,7 +467,7 @@ */ int ieee80211_crypto_setkey(struct ieee80211com *ic, struct ieee80211_key *key, - const u_int8_t macaddr[IEEE80211_ADDR_LEN]) + const uint8_t macaddr[IEEE80211_ADDR_LEN]) { const struct ieee80211_cipher *cip = key->wk_cipher; @@ -511,7 +511,7 @@ struct ieee80211_key *k; struct ieee80211_frame *wh; const struct ieee80211_cipher *cip; - u_int8_t keyid; + uint8_t keyid; /* * Multicast traffic always uses the multicast key. @@ -555,8 +555,8 @@ struct ieee80211_key *k; struct ieee80211_frame *wh; const struct ieee80211_cipher *cip; - const u_int8_t *ivp; - u_int8_t keyid; + const uint8_t *ivp; + uint8_t keyid; /* NB: this minimum size data frame could be bigger */ if (m->m_pkthdr.len < IEEE80211_WEP_MINLEN) { @@ -574,7 +574,7 @@ * the key id in the header is meaningless (typically 0). */ wh = mtod(m, struct ieee80211_frame *); - ivp = mtod(m, const u_int8_t *) + hdrlen; /* XXX contig */ + ivp = mtod(m, const uint8_t *) + hdrlen; /* XXX contig */ keyid = ivp[IEEE80211_WEP_IVLEN]; if (IEEE80211_IS_MULTICAST(wh->i_addr1) || IEEE80211_KEY_UNDEFINED(&ni->ni_ucastkey)) ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto.h#15 (text+ko) ==== @@ -45,7 +45,7 @@ */ struct ieee80211_wepkey { u_int wk_len; /* key length in bytes */ - u_int8_t wk_key[IEEE80211_KEYBUF_SIZE]; + uint8_t wk_key[IEEE80211_KEYBUF_SIZE]; }; struct ieee80211_cipher; @@ -66,12 +66,12 @@ * Ciphers such as TKIP may also support mixed hardware/software * encrypt/decrypt and MIC processing. */ -typedef u_int16_t ieee80211_keyix; /* h/w key index */ +typedef uint16_t ieee80211_keyix; /* h/w key index */ struct ieee80211_key { - u_int8_t wk_keylen; /* key length in bytes */ - u_int8_t wk_pad; - u_int16_t wk_flags; + uint8_t wk_keylen; /* key length in bytes */ + uint8_t wk_pad; + uint16_t wk_flags; #define IEEE80211_KEY_XMIT 0x01 /* key used for xmit */ #define IEEE80211_KEY_RECV 0x02 /* key used for recv */ #define IEEE80211_KEY_GROUP 0x04 /* key used for WPA group operation */ @@ -79,11 +79,11 @@ #define IEEE80211_KEY_SWMIC 0x20 /* host-based enmic/demic */ ieee80211_keyix wk_keyix; /* h/w key index */ ieee80211_keyix wk_rxkeyix; /* optional h/w rx key index */ - u_int8_t wk_key[IEEE80211_KEYBUF_SIZE+IEEE80211_MICBUF_SIZE]; + uint8_t wk_key[IEEE80211_KEYBUF_SIZE+IEEE80211_MICBUF_SIZE]; #define wk_txmic wk_key+IEEE80211_KEYBUF_SIZE+0 /* XXX can't () right */ #define wk_rxmic wk_key+IEEE80211_KEYBUF_SIZE+8 /* XXX can't () right */ - u_int64_t wk_keyrsc; /* key receive sequence counter */ - u_int64_t wk_keytsc; /* key transmit sequence counter */ + uint64_t wk_keyrsc; /* key receive sequence counter */ + uint64_t wk_keytsc; /* key transmit sequence counter */ const struct ieee80211_cipher *wk_cipher; void *wk_private; /* private cipher state */ }; @@ -122,7 +122,7 @@ struct ieee80211_crypto_state { struct ieee80211_key cs_nw_keys[IEEE80211_WEP_NKID]; ieee80211_keyix cs_def_txkey; /* default/group tx key index */ - u_int16_t cs_max_keyix; /* max h/w key index */ + uint16_t cs_max_keyix; /* max h/w key index */ int (*cs_key_alloc)(struct ieee80211com *, const struct ieee80211_key *, @@ -131,7 +131,7 @@ const struct ieee80211_key *); int (*cs_key_set)(struct ieee80211com *, const struct ieee80211_key *, - const u_int8_t mac[IEEE80211_ADDR_LEN]); + const uint8_t mac[IEEE80211_ADDR_LEN]); void (*cs_key_update_begin)(struct ieee80211com *); void (*cs_key_update_end)(struct ieee80211com *); }; @@ -143,7 +143,7 @@ int ieee80211_crypto_delkey(struct ieee80211com *, struct ieee80211_key *); int ieee80211_crypto_setkey(struct ieee80211com *, - struct ieee80211_key *, const u_int8_t macaddr[IEEE80211_ADDR_LEN]); + struct ieee80211_key *, const uint8_t macaddr[IEEE80211_ADDR_LEN]); void ieee80211_crypto_delglobalkeys(struct ieee80211com *); /* @@ -162,7 +162,7 @@ void (*ic_detach)(struct ieee80211_key *); int (*ic_setkey)(struct ieee80211_key *); int (*ic_encap)(struct ieee80211_key *, struct mbuf *, - u_int8_t keyid); + uint8_t keyid); int (*ic_decap)(struct ieee80211_key *, struct mbuf *, int); int (*ic_enmic)(struct ieee80211_key *, struct mbuf *, int); int (*ic_demic)(struct ieee80211_key *, struct mbuf *, int); ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto_ccmp.c#12 (text+ko) ==== @@ -66,7 +66,7 @@ static void *ccmp_attach(struct ieee80211com *, struct ieee80211_key *); static void ccmp_detach(struct ieee80211_key *); static int ccmp_setkey(struct ieee80211_key *); -static int ccmp_encap(struct ieee80211_key *k, struct mbuf *, u_int8_t keyid); +static int ccmp_encap(struct ieee80211_key *k, struct mbuf *, uint8_t keyid); static int ccmp_decap(struct ieee80211_key *, struct mbuf *, int); static int ccmp_enmic(struct ieee80211_key *, struct mbuf *, int); static int ccmp_demic(struct ieee80211_key *, struct mbuf *, int); @@ -140,11 +140,11 @@ * Add privacy headers appropriate for the specified key. */ static int -ccmp_encap(struct ieee80211_key *k, struct mbuf *m, u_int8_t keyid) +ccmp_encap(struct ieee80211_key *k, struct mbuf *m, uint8_t keyid) { struct ccmp_ctx *ctx = k->wk_private; struct ieee80211com *ic = ctx->cc_ic; - u_int8_t *ivp; + uint8_t *ivp; int hdrlen; hdrlen = ieee80211_hdrspace(ic, mtod(m, void *)); @@ -155,7 +155,7 @@ M_PREPEND(m, ccmp.ic_header, M_NOWAIT); if (m == NULL) return 0; - ivp = mtod(m, u_int8_t *); + ivp = mtod(m, uint8_t *); ovbcopy(ivp + ccmp.ic_header, ivp, hdrlen); ivp += hdrlen; @@ -250,7 +250,7 @@ /* * Copy up 802.11 header and strip crypto bits. */ - ovbcopy(mtod(m, void *), mtod(m, u_int8_t *) + ccmp.ic_header, hdrlen); + ovbcopy(mtod(m, void *), mtod(m, uint8_t *) + ccmp.ic_header, hdrlen); m_adj(m, ccmp.ic_header); m_adj(m, -ccmp.ic_trailer); @@ -356,7 +356,7 @@ b0[1] = aad[30]; aad[1] = 22 + IEEE80211_ADDR_LEN + 2; } else { - *(u_int16_t *)&aad[30] = 0; + *(uint16_t *)&aad[30] = 0; b0[1] = 0; aad[1] = 22 + IEEE80211_ADDR_LEN; } @@ -369,12 +369,12 @@ b0[1] = aad[24]; aad[1] = 22 + 2; } else { - *(u_int16_t *)&aad[24] = 0; + *(uint16_t *)&aad[24] = 0; b0[1] = 0; aad[1] = 22; } - *(u_int16_t *)&aad[26] = 0; - *(u_int32_t *)&aad[28] = 0; + *(uint16_t *)&aad[26] = 0; + *(uint32_t *)&aad[28] = 0; } /* Start with the first block and AAD */ ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto_none.c#9 (text+ko) ==== @@ -51,7 +51,7 @@ static void *none_attach(struct ieee80211com *, struct ieee80211_key *); static void none_detach(struct ieee80211_key *); static int none_setkey(struct ieee80211_key *); -static int none_encap(struct ieee80211_key *, struct mbuf *, u_int8_t); +static int none_encap(struct ieee80211_key *, struct mbuf *, uint8_t); static int none_decap(struct ieee80211_key *, struct mbuf *, int); static int none_enmic(struct ieee80211_key *, struct mbuf *, int); static int none_demic(struct ieee80211_key *, struct mbuf *, int); @@ -91,7 +91,7 @@ } static int -none_encap(struct ieee80211_key *k, struct mbuf *m, u_int8_t keyid) +none_encap(struct ieee80211_key *k, struct mbuf *m, uint8_t keyid) { struct ieee80211com *ic = k->wk_private; #ifdef IEEE80211_DEBUG @@ -115,7 +115,7 @@ struct ieee80211com *ic = k->wk_private; #ifdef IEEE80211_DEBUG struct ieee80211_frame *wh = mtod(m, struct ieee80211_frame *); - const u_int8_t *ivp = (const u_int8_t *)&wh[1]; + const uint8_t *ivp = (const uint8_t *)&wh[1]; #endif /* ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto_tkip.c#15 (text+ko) ==== @@ -58,7 +58,7 @@ static void *tkip_attach(struct ieee80211com *, struct ieee80211_key *); static void tkip_detach(struct ieee80211_key *); static int tkip_setkey(struct ieee80211_key *); -static int tkip_encap(struct ieee80211_key *, struct mbuf *m, u_int8_t keyid); +static int tkip_encap(struct ieee80211_key *, struct mbuf *m, uint8_t keyid); static int tkip_enmic(struct ieee80211_key *, struct mbuf *, int); static int tkip_decap(struct ieee80211_key *, struct mbuf *, int); static int tkip_demic(struct ieee80211_key *, struct mbuf *, int); @@ -156,11 +156,11 @@ * Add privacy headers and do any s/w encryption required. */ static int -tkip_encap(struct ieee80211_key *k, struct mbuf *m, u_int8_t keyid) +tkip_encap(struct ieee80211_key *k, struct mbuf *m, uint8_t keyid) { struct tkip_ctx *ctx = k->wk_private; struct ieee80211com *ic = ctx->tc_ic; - u_int8_t *ivp; + uint8_t *ivp; int hdrlen; /* @@ -185,7 +185,7 @@ M_PREPEND(m, tkip.ic_header, M_NOWAIT); if (m == NULL) return 0; - ivp = mtod(m, u_int8_t *); + ivp = mtod(m, uint8_t *); memmove(ivp, ivp + tkip.ic_header, hdrlen); ivp += hdrlen; ==== //depot/projects/wifi/sys/net80211/ieee80211_crypto_wep.c#12 (text+ko) ==== @@ -54,7 +54,7 @@ static void *wep_attach(struct ieee80211com *, struct ieee80211_key *); static void wep_detach(struct ieee80211_key *); static int wep_setkey(struct ieee80211_key *); -static int wep_encap(struct ieee80211_key *, struct mbuf *, u_int8_t keyid); +static int wep_encap(struct ieee80211_key *, struct mbuf *, uint8_t keyid); static int wep_decap(struct ieee80211_key *, struct mbuf *, int hdrlen); static int wep_enmic(struct ieee80211_key *, struct mbuf *, int); static int wep_demic(struct ieee80211_key *, struct mbuf *, int); @@ -79,7 +79,7 @@ struct wep_ctx { struct ieee80211com *wc_ic; /* for diagnostics */ - u_int32_t wc_iv; /* initial vector for crypto */ + uint32_t wc_iv; /* initial vector for crypto */ }; /* number of references from net80211 layer */ @@ -123,12 +123,12 @@ * Add privacy headers appropriate for the specified key. */ static int -wep_encap(struct ieee80211_key *k, struct mbuf *m, u_int8_t keyid) +wep_encap(struct ieee80211_key *k, struct mbuf *m, uint8_t keyid) { struct wep_ctx *ctx = k->wk_private; struct ieee80211com *ic = ctx->wc_ic; - u_int32_t iv; - u_int8_t *ivp; + uint32_t iv; + uint8_t *ivp; int hdrlen; hdrlen = ieee80211_hdrspace(ic, mtod(m, void *)); @@ -139,7 +139,7 @@ M_PREPEND(m, wep.ic_header, M_NOWAIT); if (m == NULL) return 0; - ivp = mtod(m, u_int8_t *); + ivp = mtod(m, uint8_t *); ovbcopy(ivp + wep.ic_header, ivp, hdrlen); ivp += hdrlen; @@ -235,7 +235,7 @@ /* * Copy up 802.11 header and strip crypto bits. */ - ovbcopy(mtod(m, void *), mtod(m, u_int8_t *) + wep.ic_header, hdrlen); + ovbcopy(mtod(m, void *), mtod(m, uint8_t *) + wep.ic_header, hdrlen); m_adj(m, wep.ic_header); m_adj(m, -wep.ic_trailer); @@ -312,7 +312,7 @@ #define S_SWAP(a,b) do { uint8_t t = S[a]; S[a] = S[b]; S[b] = t; } while(0) struct wep_ctx *ctx = key->wk_private; struct mbuf *m = m0; - u_int8_t rc4key[IEEE80211_WEP_IVLEN + IEEE80211_KEYBUF_SIZE]; + uint8_t rc4key[IEEE80211_WEP_IVLEN + IEEE80211_KEYBUF_SIZE]; uint8_t icv[IEEE80211_WEP_CRCLEN]; uint32_t i, j, k, crc; size_t buflen, data_len; @@ -323,7 +323,7 @@ ctx->wc_ic->ic_stats.is_crypto_wep++; /* NB: this assumes the header was pulled up */ - memcpy(rc4key, mtod(m, u_int8_t *) + hdrlen, IEEE80211_WEP_IVLEN); + memcpy(rc4key, mtod(m, uint8_t *) + hdrlen, IEEE80211_WEP_IVLEN); memcpy(rc4key + IEEE80211_WEP_IVLEN, key->wk_key, key->wk_keylen); /* Setup RC4 state */ @@ -394,7 +394,7 @@ #define S_SWAP(a,b) do { uint8_t t = S[a]; S[a] = S[b]; S[b] = t; } while(0) struct wep_ctx *ctx = key->wk_private; struct mbuf *m = m0; - u_int8_t rc4key[IEEE80211_WEP_IVLEN + IEEE80211_KEYBUF_SIZE]; + uint8_t rc4key[IEEE80211_WEP_IVLEN + IEEE80211_KEYBUF_SIZE]; uint8_t icv[IEEE80211_WEP_CRCLEN]; uint32_t i, j, k, crc; size_t buflen, data_len; @@ -405,7 +405,7 @@ ctx->wc_ic->ic_stats.is_crypto_wep++; /* NB: this assumes the header was pulled up */ - memcpy(rc4key, mtod(m, u_int8_t *) + hdrlen, IEEE80211_WEP_IVLEN); + memcpy(rc4key, mtod(m, uint8_t *) + hdrlen, IEEE80211_WEP_IVLEN); memcpy(rc4key + IEEE80211_WEP_IVLEN, key->wk_key, key->wk_keylen); /* Setup RC4 state */ From owner-p4-projects@FreeBSD.ORG Sun May 13 04:07:23 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3573516A408; Sun, 13 May 2007 04:07:17 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 0630416A405 for ; Sun, 13 May 2007 04:07:17 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id EA56F13C46C for ; Sun, 13 May 2007 04:07:16 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4D47Gwr032688 for ; Sun, 13 May 2007 04:07:16 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4D47GF7032685 for perforce@freebsd.org; Sun, 13 May 2007 04:07:16 GMT (envelope-from sephe@FreeBSD.org) Date: Sun, 13 May 2007 04:07:16 GMT Message-Id: <200705130407.l4D47GF7032685@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 119746 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, 13 May 2007 04:07:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=119746 Change 119746 by sephe@sephe_zealot:sam_wifi on 2007/05/13 04:06:48 u_intX_t -> uintX_t Approved by: sam Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.c#25 edit .. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.h#27 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_freebsd.c#25 (text+ko) ==== @@ -189,7 +189,7 @@ * can use this interface too. */ struct mbuf * -ieee80211_getmgtframe(u_int8_t **frm, int headroom, int pktlen) +ieee80211_getmgtframe(uint8_t **frm, int headroom, int pktlen) { struct mbuf *m; u_int len; @@ -260,13 +260,13 @@ void get_random_bytes(void *p, size_t n) { - u_int8_t *dp = p; + uint8_t *dp = p; while (n > 0) { - u_int32_t v = arc4random(); - size_t nb = n > sizeof(u_int32_t) ? sizeof(u_int32_t) : n; - bcopy(&v, dp, n > sizeof(u_int32_t) ? sizeof(u_int32_t) : n); - dp += sizeof(u_int32_t), n -= nb; + uint32_t v = arc4random(); + size_t nb = n > sizeof(uint32_t) ? sizeof(uint32_t) : n; + bcopy(&v, dp, n > sizeof(uint32_t) ? sizeof(uint32_t) : n); + dp += sizeof(uint32_t), n -= nb; } } ==== //depot/projects/wifi/sys/net80211/ieee80211_freebsd.h#27 (text+ko) ==== @@ -185,7 +185,7 @@ #define time_after_eq(a,b) ((long)(a) - (long)(b) >= 0) #define time_before_eq(a,b) time_after_eq(b,a) -struct mbuf *ieee80211_getmgtframe(u_int8_t **frm, int headroom, int pktlen); +struct mbuf *ieee80211_getmgtframe(uint8_t **frm, int headroom, int pktlen); #define M_LINK0 M_PROTO1 /* WEP requested */ #define M_PWR_SAV M_PROTO4 /* bypass PS handling */ #define M_MORE_DATA M_PROTO5 /* more data frames to follow */ From owner-p4-projects@FreeBSD.ORG Sun May 13 04:14:27 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5590D16A407; Sun, 13 May 2007 04:14:27 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2218B16A405 for ; Sun, 13 May 2007 04:14:27 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1185A13C459 for ; Sun, 13 May 2007 04:14:27 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4D4EQeM033987 for ; Sun, 13 May 2007 04:14:26 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4D4EQQS033983 for perforce@freebsd.org; Sun, 13 May 2007 04:14:26 GMT (envelope-from sephe@FreeBSD.org) Date: Sun, 13 May 2007 04:14:26 GMT Message-Id: <200705130414.l4D4EQQS033983@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 119747 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, 13 May 2007 04:14:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=119747 Change 119747 by sephe@sephe_zealot:sam_wifi on 2007/05/13 04:13:55 u_intX_t -> uintX_t Approved by: sam Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_ht.c#2 edit .. //depot/projects/wifi/sys/net80211/ieee80211_ht.h#2 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_ht.c#2 (text+ko) ==== @@ -92,7 +92,7 @@ static void ieee80211_addba_stop(struct ieee80211_node *ni, struct ieee80211_tx_ampdu *tap); static void ieee80211_aggr_recv_action(struct ieee80211_node *ni, - const u_int8_t *frm, const u_int8_t *efrm); + const uint8_t *frm, const uint8_t *efrm); void ieee80211_ht_attach(struct ieee80211com *ic) @@ -396,7 +396,7 @@ struct ieee80211_qosframe *wh; struct ieee80211_rx_ampdu *rap; ieee80211_seq rxseq; - u_int8_t tid; + uint8_t tid; int off; KASSERT(ni->ni_flags & IEEE80211_NODE_HT, ("not an HT sta")); @@ -414,7 +414,7 @@ */ return 0; } - rxseq = le16toh(*(u_int16_t *)wh->i_seq) >> IEEE80211_SEQ_SEQ_SHIFT; + rxseq = le16toh(*(uint16_t *)wh->i_seq) >> IEEE80211_SEQ_SEQ_SHIFT; if (rxseq == rap->rxa_start) { /* * First frame in window. @@ -600,7 +600,7 @@ * work for temporary and/or legacy sta's. */ void -ieee80211_ht_node_init(struct ieee80211_node *ni, const u_int8_t *htcap) +ieee80211_ht_node_init(struct ieee80211_node *ni, const uint8_t *htcap) { struct ieee80211_tx_ampdu *tap; int ac; @@ -640,15 +640,15 @@ /* unalligned little endian access */ #define LE_READ_2(p) \ - ((u_int16_t) \ - ((((const u_int8_t *)(p))[0] ) | \ - (((const u_int8_t *)(p))[1] << 8))) + ((uint16_t) \ + ((((const uint8_t *)(p))[0] ) | \ + (((const uint8_t *)(p))[1] << 8))) /* * Process an 802.11n HT capabilities ie. */ void -ieee80211_parse_htcap(struct ieee80211_node *ni, const u_int8_t *ie) +ieee80211_parse_htcap(struct ieee80211_node *ni, const uint8_t *ie) { struct ieee80211com *ic = ni->ni_ic; @@ -682,7 +682,7 @@ * Process an 802.11n HT info ie. */ void -ieee80211_parse_htinfo(struct ieee80211_node *ni, const u_int8_t *ie) +ieee80211_parse_htinfo(struct ieee80211_node *ni, const uint8_t *ie) { const struct ieee80211_ie_htinfo *htinfo; uint16_t w; @@ -709,7 +709,7 @@ * Install received HT rate set by parsing the HT cap ie. */ int -ieee80211_setup_htrates(struct ieee80211_node *ni, const u_int8_t *ie, int flags) +ieee80211_setup_htrates(struct ieee80211_node *ni, const uint8_t *ie, int flags) { struct ieee80211com *ic = ni->ni_ic; const struct ieee80211_ie_htcap *htcap; @@ -744,7 +744,7 @@ * to the information in the supplied HT info ie. */ void -ieee80211_setup_basic_htrates(struct ieee80211_node *ni, const u_int8_t *ie) +ieee80211_setup_basic_htrates(struct ieee80211_node *ni, const uint8_t *ie) { const struct ieee80211_ie_htinfo *htinfo; struct ieee80211_htrateset *rs; @@ -871,15 +871,15 @@ */ static void ieee80211_aggr_recv_action(struct ieee80211_node *ni, - const u_int8_t *frm, const u_int8_t *efrm) + const uint8_t *frm, const uint8_t *efrm) { struct ieee80211com *ic = ni->ni_ic; const struct ieee80211_action *ia; struct ieee80211_rx_ampdu *rap; struct ieee80211_tx_ampdu *tap; - u_int8_t dialogtoken; - u_int16_t baparamset, batimeout, baseqctl, code; - u_int16_t args[4]; + uint8_t dialogtoken; + uint16_t baparamset, batimeout, baseqctl, code; + uint16_t args[4]; int tid, ac, bufsiz; ia = (const struct ieee80211_action *) frm; @@ -981,7 +981,7 @@ */ void ieee80211_recv_action(struct ieee80211_node *ni, - const u_int8_t *frm, const u_int8_t *efrm) + const uint8_t *frm, const uint8_t *efrm) { struct ieee80211com *ic = ni->ni_ic; const struct ieee80211_action *ia; @@ -1044,7 +1044,7 @@ struct ieee80211_tx_ampdu *tap) { struct ieee80211com *ic = ni->ni_ic; - u_int16_t args[4]; + uint16_t args[4]; int tid, dialogtoken; static int tokens = 0; /* XXX */ @@ -1106,8 +1106,8 @@ struct ifnet *ifp = ic->ic_ifp; struct ieee80211_frame_min *wh; struct mbuf *m; - u_int8_t *frm; - u_int16_t barctl, barseqctl; + uint8_t *frm; + uint16_t barctl, barseqctl; int tid, ret; ieee80211_ref_node(ni); @@ -1138,7 +1138,7 @@ ; ADDSHORT(frm, barctl); ADDSHORT(frm, barseqctl); - m->m_pkthdr.len = m->m_len = frm - mtod(m, u_int8_t *); + m->m_pkthdr.len = m->m_len = frm - mtod(m, uint8_t *); IEEE80211_NODE_STAT(ni, tx_mgmt); /* XXX tx_ctl? */ @@ -1166,7 +1166,7 @@ */ int ieee80211_send_action(struct ieee80211_node *ni, - int category, int action, u_int16_t args[4]) + int category, int action, uint16_t args[4]) { #define senderr(_x, _v) do { ic->ic_stats._v++; ret = _x; goto bad; } while (0) #define ADDSHORT(frm, v) do { \ @@ -1176,8 +1176,8 @@ } while (0) struct ieee80211com *ic = ni->ni_ic; struct mbuf *m; - u_int8_t *frm; - u_int16_t baparamset; + uint8_t *frm; + uint16_t baparamset; int ret; KASSERT(ni != NULL, ("null node")); @@ -1196,7 +1196,7 @@ m = ieee80211_getmgtframe(&frm, ic->ic_headroom + sizeof(struct ieee80211_frame), - sizeof(u_int16_t) /* action+category */ + sizeof(uint16_t) /* action+category */ /* XXX may action payload */ + sizeof(struct ieee80211_action_ba_addbaresponse) ); @@ -1274,7 +1274,7 @@ senderr(EINVAL, is_tx_unknownmgt); /* NOTREACHED */ } - m->m_pkthdr.len = m->m_len = frm - mtod(m, u_int8_t *); + m->m_pkthdr.len = m->m_len = frm - mtod(m, uint8_t *); ret = ieee80211_mgmt_output(ic, ni, m, IEEE80211_FC0_SUBTYPE_ACTION); if (ret != 0) @@ -1292,7 +1292,7 @@ * in an HT information element. */ static void -ieee80211_set_htrates(u_int8_t *frm, const struct ieee80211_htrateset *rs) +ieee80211_set_htrates(uint8_t *frm, const struct ieee80211_htrateset *rs) { int i; @@ -1308,8 +1308,8 @@ /* * Add body of an HTCAP information element. */ -static u_int8_t * -ieee80211_add_htcap_body(u_int8_t *frm, struct ieee80211_node *ni) +static uint8_t * +ieee80211_add_htcap_body(uint8_t *frm, struct ieee80211_node *ni) { #define ADDSHORT(frm, v) do { \ frm[0] = (v) & 0xff; \ @@ -1317,7 +1317,7 @@ frm += 2; \ } while (0) struct ieee80211com *ic = ni->ni_ic; - u_int16_t caps; + uint16_t caps; /* HT capabilities */ caps = ic->ic_htcaps & 0xffff; @@ -1361,8 +1361,8 @@ /* * Add 802.11n HT capabilities information element */ -u_int8_t * -ieee80211_add_htcap(u_int8_t *frm, struct ieee80211_node *ni) +uint8_t * +ieee80211_add_htcap(uint8_t *frm, struct ieee80211_node *ni) { frm[0] = IEEE80211_ELEMID_HTCAP; frm[1] = sizeof(struct ieee80211_ie_htcap) - 2; @@ -1373,8 +1373,8 @@ * Add Broadcom OUI wrapped standard HTCAP ie; this is * used for compatibility w/ pre-draft implementations. */ -u_int8_t * -ieee80211_add_htcap_vendor(u_int8_t *frm, struct ieee80211_node *ni) +uint8_t * +ieee80211_add_htcap_vendor(uint8_t *frm, struct ieee80211_node *ni) { frm[0] = IEEE80211_ELEMID_VENDOR; frm[1] = 4 + sizeof(struct ieee80211_ie_htcap) - 2; @@ -1390,7 +1390,7 @@ * for inclusion in an HT information element. */ static void -ieee80211_set_basic_htrates(u_int8_t *frm, const struct ieee80211_htrateset *rs) +ieee80211_set_basic_htrates(uint8_t *frm, const struct ieee80211_htrateset *rs) { int i; @@ -1407,8 +1407,8 @@ /* * Add body of an HTINFO information element. */ -static u_int8_t * -ieee80211_add_htinfo_body(u_int8_t *frm, struct ieee80211_node *ni) +static uint8_t * +ieee80211_add_htinfo_body(uint8_t *frm, struct ieee80211_node *ni) { struct ieee80211com *ic = ni->ni_ic; @@ -1444,8 +1444,8 @@ /* * Add 802.11n HT information information element. */ -u_int8_t * -ieee80211_add_htinfo(u_int8_t *frm, struct ieee80211_node *ni) +uint8_t * +ieee80211_add_htinfo(uint8_t *frm, struct ieee80211_node *ni) { frm[0] = IEEE80211_ELEMID_HTINFO; frm[1] = sizeof(struct ieee80211_ie_htinfo) - 2; @@ -1456,8 +1456,8 @@ * Add Broadcom OUI wrapped standard HTINFO ie; this is * used for compatibility w/ pre-draft implementations. */ -u_int8_t * -ieee80211_add_htinfo_vendor(u_int8_t *frm, struct ieee80211_node *ni) +uint8_t * +ieee80211_add_htinfo_vendor(uint8_t *frm, struct ieee80211_node *ni) { frm[0] = IEEE80211_ELEMID_VENDOR; frm[1] = 4 + sizeof(struct ieee80211_ie_htinfo) - 2; ==== //depot/projects/wifi/sys/net80211/ieee80211_ht.h#2 (text+ko) ==== @@ -36,7 +36,7 @@ #define IEEE80211_AGGR_BAWMAX 64 /* max block ack window size */ -typedef u_int16_t ieee80211_seq; +typedef uint16_t ieee80211_seq; struct ieee80211_tx_ampdu { u_short txa_flags; @@ -44,14 +44,14 @@ #define IEEE80211_AGGR_XCHGPEND 0x0002 /* ADDBA response pending */ #define IEEE80211_AGGR_RUNNING 0x0004 /* ADDBA response received */ #define IEEE80211_AGGR_SETUP 0x0008 /* deferred state setup */ - u_int8_t txa_ac; - u_int8_t txa_token; /* dialog token */ + uint8_t txa_ac; + uint8_t txa_token; /* dialog token */ int txa_qbytes; /* data queued (bytes) */ short txa_qframes; /* data queued (frames) */ ieee80211_seq txa_seqstart; ieee80211_seq txa_start; - u_int16_t txa_wnd; /* BA window size */ - u_int8_t txa_attempts; /* # setup attempts */ + uint16_t txa_wnd; /* BA window size */ + uint8_t txa_attempts; /* # setup attempts */ int txa_lastrequest;/* time of last ADDBA request */ struct ifqueue txa_q; /* packet queue */ struct callout txa_timer; @@ -73,7 +73,7 @@ ieee80211_seq rxa_seqstart; ieee80211_seq rxa_start; /* start of current BA window */ ieee80211_seq rxa_nxt; /* next seq# in BA window */ - u_int16_t rxa_wnd; /* BA window size */ + uint16_t rxa_wnd; /* BA window size */ struct mbuf *rxa_m[IEEE80211_AGGR_BAWMAX]; }; @@ -88,26 +88,26 @@ struct ieee80211_node; int ieee80211_setup_htrates(struct ieee80211_node *, - const u_int8_t *htcap, int flags); + const uint8_t *htcap, int flags); void ieee80211_setup_basic_htrates(struct ieee80211_node *, - const u_int8_t *htinfo); + const uint8_t *htinfo); struct mbuf *ieee80211_decap_amsdu(struct ieee80211_node *, struct mbuf *); int ieee80211_ampdu_reorder(struct ieee80211_node *, struct mbuf *); void ieee80211_recv_bar(struct ieee80211_node *, struct mbuf *); -void ieee80211_ht_node_init(struct ieee80211_node *, const u_int8_t *); +void ieee80211_ht_node_init(struct ieee80211_node *, const uint8_t *); void ieee80211_ht_node_cleanup(struct ieee80211_node *); -void ieee80211_parse_htcap(struct ieee80211_node *, const u_int8_t *); -void ieee80211_parse_htinfo(struct ieee80211_node *, const u_int8_t *); +void ieee80211_parse_htcap(struct ieee80211_node *, const uint8_t *); +void ieee80211_parse_htinfo(struct ieee80211_node *, const uint8_t *); void ieee80211_recv_action(struct ieee80211_node *, - const u_int8_t *, const u_int8_t *); + const uint8_t *, const uint8_t *); int ieee80211_ampdu_request(struct ieee80211_node *, struct ieee80211_tx_ampdu *); int ieee80211_send_bar(struct ieee80211_node *, const struct ieee80211_tx_ampdu *); int ieee80211_send_action(struct ieee80211_node *, - int, int, u_int16_t [4]); -u_int8_t *ieee80211_add_htcap(u_int8_t *, struct ieee80211_node *); -u_int8_t *ieee80211_add_htcap_vendor(u_int8_t *, struct ieee80211_node *); -u_int8_t *ieee80211_add_htinfo(u_int8_t *, struct ieee80211_node *); -u_int8_t *ieee80211_add_htinfo_vendor(u_int8_t *, struct ieee80211_node *); + int, int, uint16_t [4]); +uint8_t *ieee80211_add_htcap(uint8_t *, struct ieee80211_node *); +uint8_t *ieee80211_add_htcap_vendor(uint8_t *, struct ieee80211_node *); +uint8_t *ieee80211_add_htinfo(uint8_t *, struct ieee80211_node *); +uint8_t *ieee80211_add_htinfo_vendor(uint8_t *, struct ieee80211_node *); #endif /* _NET80211_IEEE80211_HT_H_ */ From owner-p4-projects@FreeBSD.ORG Sun May 13 04:26:43 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F1EF616A405; Sun, 13 May 2007 04:26:42 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B835516A400 for ; Sun, 13 May 2007 04:26:42 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A848F13C44C for ; Sun, 13 May 2007 04:26:42 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4D4Qg8p035949 for ; Sun, 13 May 2007 04:26:42 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4D4Qg4N035946 for perforce@freebsd.org; Sun, 13 May 2007 04:26:42 GMT (envelope-from sephe@FreeBSD.org) Date: Sun, 13 May 2007 04:26:42 GMT Message-Id: <200705130426.l4D4Qg4N035946@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 119748 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, 13 May 2007 04:26:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=119748 Change 119748 by sephe@sephe_zealot:sam_wifi on 2007/05/13 04:26:38 u_intX_t -> uintX_t Approved by: sam Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_var.h#57 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_var.h#57 (text+ko) ==== @@ -101,25 +101,25 @@ ieee80211_beacon_lock_t ic_beaconlock; /* beacon update lock */ struct ieee80211_stats ic_stats; /* statistics */ struct sysctl_ctx_list *ic_sysctl; /* dynamic sysctl context */ - u_int32_t ic_debug; /* debug msg flags */ + uint32_t ic_debug; /* debug msg flags */ int ic_vap; /* virtual AP index */ int ic_headroom; /* driver tx headroom needs */ enum ieee80211_phytype ic_phytype; /* XXX wrong for multi-mode */ enum ieee80211_opmode ic_opmode; /* operation mode */ struct ifmedia ic_media; /* interface media config */ - u_int8_t ic_myaddr[IEEE80211_ADDR_LEN]; + uint8_t ic_myaddr[IEEE80211_ADDR_LEN]; - u_int32_t ic_flags; /* state flags */ - u_int32_t ic_flags_ext; /* extended state flags */ - u_int32_t ic_caps; /* capabilities */ - u_int8_t ic_modecaps[2]; /* set of mode capabilities */ - u_int16_t ic_curmode; /* current mode */ + uint32_t ic_flags; /* state flags */ + uint32_t ic_flags_ext; /* extended state flags */ + uint32_t ic_caps; /* capabilities */ + uint8_t ic_modecaps[2]; /* set of mode capabilities */ + uint16_t ic_curmode; /* current mode */ struct ieee80211_rateset ic_sup_rates[IEEE80211_MODE_MAX]; - u_int16_t ic_bintval; /* beacon interval */ - u_int16_t ic_lintval; /* listen interval */ - u_int16_t ic_holdover; /* PM hold over duration */ - u_int16_t ic_txpowlimit; /* global tx power limit */ - u_int32_t ic_htcaps; /* HT capabilities */ + uint16_t ic_bintval; /* beacon interval */ + uint16_t ic_lintval; /* listen interval */ + uint16_t ic_holdover; /* PM hold over duration */ + uint16_t ic_txpowlimit; /* global tx power limit */ + uint32_t ic_htcaps; /* HT capabilities */ int ic_ampdu_rxmax; /* A-MPDU rx limit (bytes) */ int ic_ampdu_density;/* A-MPDU density */ int ic_ampdu_limit; /* A-MPDU tx limit (bytes) */ @@ -147,15 +147,15 @@ */ int ic_nchans; /* # entries in ic_channels */ struct ieee80211_channel ic_channels[IEEE80211_CHAN_MAX+1]; - u_int8_t ic_chan_avail[IEEE80211_CHAN_BYTES]; - u_int8_t ic_chan_active[IEEE80211_CHAN_BYTES]; - u_int8_t ic_chan_scan[IEEE80211_CHAN_BYTES]; + uint8_t ic_chan_avail[IEEE80211_CHAN_BYTES]; + uint8_t ic_chan_active[IEEE80211_CHAN_BYTES]; + uint8_t ic_chan_scan[IEEE80211_CHAN_BYTES]; struct ieee80211_channel *ic_curchan; /* current channel */ struct ieee80211_channel *ic_bsschan; /* bss channel */ struct ieee80211_channel *ic_prevchan; /* previous channel */ int ic_countrycode; /* ISO country code */ - u_int16_t ic_regdomain; /* regulatory domain */ - u_int8_t ic_location; /* unknown, indoor, outdoor */ + uint16_t ic_regdomain; /* regulatory domain */ + uint8_t ic_location; /* unknown, indoor, outdoor */ struct ieee80211_scan_state *ic_scan; /* scan state */ enum ieee80211_roamingmode ic_roaming; /* roaming mode */ @@ -163,7 +163,7 @@ int ic_lastscan; /* time last scan completed */ int ic_des_nssid; /* # desired ssids */ struct ieee80211_scan_ssid ic_des_ssid[1];/* desired ssid table */ - u_int8_t ic_des_bssid[IEEE80211_ADDR_LEN]; + uint8_t ic_des_bssid[IEEE80211_ADDR_LEN]; struct ieee80211_channel *ic_des_chan; /* desired channel */ int ic_des_mode; /* desired phymode */ u_int ic_bgscanidle; /* bg scan idle threshold */ @@ -178,40 +178,40 @@ void *ic_as; /* private aclator state */ enum ieee80211_protmode ic_protmode; /* 802.11g protection mode */ - u_int16_t ic_nonerpsta; /* # non-ERP stations */ - u_int16_t ic_longslotsta; /* # long slot time stations */ - u_int16_t ic_sta_assoc; /* stations associated */ + uint16_t ic_nonerpsta; /* # non-ERP stations */ + uint16_t ic_longslotsta; /* # long slot time stations */ + uint16_t ic_sta_assoc; /* stations associated */ struct ifqueue ic_mgtq; enum ieee80211_state ic_state; /* 802.11 state */ struct callout ic_mgtsend; /* mgmt frame response timer */ - u_int32_t *ic_aid_bitmap; /* association id map */ - u_int16_t ic_max_aid; - u_int16_t ic_ps_sta; /* stations in power save */ - u_int16_t ic_ps_pending; /* ps sta's w/ pending frames */ - u_int8_t *ic_tim_bitmap; /* power-save stations w/ data*/ - u_int16_t ic_tim_len; /* ic_tim_bitmap size (bytes) */ - u_int8_t ic_dtim_period; /* DTIM period */ - u_int8_t ic_dtim_count; /* DTIM count for last bcn */ + uint32_t *ic_aid_bitmap; /* association id map */ + uint16_t ic_max_aid; + uint16_t ic_ps_sta; /* stations in power save */ + uint16_t ic_ps_pending; /* ps sta's w/ pending frames */ + uint8_t *ic_tim_bitmap; /* power-save stations w/ data*/ + uint16_t ic_tim_len; /* ic_tim_bitmap size (bytes) */ + uint8_t ic_dtim_period; /* DTIM period */ + uint8_t ic_dtim_count; /* DTIM count for last bcn */ struct bpf_if *ic_rawbpf; /* packet filter structure */ struct ieee80211_node *ic_bss; /* information for this node */ int ic_fixed_rate; /* 802.11 rate or -1 */ int ic_mcast_rate; /* rate for mcast frames */ - u_int16_t ic_rtsthreshold; - u_int16_t ic_fragthreshold; - u_int8_t ic_bmissthreshold; - u_int8_t ic_bmiss_count; /* current beacon miss count */ + uint16_t ic_rtsthreshold; + uint16_t ic_fragthreshold; + uint8_t ic_bmissthreshold; + uint8_t ic_bmiss_count; /* current beacon miss count */ int ic_bmiss_max; /* max bmiss before scan */ - u_int16_t ic_swbmiss_count;/* beacons in last period */ - u_int16_t ic_swbmiss_period;/* s/w bmiss period */ + uint16_t ic_swbmiss_count;/* beacons in last period */ + uint16_t ic_swbmiss_period;/* s/w bmiss period */ struct callout ic_swbmiss; /* s/w beacon miss timer */ - u_int16_t ic_txmin; /* min tx retry count */ - u_int16_t ic_txmax; /* max tx retry count */ - u_int16_t ic_txlifetime; /* tx lifetime */ + uint16_t ic_txmin; /* min tx retry count */ + uint16_t ic_txmax; /* max tx retry count */ + uint16_t ic_txlifetime; /* tx lifetime */ struct callout ic_inact; /* inactivity timer wait */ void *ic_opt_ie; /* user-specified IE's */ - u_int16_t ic_opt_ie_len; /* length of ni_opt_ie */ + uint16_t ic_opt_ie_len; /* length of ni_opt_ie */ int ic_inact_init; /* initial setting */ int ic_inact_auth; /* auth but not assoc setting */ int ic_inact_run; /* authorized setting */ @@ -236,7 +236,7 @@ struct ieee80211_node *, int, int); void (*ic_recv_mgmt)(struct ieee80211com *, struct mbuf *, struct ieee80211_node *, - int, int, int, u_int32_t); + int, int, int, uint32_t); /* send raw 802.11 frame */ int (*ic_raw_xmit)(struct ieee80211_node *, struct mbuf *, @@ -275,10 +275,10 @@ * from an assocated HT station. */ void (*ic_recv_action)(struct ieee80211_node *, - const u_int8_t *frm, const u_int8_t *efrm); + const uint8_t *frm, const uint8_t *efrm); int (*ic_send_action)(struct ieee80211_node *, int category, int action, - u_int16_t args[4]); + uint16_t args[4]); /* start/stop doing A-MPDU tx aggregation for a station */ int (*ic_addba_request)(struct ieee80211_node *, struct ieee80211_tx_ampdu *, @@ -403,7 +403,7 @@ void ieee80211_announce_channels(struct ieee80211com *); void ieee80211_media_init(struct ieee80211com *, ifm_change_cb_t, ifm_stat_cb_t); -struct ieee80211com *ieee80211_find_vap(const u_int8_t mac[IEEE80211_ADDR_LEN]); +struct ieee80211com *ieee80211_find_vap(const uint8_t mac[IEEE80211_ADDR_LEN]); int ieee80211_media_change(struct ifnet *); void ieee80211_media_status(struct ifnet *, struct ifmediareq *); int ieee80211_ioctl(struct ieee80211com *, u_long, caddr_t); @@ -449,7 +449,7 @@ { int size = ieee80211_hdrsize(data); if (ic->ic_flags & IEEE80211_F_DATAPAD) - size = roundup(size, sizeof(u_int32_t)); + size = roundup(size, sizeof(uint32_t)); return size; } @@ -461,7 +461,7 @@ { int size = ieee80211_anyhdrsize(data); if (ic->ic_flags & IEEE80211_F_DATAPAD) - size = roundup(size, sizeof(u_int32_t)); + size = roundup(size, sizeof(uint32_t)); return size; } @@ -516,7 +516,7 @@ } while (0) void ieee80211_note(struct ieee80211com *ic, const char *fmt, ...); void ieee80211_note_mac(struct ieee80211com *ic, - const u_int8_t mac[IEEE80211_ADDR_LEN], const char *fmt, ...); + const uint8_t mac[IEEE80211_ADDR_LEN], const char *fmt, ...); void ieee80211_note_frame(struct ieee80211com *ic, const struct ieee80211_frame *wh, const char *fmt, ...); #define ieee80211_msg_debug(_ic) \ @@ -560,7 +560,7 @@ void ieee80211_discard_ie(struct ieee80211com *, const struct ieee80211_frame *, const char *type, const char *fmt, ...); void ieee80211_discard_mac(struct ieee80211com *, - const u_int8_t mac[IEEE80211_ADDR_LEN], const char *type, + const uint8_t mac[IEEE80211_ADDR_LEN], const char *type, const char *fmt, ...); #else #define IEEE80211_DPRINTF(_ic, _m, _fmt, ...) From owner-p4-projects@FreeBSD.ORG Sun May 13 04:34:54 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8392F16A409; Sun, 13 May 2007 04:34:54 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3AB0B16A407 for ; Sun, 13 May 2007 04:34:54 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 29A5313C45A for ; Sun, 13 May 2007 04:34:54 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4D4YsqX037534 for ; Sun, 13 May 2007 04:34:54 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4D4YsF8037531 for perforce@freebsd.org; Sun, 13 May 2007 04:34:54 GMT (envelope-from sephe@FreeBSD.org) Date: Sun, 13 May 2007 04:34:54 GMT Message-Id: <200705130434.l4D4YsF8037531@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 119749 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, 13 May 2007 04:34:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=119749 Change 119749 by sephe@sephe_zealot:sam_wifi on 2007/05/13 04:34:40 u_intX_t -> uintX_t Approved by: sam Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#103 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#103 (text+ko) ==== @@ -73,7 +73,7 @@ return 1; } -static const u_int8_t *ieee80211_getbssid(struct ieee80211com *, +static const uint8_t *ieee80211_getbssid(struct ieee80211com *, const struct ieee80211_frame *); #endif /* IEEE80211_DEBUG */ @@ -81,7 +81,7 @@ struct ieee80211_node *, struct mbuf *, int); static struct mbuf *ieee80211_decap(struct ieee80211com *, struct mbuf *, int); static void ieee80211_send_error(struct ieee80211com *, struct ieee80211_node *, - const u_int8_t *mac, int subtype, int arg); + const uint8_t *mac, int subtype, int arg); static struct mbuf *ieee80211_decap_fastframe(struct ieee80211com *, struct ieee80211_node *, struct mbuf *); static void ieee80211_recv_pspoll(struct ieee80211com *, @@ -99,7 +99,7 @@ */ int ieee80211_input(struct ieee80211com *ic, struct mbuf *m, - struct ieee80211_node *ni, int rssi, int noise, u_int32_t rstamp) + struct ieee80211_node *ni, int rssi, int noise, uint32_t rstamp) { #define SEQ_LEQ(a,b) ((int)((a)-(b)) <= 0) #define HAS_SEQ(type) ((type & 0x4) == 0) @@ -108,9 +108,9 @@ struct ieee80211_key *key; struct ether_header *eh; int hdrspace, need_tap; - u_int8_t dir, type, subtype, qos; - u_int8_t *bssid; - u_int16_t rxseq; + uint8_t dir, type, subtype, qos; + uint8_t *bssid; + uint16_t rxseq; if (m->m_flags & M_AMPDU) { /* @@ -242,7 +242,7 @@ ni->ni_noise = noise; ni->ni_rstamp = rstamp; if (HAS_SEQ(type)) { - u_int8_t tid; + uint8_t tid; if (IEEE80211_QOS_HAS_SEQ(wh)) { tid = ((struct ieee80211_qosframe *)wh)-> i_qos[0] & IEEE80211_QOS_TID; @@ -251,7 +251,7 @@ tid++; } else tid = IEEE80211_NONQOS_TID; - rxseq = le16toh(*(u_int16_t *)wh->i_seq); + rxseq = le16toh(*(uint16_t *)wh->i_seq); if ((ni->ni_flags & IEEE80211_NODE_HT) == 0 && (wh->i_fc[1] & IEEE80211_FC1_RETRY) && SEQ_LEQ(rxseq, ni->ni_rxseqs[tid])) { @@ -516,7 +516,7 @@ ic->ic_stats.is_rx_tooshort++; return IEEE80211_FC0_TYPE_DATA; } - llc = (struct llc *)(mtod(m, u_int8_t *) + + llc = (struct llc *)(mtod(m, uint8_t *) + sizeof(struct ether_header)); if (llc->llc_snap.ether_type == htons(ATH_FF_ETH_TYPE)) { m_adj(m, FF_LLC_SIZE); @@ -632,14 +632,14 @@ { struct ieee80211_frame *wh = mtod(m, struct ieee80211_frame *); struct ieee80211_frame *lwh; - u_int16_t rxseq; - u_int8_t fragno; - u_int8_t more_frag = wh->i_fc[1] & IEEE80211_FC1_MORE_FRAG; + uint16_t rxseq; + uint8_t fragno; + uint8_t more_frag = wh->i_fc[1] & IEEE80211_FC1_MORE_FRAG; struct mbuf *mfrag; KASSERT(!IEEE80211_IS_MULTICAST(wh->i_addr1), ("multicast fragm?")); - rxseq = le16toh(*(u_int16_t *)wh->i_seq); + rxseq = le16toh(*(uint16_t *)wh->i_seq); fragno = rxseq & IEEE80211_SEQ_FRAG_MASK; /* Quick way out, if there's nothing to defragment */ @@ -672,10 +672,10 @@ * related to the previous ones. */ if (mfrag != NULL) { - u_int16_t last_rxseq; + uint16_t last_rxseq; lwh = mtod(mfrag, struct ieee80211_frame *); - last_rxseq = le16toh(*(u_int16_t *)lwh->i_seq); + last_rxseq = le16toh(*(uint16_t *)lwh->i_seq); /* NB: check seq # and frag together */ if (rxseq != last_rxseq+1 || !IEEE80211_ADDR_EQ(wh->i_addr1, lwh->i_addr1) || @@ -704,7 +704,7 @@ mfrag->m_pkthdr.len += m->m_pkthdr.len; /* track last seqnum and fragno */ lwh = mtod(mfrag, struct ieee80211_frame *); - *(u_int16_t *) lwh->i_seq = *(u_int16_t *) wh->i_seq; + *(uint16_t *) lwh->i_seq = *(uint16_t *) wh->i_seq; } if (more_frag) { /* more to come, save */ ni->ni_rxfragstamp = ticks; @@ -825,7 +825,7 @@ break; } #ifdef ALIGNED_POINTER - if (!ALIGNED_POINTER(mtod(m, caddr_t) + sizeof(*eh), u_int32_t)) { + if (!ALIGNED_POINTER(mtod(m, caddr_t) + sizeof(*eh), uint32_t)) { struct mbuf *n, *n0, **np; caddr_t newdata; int off, pktlen; @@ -907,7 +907,7 @@ *framelen = ntohs(eh->ether_type) /* encap'd frame size */ + sizeof(struct ether_header) - sizeof(struct llc); eh->ether_type = llc->llc_un.type_snap.ether_type; - ovbcopy(eh, mtod(m, u_int8_t *) + sizeof(struct llc), + ovbcopy(eh, mtod(m, uint8_t *) + sizeof(struct llc), sizeof(struct ether_header)); m_adj(m, sizeof(struct llc)); return m; @@ -924,11 +924,11 @@ struct ieee80211_node *ni, struct mbuf *m) { #define MS(x,f) (((x) & f) >> f##_S) - u_int32_t ath; + uint32_t ath; struct mbuf *n; int framelen; - m_copydata(m, 0, sizeof(u_int32_t), (caddr_t) &ath); + m_copydata(m, 0, sizeof(uint32_t), (caddr_t) &ath); if (MS(ath, ATH_FF_PROTO) != ATH_FF_PROTO_L2TUNNEL) { IEEE80211_DISCARD_MAC(ic, IEEE80211_MSG_ANY, ni->ni_macaddr, "fast-frame", @@ -938,7 +938,7 @@ return NULL; } /* NB: skip header and alignment padding */ - m_adj(m, roundup(sizeof(u_int32_t) - 2, 4) + 2); + m_adj(m, roundup(sizeof(uint32_t) - 2, 4) + 2); ic->ic_stats.is_ff_decap++; @@ -985,7 +985,7 @@ */ int ieee80211_setup_rates(struct ieee80211_node *ni, - const u_int8_t *rates, const u_int8_t *xrates, int flags) + const uint8_t *rates, const uint8_t *xrates, int flags) { struct ieee80211com *ic = ni->ni_ic; struct ieee80211_rateset *rs = &ni->ni_rates; @@ -994,7 +994,7 @@ rs->rs_nrates = rates[1]; memcpy(rs->rs_rates, rates + 2, rs->rs_nrates); if (xrates != NULL) { - u_int8_t nxrates; + uint8_t nxrates; /* * Tack on 11g extended supported rate element. */ @@ -1015,8 +1015,8 @@ static void ieee80211_auth_open(struct ieee80211com *ic, struct ieee80211_frame *wh, - struct ieee80211_node *ni, int rssi, int noise, u_int32_t rstamp, - u_int16_t seq, u_int16_t status) + struct ieee80211_node *ni, int rssi, int noise, uint32_t rstamp, + uint16_t seq, uint16_t status) { if (ni->ni_authmode == IEEE80211_AUTH_SHARED) { @@ -1117,7 +1117,7 @@ */ static void ieee80211_send_error(struct ieee80211com *ic, struct ieee80211_node *ni, - const u_int8_t *mac, int subtype, int arg) + const uint8_t *mac, int subtype, int arg) { int istmp; @@ -1139,7 +1139,7 @@ alloc_challenge(struct ieee80211com *ic, struct ieee80211_node *ni) { if (ni->ni_challenge == NULL) - MALLOC(ni->ni_challenge, u_int32_t*, IEEE80211_CHALLENGE_LEN, + MALLOC(ni->ni_challenge, uint32_t*, IEEE80211_CHALLENGE_LEN, M_80211_NODE, M_NOWAIT); if (ni->ni_challenge == NULL) { IEEE80211_DPRINTF(ic, IEEE80211_MSG_DEBUG | IEEE80211_MSG_AUTH, @@ -1153,10 +1153,10 @@ /* XXX TODO: add statistics */ static void ieee80211_auth_shared(struct ieee80211com *ic, struct ieee80211_frame *wh, - u_int8_t *frm, u_int8_t *efrm, struct ieee80211_node *ni, - int rssi, int noise, u_int32_t rstamp, u_int16_t seq, u_int16_t status) + uint8_t *frm, uint8_t *efrm, struct ieee80211_node *ni, + int rssi, int noise, uint32_t rstamp, uint16_t seq, uint16_t status) { - u_int8_t *challenge; + uint8_t *challenge; int allocbs, estatus; /* @@ -1417,7 +1417,7 @@ #ifdef IEEE80211_DEBUG static void ieee80211_ssid_mismatch(struct ieee80211com *ic, const char *tag, - u_int8_t mac[IEEE80211_ADDR_LEN], u_int8_t *ssid) + uint8_t mac[IEEE80211_ADDR_LEN], uint8_t *ssid) { printf("[%s] discard %s frame, ssid mismatch: ", ether_sprintf(mac), tag); @@ -1451,56 +1451,56 @@ /* unalligned little endian access */ #define LE_READ_2(p) \ - ((u_int16_t) \ - ((((const u_int8_t *)(p))[0] ) | \ - (((const u_int8_t *)(p))[1] << 8))) + ((uint16_t) \ + ((((const uint8_t *)(p))[0] ) | \ + (((const uint8_t *)(p))[1] << 8))) #define LE_READ_4(p) \ - ((u_int32_t) \ - ((((const u_int8_t *)(p))[0] ) | \ - (((const u_int8_t *)(p))[1] << 8) | \ - (((const u_int8_t *)(p))[2] << 16) | \ - (((const u_int8_t *)(p))[3] << 24))) + ((uint32_t) \ + ((((const uint8_t *)(p))[0] ) | \ + (((const uint8_t *)(p))[1] << 8) | \ + (((const uint8_t *)(p))[2] << 16) | \ + (((const uint8_t *)(p))[3] << 24))) static __inline int -iswpaoui(const u_int8_t *frm) +iswpaoui(const uint8_t *frm) { return frm[1] > 3 && LE_READ_4(frm+2) == ((WPA_OUI_TYPE<<24)|WPA_OUI); } static __inline int -iswmeoui(const u_int8_t *frm) +iswmeoui(const uint8_t *frm) { return frm[1] > 3 && LE_READ_4(frm+2) == ((WME_OUI_TYPE<<24)|WME_OUI); } static __inline int -iswmeparam(const u_int8_t *frm) +iswmeparam(const uint8_t *frm) { return frm[1] > 5 && LE_READ_4(frm+2) == ((WME_OUI_TYPE<<24)|WME_OUI) && frm[6] == WME_PARAM_OUI_SUBTYPE; } static __inline int -iswmeinfo(const u_int8_t *frm) +iswmeinfo(const uint8_t *frm) { return frm[1] > 5 && LE_READ_4(frm+2) == ((WME_OUI_TYPE<<24)|WME_OUI) && frm[6] == WME_INFO_OUI_SUBTYPE; } static __inline int -isatherosoui(const u_int8_t *frm) +isatherosoui(const uint8_t *frm) { return frm[1] > 3 && LE_READ_4(frm+2) == ((ATH_OUI_TYPE<<24)|ATH_OUI); } static __inline int -ishtcapoui(const u_int8_t *frm) +ishtcapoui(const uint8_t *frm) { return frm[1] > 3 && LE_READ_4(frm+2) == ((BCM_OUI_HTCAP<<24)|BCM_OUI); } static __inline int -ishtinfooui(const u_int8_t *frm) +ishtinfooui(const uint8_t *frm) { return frm[1] > 3 && LE_READ_4(frm+2) == ((BCM_OUI_HTINFO<<24)|BCM_OUI); } @@ -1511,10 +1511,10 @@ * record any key length. */ static int -wpa_cipher(u_int8_t *sel, u_int8_t *keylen) +wpa_cipher(uint8_t *sel, uint8_t *keylen) { #define WPA_SEL(x) (((x)<<24)|WPA_OUI) - u_int32_t w = LE_READ_4(sel); + uint32_t w = LE_READ_4(sel); switch (w) { case WPA_SEL(WPA_CSE_NULL): @@ -1541,10 +1541,10 @@ * to an internal code. */ static int -wpa_keymgmt(u_int8_t *sel) +wpa_keymgmt(uint8_t *sel) { #define WPA_SEL(x) (((x)<<24)|WPA_OUI) - u_int32_t w = LE_READ_4(sel); + uint32_t w = LE_READ_4(sel); switch (w) { case WPA_SEL(WPA_ASE_8021X_UNSPEC): @@ -1564,11 +1564,11 @@ * configured for the system. */ static int -ieee80211_parse_wpa(struct ieee80211com *ic, u_int8_t *frm, +ieee80211_parse_wpa(struct ieee80211com *ic, uint8_t *frm, struct ieee80211_rsnparms *rsn, const struct ieee80211_frame *wh) { - u_int8_t len = frm[1]; - u_int32_t w; + uint8_t len = frm[1]; + uint32_t w; int n; /* @@ -1676,10 +1676,10 @@ * record any key length. */ static int -rsn_cipher(u_int8_t *sel, u_int8_t *keylen) +rsn_cipher(uint8_t *sel, uint8_t *keylen) { #define RSN_SEL(x) (((x)<<24)|RSN_OUI) - u_int32_t w = LE_READ_4(sel); + uint32_t w = LE_READ_4(sel); switch (w) { case RSN_SEL(RSN_CSE_NULL): @@ -1708,10 +1708,10 @@ * to an internal code. */ static int -rsn_keymgmt(u_int8_t *sel) +rsn_keymgmt(uint8_t *sel) { #define RSN_SEL(x) (((x)<<24)|RSN_OUI) - u_int32_t w = LE_READ_4(sel); + uint32_t w = LE_READ_4(sel); switch (w) { case RSN_SEL(RSN_ASE_8021X_UNSPEC): @@ -1731,11 +1731,11 @@ * configured for the system. */ static int -ieee80211_parse_rsn(struct ieee80211com *ic, u_int8_t *frm, +ieee80211_parse_rsn(struct ieee80211com *ic, uint8_t *frm, struct ieee80211_rsnparms *rsn, const struct ieee80211_frame *wh) { - u_int8_t len = frm[1]; - u_int32_t w; + uint8_t len = frm[1]; + uint32_t w; int n; /* @@ -1839,7 +1839,7 @@ } static int -ieee80211_parse_wmeparams(struct ieee80211com *ic, u_int8_t *frm, +ieee80211_parse_wmeparams(struct ieee80211com *ic, uint8_t *frm, const struct ieee80211_frame *wh) { #define MS(_v, _f) (((_v) & _f) >> _f##_S) @@ -1876,14 +1876,14 @@ } static int -ieee80211_parse_athparams(struct ieee80211_node *ni, u_int8_t *frm, +ieee80211_parse_athparams(struct ieee80211_node *ni, uint8_t *frm, const struct ieee80211_frame *wh) { struct ieee80211com *ic = ni->ni_ic; const struct ieee80211_ath_ie *ath; u_int len = frm[1]; int capschanged; - u_int16_t defkeyix; + uint16_t defkeyix; if (len < sizeof(struct ieee80211_ath_ie)-2) { IEEE80211_DISCARD_IE(ic, @@ -1903,7 +1903,7 @@ ni->ni_ath_flags, ni->ni_ath_defkeyix); } if (IEEE80211_ATH_CAP(ic, ni, ATHEROS_CAP_TURBO_PRIME)) { - u_int16_t curflags, newflags; + uint16_t curflags, newflags; /* * Check for turbo mode switch. Calculate flags @@ -1922,7 +1922,7 @@ } void -ieee80211_saveath(struct ieee80211_node *ni, u_int8_t *ie) +ieee80211_saveath(struct ieee80211_node *ni, uint8_t *ie) { const struct ieee80211_ath_ie *ath = (const struct ieee80211_ath_ie *) ie; @@ -1933,7 +1933,7 @@ } void -ieee80211_saveie(u_int8_t **iep, const u_int8_t *ie) +ieee80211_saveie(uint8_t **iep, const uint8_t *ie) { u_int ielen = ie[1]+2; /* @@ -1952,10 +1952,10 @@ /* XXX find a better place for definition */ struct l2_update_frame { struct ether_header eh; - u_int8_t dsap; - u_int8_t ssap; - u_int8_t control; - u_int8_t xid[3]; + uint8_t dsap; + uint8_t ssap; + uint8_t control; + uint8_t xid[3]; } __packed; /* @@ -2047,19 +2047,19 @@ void ieee80211_recv_mgmt(struct ieee80211com *ic, struct mbuf *m0, struct ieee80211_node *ni, - int subtype, int rssi, int noise, u_int32_t rstamp) + int subtype, int rssi, int noise, uint32_t rstamp) { #define ISPROBE(_st) ((_st) == IEEE80211_FC0_SUBTYPE_PROBE_RESP) #define ISREASSOC(_st) ((_st) == IEEE80211_FC0_SUBTYPE_REASSOC_RESP) struct ieee80211_frame *wh; - u_int8_t *frm, *efrm; - u_int8_t *ssid, *rates, *xrates, *wpa, *rsn, *wme, *ath, *htcap; + uint8_t *frm, *efrm; + uint8_t *ssid, *rates, *xrates, *wpa, *rsn, *wme, *ath, *htcap; int reassoc, resp, allocbs; - u_int8_t rate; + uint8_t rate; wh = mtod(m0, struct ieee80211_frame *); - frm = (u_int8_t *)&wh[1]; - efrm = mtod(m0, u_int8_t *) + m0->m_len; + frm = (uint8_t *)&wh[1]; + efrm = mtod(m0, uint8_t *) + m0->m_len; switch (subtype) { case IEEE80211_FC0_SUBTYPE_PROBE_RESP: case IEEE80211_FC0_SUBTYPE_BEACON: { @@ -2099,8 +2099,8 @@ IEEE80211_VERIFY_LENGTH(efrm - frm, 12, return); memset(&scan, 0, sizeof(scan)); scan.tstamp = frm; frm += 8; - scan.bintval = le16toh(*(u_int16_t *)frm); frm += 2; - scan.capinfo = le16toh(*(u_int16_t *)frm); frm += 2; + scan.bintval = le16toh(*(uint16_t *)frm); frm += 2; + scan.capinfo = le16toh(*(uint16_t *)frm); frm += 2; scan.bchan = ieee80211_chan2ieee(ic, ic->ic_curchan); scan.chan = scan.bchan; @@ -2134,7 +2134,7 @@ case IEEE80211_ELEMID_TIM: /* XXX ATIM? */ scan.tim = frm; - scan.timoff = frm - mtod(m0, u_int8_t *); + scan.timoff = frm - mtod(m0, uint8_t *); break; case IEEE80211_ELEMID_IBSSPARMS: break; @@ -2516,7 +2516,7 @@ break; case IEEE80211_FC0_SUBTYPE_AUTH: { - u_int16_t algo, seq, status; + uint16_t algo, seq, status; /* * auth frame format * [2] algorithm @@ -2525,9 +2525,9 @@ * [tlv*] challenge */ IEEE80211_VERIFY_LENGTH(efrm - frm, 6, return); - algo = le16toh(*(u_int16_t *)frm); - seq = le16toh(*(u_int16_t *)(frm + 2)); - status = le16toh(*(u_int16_t *)(frm + 4)); + algo = le16toh(*(uint16_t *)frm); + seq = le16toh(*(uint16_t *)(frm + 2)); + status = le16toh(*(uint16_t *)(frm + 4)); IEEE80211_DPRINTF(ic, IEEE80211_MSG_AUTH, "[%s] recv auth frame with algorithm %d seq %d\n", ether_sprintf(wh->i_addr2), algo, seq); @@ -2581,9 +2581,9 @@ case IEEE80211_FC0_SUBTYPE_ASSOC_REQ: case IEEE80211_FC0_SUBTYPE_REASSOC_REQ: { - u_int16_t capinfo, lintval; + uint16_t capinfo, lintval; struct ieee80211_rsnparms rsnparms; - u_int8_t reason; + uint8_t reason; int badwparsn; if (ic->ic_opmode != IEEE80211_M_HOSTAP || @@ -2620,8 +2620,8 @@ ic->ic_stats.is_rx_assoc_bss++; return; } - capinfo = le16toh(*(u_int16_t *)frm); frm += 2; - lintval = le16toh(*(u_int16_t *)frm); frm += 2; + capinfo = le16toh(*(uint16_t *)frm); frm += 2; + lintval = le16toh(*(uint16_t *)frm); frm += 2; if (reassoc) frm += 6; /* ignore current AP info */ ssid = rates = xrates = wpa = rsn = wme = ath = htcap = NULL; @@ -2872,8 +2872,8 @@ case IEEE80211_FC0_SUBTYPE_ASSOC_RESP: case IEEE80211_FC0_SUBTYPE_REASSOC_RESP: { - u_int16_t capinfo, associd; - u_int16_t status; + uint16_t capinfo, associd; + uint16_t status; if (ic->ic_opmode != IEEE80211_M_STA || ic->ic_state != IEEE80211_S_ASSOC) { @@ -2893,9 +2893,9 @@ */ IEEE80211_VERIFY_LENGTH(efrm - frm, 6, return); ni = ic->ic_bss; - capinfo = le16toh(*(u_int16_t *)frm); + capinfo = le16toh(*(uint16_t *)frm); frm += 2; - status = le16toh(*(u_int16_t *)frm); + status = le16toh(*(uint16_t *)frm); frm += 2; if (status != 0) { IEEE80211_DPRINTF(ic, IEEE80211_MSG_ASSOC, @@ -2907,7 +2907,7 @@ ic->ic_stats.is_rx_auth_fail++; /* XXX */ return; } - associd = le16toh(*(u_int16_t *)frm); + associd = le16toh(*(uint16_t *)frm); frm += 2; rates = xrates = wme = htcap = NULL; @@ -3005,7 +3005,7 @@ } case IEEE80211_FC0_SUBTYPE_DEAUTH: { - u_int16_t reason; + uint16_t reason; if (ic->ic_state == IEEE80211_S_SCAN) { ic->ic_stats.is_rx_mgtdiscard++; @@ -3016,7 +3016,7 @@ * [2] reason */ IEEE80211_VERIFY_LENGTH(efrm - frm, 2, return); - reason = le16toh(*(u_int16_t *)frm); + reason = le16toh(*(uint16_t *)frm); ic->ic_stats.is_rx_deauth++; IEEE80211_NODE_STAT(ni, rx_deauth); @@ -3045,7 +3045,7 @@ } case IEEE80211_FC0_SUBTYPE_DISASSOC: { - u_int16_t reason; + uint16_t reason; if (ic->ic_state != IEEE80211_S_RUN && ic->ic_state != IEEE80211_S_ASSOC && @@ -3058,7 +3058,7 @@ * [2] reason */ IEEE80211_VERIFY_LENGTH(efrm - frm, 2, return); - reason = le16toh(*(u_int16_t *)frm); + reason = le16toh(*(uint16_t *)frm); ic->ic_stats.is_rx_disassoc++; IEEE80211_NODE_STAT(ni, rx_disassoc); @@ -3164,7 +3164,7 @@ { struct ieee80211_frame_min *wh; struct mbuf *m; - u_int16_t aid; + uint16_t aid; int qlen; wh = mtod(m0, struct ieee80211_frame_min *); @@ -3178,7 +3178,7 @@ return; } - aid = le16toh(*(u_int16_t *)wh->i_dur); + aid = le16toh(*(uint16_t *)wh->i_dur); if (aid != ni->ni_associd) { IEEE80211_DISCARD(ic, IEEE80211_MSG_POWER | IEEE80211_MSG_DEBUG, (struct ieee80211_frame *) wh, "ps-poll", @@ -3231,7 +3231,7 @@ /* * Return the bssid of a frame. */ -static const u_int8_t * +static const uint8_t * ieee80211_getbssid(struct ieee80211com *ic, const struct ieee80211_frame *wh) { if (ic->ic_opmode == IEEE80211_M_STA) @@ -3273,7 +3273,7 @@ void ieee80211_note_mac(struct ieee80211com *ic, - const u_int8_t mac[IEEE80211_ADDR_LEN], + const uint8_t mac[IEEE80211_ADDR_LEN], const char *fmt, ...) { char buf[128]; /* XXX */ @@ -3325,7 +3325,7 @@ void ieee80211_discard_mac(struct ieee80211com *ic, - const u_int8_t mac[IEEE80211_ADDR_LEN], + const uint8_t mac[IEEE80211_ADDR_LEN], const char *type, const char *fmt, ...) { va_list ap; From owner-p4-projects@FreeBSD.ORG Sun May 13 04:44:08 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A328716A407; Sun, 13 May 2007 04:44:07 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C6B3716A405 for ; Sun, 13 May 2007 04:44:05 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B5E8913C448 for ; Sun, 13 May 2007 04:44:05 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4D4i5L0039088 for ; Sun, 13 May 2007 04:44:05 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4D4i5mZ039085 for perforce@freebsd.org; Sun, 13 May 2007 04:44:05 GMT (envelope-from sephe@FreeBSD.org) Date: Sun, 13 May 2007 04:44:05 GMT Message-Id: <200705130444.l4D4i5mZ039085@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 119750 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, 13 May 2007 04:44:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=119750 Change 119750 by sephe@sephe_zealot:sam_wifi on 2007/05/13 04:43:30 u_intX_t -> uintX_t Approved by: sam Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#78 edit .. //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#39 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.c#78 (text+ko) ==== @@ -220,7 +220,7 @@ ieee80211_ioctl_getstastats(struct ieee80211com *ic, struct ieee80211req *ireq) { struct ieee80211_node *ni; - u_int8_t macaddr[IEEE80211_ADDR_LEN]; + uint8_t macaddr[IEEE80211_ADDR_LEN]; const int off = __offsetof(struct ieee80211req_sta_stats, is_stats); int error; @@ -235,14 +235,14 @@ if (ireq->i_len > sizeof(struct ieee80211req_sta_stats)) ireq->i_len = sizeof(struct ieee80211req_sta_stats); /* NB: copy out only the statistics */ - error = copyout(&ni->ni_stats, (u_int8_t *) ireq->i_data + off, + error = copyout(&ni->ni_stats, (uint8_t *) ireq->i_data + off, ireq->i_len - off); ieee80211_free_node(ni); return error; } -static __inline u_int8_t * -copyie(u_int8_t *cp, const u_int8_t *ie) +static __inline uint8_t * +copyie(uint8_t *cp, const uint8_t *ie) { if (ie != NULL) { memcpy(cp, ie, 2+ie[1]); @@ -255,20 +255,20 @@ #define IEEE80211_IOC_SCAN_RESULTS_OLD 24 struct scan_result_old { - u_int16_t isr_len; /* length (mult of 4) */ - u_int16_t isr_freq; /* MHz */ - u_int16_t isr_flags; /* channel flags */ - u_int8_t isr_noise; - u_int8_t isr_rssi; - u_int8_t isr_intval; /* beacon interval */ - u_int8_t isr_capinfo; /* capabilities */ - u_int8_t isr_erp; /* ERP element */ - u_int8_t isr_bssid[IEEE80211_ADDR_LEN]; - u_int8_t isr_nrates; - u_int8_t isr_rates[IEEE80211_RATE_MAXSIZE]; - u_int8_t isr_ssid_len; /* SSID length */ - u_int8_t isr_ie_len; /* IE length */ - u_int8_t isr_pad[5]; + uint16_t isr_len; /* length (mult of 4) */ + uint16_t isr_freq; /* MHz */ + uint16_t isr_flags; /* channel flags */ + uint8_t isr_noise; + uint8_t isr_rssi; + uint8_t isr_intval; /* beacon interval */ + uint8_t isr_capinfo; /* capabilities */ + uint8_t isr_erp; /* ERP element */ + uint8_t isr_bssid[IEEE80211_ADDR_LEN]; + uint8_t isr_nrates; + uint8_t isr_rates[IEEE80211_RATE_MAXSIZE]; + uint8_t isr_ssid_len; /* SSID length */ + uint8_t isr_ie_len; /* IE length */ + uint8_t isr_pad[5]; /* variable length SSID followed by IE data */ }; @@ -293,7 +293,7 @@ * 16-bits; if this is a concern we can drop the ie's. */ len = sizeof(struct scan_result_old) + se->se_ssid[1] + *ielen; - return roundup(len, sizeof(u_int32_t)); + return roundup(len, sizeof(uint32_t)); } static void @@ -311,7 +311,7 @@ struct oscanreq *req = arg; struct scan_result_old *sr; int ielen, len, nr, nxr; - u_int8_t *cp; + uint8_t *cp; len = old_scan_space(se, &ielen); if (len > req->space) @@ -337,7 +337,7 @@ memcpy(sr->isr_rates+nr, se->se_xrates+2, nxr); sr->isr_nrates = nr + nxr; - cp = (u_int8_t *)(sr+1); + cp = (uint8_t *)(sr+1); memcpy(cp, se->se_ssid+2, sr->isr_ssid_len); cp += sr->isr_ssid_len; if (sr->isr_ie_len) { @@ -346,7 +346,7 @@ } req->space -= len; - req->sr = (struct scan_result_old *)(((u_int8_t *)sr) + len); + req->sr = (struct scan_result_old *)(((uint8_t *)sr) + len); } static int @@ -409,7 +409,7 @@ * 16-bits; if this is a concern we can drop the ie's. */ len = sizeof(struct ieee80211req_scan_result) + se->se_ssid[1] + *ielen; - return roundup(len, sizeof(u_int32_t)); + return roundup(len, sizeof(uint32_t)); } static void @@ -427,7 +427,7 @@ struct scanreq *req = arg; struct ieee80211req_scan_result *sr; int ielen, len, nr, nxr; - u_int8_t *cp; + uint8_t *cp; len = scan_space(se, &ielen); if (len > req->space) @@ -453,7 +453,7 @@ memcpy(sr->isr_rates+nr, se->se_xrates+2, nxr); sr->isr_nrates = nr + nxr; - cp = (u_int8_t *)(sr+1); + cp = (uint8_t *)(sr+1); memcpy(cp, se->se_ssid+2, sr->isr_ssid_len); cp += sr->isr_ssid_len; if (sr->isr_ie_len) { @@ -465,7 +465,7 @@ } req->space -= len; - req->sr = (struct ieee80211req_scan_result *)(((u_int8_t *)sr) + len); + req->sr = (struct ieee80211req_scan_result *)(((uint8_t *)sr) + len); } static int @@ -521,7 +521,7 @@ if (ni->ni_ath_ie != NULL) *ielen += 2+ni->ni_ath_ie[1]; return roundup(sizeof(struct ieee80211req_sta_info) + *ielen, - sizeof(u_int32_t)); + sizeof(uint32_t)); } static void @@ -544,7 +544,7 @@ struct ieee80211com *ic = ni->ni_ic; struct ieee80211req_sta_info *si; size_t ielen, len; - u_int8_t *cp; + uint8_t *cp; if (ic->ic_opmode == IEEE80211_M_HOSTAP && ni->ni_associd == 0) /* only associated stations */ @@ -591,13 +591,13 @@ si->isi_inact = ic->ic_inact_init; si->isi_inact = (si->isi_inact - ni->ni_inact) * IEEE80211_INACT_WAIT; - cp = (u_int8_t *)(si+1); + cp = (uint8_t *)(si+1); cp = copyie(cp, ni->ni_wpa_ie); cp = copyie(cp, ni->ni_rsn_ie); cp = copyie(cp, ni->ni_wme_ie); cp = copyie(cp, ni->ni_ath_ie); - req->si = (struct ieee80211req_sta_info *)(((u_int8_t *)si) + len); + req->si = (struct ieee80211req_sta_info *)(((uint8_t *)si) + len); req->space -= len; } @@ -632,7 +632,7 @@ else get_sta_info(&req, ni); ireq->i_len = space - req.space; - error = copyout(p, (u_int8_t *) ireq->i_data+off, ireq->i_len); + error = copyout(p, (uint8_t *) ireq->i_data+off, ireq->i_len); FREE(p, M_TEMP); } else ireq->i_len = 0; @@ -645,7 +645,7 @@ static int ieee80211_ioctl_getstainfo(struct ieee80211com *ic, struct ieee80211req *ireq) { - u_int8_t macaddr[IEEE80211_ADDR_LEN]; + uint8_t macaddr[IEEE80211_ADDR_LEN]; const int off = __offsetof(struct ieee80211req_sta_req, info); struct ieee80211_node *ni; int error; @@ -795,7 +795,7 @@ const struct ieee80211_rsnparms *rsn = &ic->ic_bss->ni_rsn; int error = 0; u_int kid, len, m; - u_int8_t tmpkey[IEEE80211_KEYBUF_SIZE]; + uint8_t tmpkey[IEEE80211_KEYBUF_SIZE]; char tmpssid[IEEE80211_NWID_LEN]; switch (ireq->i_type) { @@ -1159,7 +1159,7 @@ struct ieee80211req_key ik; struct ieee80211_node *ni; struct ieee80211_key *wk; - u_int16_t kid; + uint16_t kid; int error; if (ireq->i_len != sizeof(ik)) @@ -1236,8 +1236,8 @@ if (error) return error; kid = dk.idk_keyix; - /* XXX u_int8_t -> u_int16_t */ - if (dk.idk_keyix == (u_int8_t) IEEE80211_KEYIX_NONE) { + /* XXX uint8_t -> uint16_t */ + if (dk.idk_keyix == (uint8_t) IEEE80211_KEYIX_NONE) { struct ieee80211_node *ni; if (ic->ic_opmode == IEEE80211_M_STA) { @@ -1280,9 +1280,9 @@ } struct scanlookup { - const u_int8_t *mac; + const uint8_t *mac; int esslen; - const u_int8_t *essid; + const uint8_t *essid; const struct ieee80211_scan_entry *se; }; @@ -1381,7 +1381,7 @@ static int ieee80211_ioctl_macmac(struct ieee80211com *ic, struct ieee80211req *ireq) { - u_int8_t mac[IEEE80211_ADDR_LEN]; + uint8_t mac[IEEE80211_ADDR_LEN]; const struct ieee80211_aclator *acl = ic->ic_acl; int error; @@ -1485,7 +1485,7 @@ ieee80211_ioctl_setstastats(struct ieee80211com *ic, struct ieee80211req *ireq) { struct ieee80211_node *ni; - u_int8_t macaddr[IEEE80211_ADDR_LEN]; + uint8_t macaddr[IEEE80211_ADDR_LEN]; int error; /* @@ -1875,13 +1875,13 @@ static int ieee80211_ioctl_set80211(struct ieee80211com *ic, u_long cmd, struct ieee80211req *ireq) { - static const u_int8_t zerobssid[IEEE80211_ADDR_LEN]; + static const uint8_t zerobssid[IEEE80211_ADDR_LEN]; struct ieee80211_rsnparms *rsn = &ic->ic_bss->ni_rsn; int error; const struct ieee80211_authenticator *auth; - u_int8_t tmpkey[IEEE80211_KEYBUF_SIZE]; + uint8_t tmpkey[IEEE80211_KEYBUF_SIZE]; char tmpssid[IEEE80211_NWID_LEN]; - u_int8_t tmpbssid[IEEE80211_ADDR_LEN]; + uint8_t tmpbssid[IEEE80211_ADDR_LEN]; struct ieee80211_key *k; int j, caps; u_int kid; @@ -1951,7 +1951,7 @@ case IEEE80211_IOC_WEPTXKEY: kid = (u_int) ireq->i_val; if (kid >= IEEE80211_WEP_NKID && - (u_int16_t) kid != IEEE80211_KEYIX_NONE) + (uint16_t) kid != IEEE80211_KEYIX_NONE) return EINVAL; ic->ic_def_txkey = kid; break; @@ -2187,8 +2187,8 @@ break; case IEEE80211_IOC_DRIVER_CAPS: /* NB: for testing */ - ic->ic_caps = (((u_int16_t) ireq->i_val) << 16) | - ((u_int16_t) ireq->i_len); + ic->ic_caps = (((uint16_t) ireq->i_val) << 16) | + ((uint16_t) ireq->i_len); break; case IEEE80211_IOC_KEYMGTALGS: /* XXX check */ ==== //depot/projects/wifi/sys/net80211/ieee80211_ioctl.h#39 (text+ko) ==== @@ -45,158 +45,158 @@ * Per/node (station) statistics. */ struct ieee80211_nodestats { - u_int32_t ns_rx_data; /* rx data frames */ - u_int32_t ns_rx_mgmt; /* rx management frames */ - u_int32_t ns_rx_ctrl; /* rx control frames */ - u_int32_t ns_rx_ucast; /* rx unicast frames */ - u_int32_t ns_rx_mcast; /* rx multi/broadcast frames */ - u_int64_t ns_rx_bytes; /* rx data count (bytes) */ - u_int64_t ns_rx_beacons; /* rx beacon frames */ - u_int32_t ns_rx_proberesp; /* rx probe response frames */ + uint32_t ns_rx_data; /* rx data frames */ + uint32_t ns_rx_mgmt; /* rx management frames */ + uint32_t ns_rx_ctrl; /* rx control frames */ + uint32_t ns_rx_ucast; /* rx unicast frames */ + uint32_t ns_rx_mcast; /* rx multi/broadcast frames */ + uint64_t ns_rx_bytes; /* rx data count (bytes) */ + uint64_t ns_rx_beacons; /* rx beacon frames */ + uint32_t ns_rx_proberesp; /* rx probe response frames */ - u_int32_t ns_rx_dup; /* rx discard 'cuz dup */ - u_int32_t ns_rx_noprivacy; /* rx w/ wep but privacy off */ - u_int32_t ns_rx_wepfail; /* rx wep processing failed */ - u_int32_t ns_rx_demicfail; /* rx demic failed */ - u_int32_t ns_rx_decap; /* rx decapsulation failed */ - u_int32_t ns_rx_defrag; /* rx defragmentation failed */ - u_int32_t ns_rx_disassoc; /* rx disassociation */ - u_int32_t ns_rx_deauth; /* rx deauthentication */ - u_int32_t ns_rx_action; /* rx action */ - u_int32_t ns_rx_decryptcrc; /* rx decrypt failed on crc */ - u_int32_t ns_rx_unauth; /* rx on unauthorized port */ - u_int32_t ns_rx_unencrypted; /* rx unecrypted w/ privacy */ + uint32_t ns_rx_dup; /* rx discard 'cuz dup */ + uint32_t ns_rx_noprivacy; /* rx w/ wep but privacy off */ + uint32_t ns_rx_wepfail; /* rx wep processing failed */ + uint32_t ns_rx_demicfail; /* rx demic failed */ + uint32_t ns_rx_decap; /* rx decapsulation failed */ + uint32_t ns_rx_defrag; /* rx defragmentation failed */ + uint32_t ns_rx_disassoc; /* rx disassociation */ + uint32_t ns_rx_deauth; /* rx deauthentication */ + uint32_t ns_rx_action; /* rx action */ + uint32_t ns_rx_decryptcrc; /* rx decrypt failed on crc */ + uint32_t ns_rx_unauth; /* rx on unauthorized port */ + uint32_t ns_rx_unencrypted; /* rx unecrypted w/ privacy */ - u_int32_t ns_tx_data; /* tx data frames */ - u_int32_t ns_tx_mgmt; /* tx management frames */ - u_int32_t ns_tx_ucast; /* tx unicast frames */ - u_int32_t ns_tx_mcast; /* tx multi/broadcast frames */ - u_int64_t ns_tx_bytes; /* tx data count (bytes) */ - u_int32_t ns_tx_probereq; /* tx probe request frames */ + uint32_t ns_tx_data; /* tx data frames */ + uint32_t ns_tx_mgmt; /* tx management frames */ + uint32_t ns_tx_ucast; /* tx unicast frames */ + uint32_t ns_tx_mcast; /* tx multi/broadcast frames */ + uint64_t ns_tx_bytes; /* tx data count (bytes) */ + uint32_t ns_tx_probereq; /* tx probe request frames */ - u_int32_t ns_tx_novlantag; /* tx discard 'cuz no tag */ - u_int32_t ns_tx_vlanmismatch; /* tx discard 'cuz bad tag */ + uint32_t ns_tx_novlantag; /* tx discard 'cuz no tag */ + uint32_t ns_tx_vlanmismatch; /* tx discard 'cuz bad tag */ - u_int32_t ns_ps_discard; /* ps discard 'cuz of age */ + uint32_t ns_ps_discard; /* ps discard 'cuz of age */ /* MIB-related state */ - u_int32_t ns_tx_assoc; /* [re]associations */ - u_int32_t ns_tx_assoc_fail; /* [re]association failures */ - u_int32_t ns_tx_auth; /* [re]authentications */ - u_int32_t ns_tx_auth_fail; /* [re]authentication failures*/ - u_int32_t ns_tx_deauth; /* deauthentications */ - u_int32_t ns_tx_deauth_code; /* last deauth reason */ - u_int32_t ns_tx_disassoc; /* disassociations */ - u_int32_t ns_tx_disassoc_code; /* last disassociation reason */ + uint32_t ns_tx_assoc; /* [re]associations */ + uint32_t ns_tx_assoc_fail; /* [re]association failures */ + uint32_t ns_tx_auth; /* [re]authentications */ + uint32_t ns_tx_auth_fail; /* [re]authentication failures*/ + uint32_t ns_tx_deauth; /* deauthentications */ + uint32_t ns_tx_deauth_code; /* last deauth reason */ + uint32_t ns_tx_disassoc; /* disassociations */ + uint32_t ns_tx_disassoc_code; /* last disassociation reason */ }; /* * Summary statistics. */ struct ieee80211_stats { - u_int32_t is_rx_badversion; /* rx frame with bad version */ - u_int32_t is_rx_tooshort; /* rx frame too short */ - u_int32_t is_rx_wrongbss; /* rx from wrong bssid */ - u_int32_t is_rx_dup; /* rx discard 'cuz dup */ - u_int32_t is_rx_wrongdir; /* rx w/ wrong direction */ - u_int32_t is_rx_mcastecho; /* rx discard 'cuz mcast echo */ - u_int32_t is_rx_notassoc; /* rx discard 'cuz sta !assoc */ - u_int32_t is_rx_noprivacy; /* rx w/ wep but privacy off */ - u_int32_t is_rx_unencrypted; /* rx w/o wep and privacy on */ - u_int32_t is_rx_wepfail; /* rx wep processing failed */ - u_int32_t is_rx_decap; /* rx decapsulation failed */ - u_int32_t is_rx_mgtdiscard; /* rx discard mgt frames */ - u_int32_t is_rx_ctl; /* rx discard ctrl frames */ - u_int32_t is_rx_beacon; /* rx beacon frames */ - u_int32_t is_rx_rstoobig; /* rx rate set truncated */ - u_int32_t is_rx_elem_missing; /* rx required element missing*/ - u_int32_t is_rx_elem_toobig; /* rx element too big */ - u_int32_t is_rx_elem_toosmall; /* rx element too small */ - u_int32_t is_rx_elem_unknown; /* rx element unknown */ - u_int32_t is_rx_badchan; /* rx frame w/ invalid chan */ - u_int32_t is_rx_chanmismatch; /* rx frame chan mismatch */ - u_int32_t is_rx_nodealloc; /* rx frame dropped */ - u_int32_t is_rx_ssidmismatch; /* rx frame ssid mismatch */ - u_int32_t is_rx_auth_unsupported; /* rx w/ unsupported auth alg */ - u_int32_t is_rx_auth_fail; /* rx sta auth failure */ - u_int32_t is_rx_auth_countermeasures;/* rx auth discard 'cuz CM */ - u_int32_t is_rx_assoc_bss; /* rx assoc from wrong bssid */ - u_int32_t is_rx_assoc_notauth; /* rx assoc w/o auth */ - u_int32_t is_rx_assoc_capmismatch;/* rx assoc w/ cap mismatch */ - u_int32_t is_rx_assoc_norate; /* rx assoc w/ no rate match */ - u_int32_t is_rx_assoc_badwpaie; /* rx assoc w/ bad WPA IE */ - u_int32_t is_rx_deauth; /* rx deauthentication */ - u_int32_t is_rx_disassoc; /* rx disassociation */ - u_int32_t is_rx_badsubtype; /* rx frame w/ unknown subtype*/ - u_int32_t is_rx_nobuf; /* rx failed for lack of buf */ - u_int32_t is_rx_decryptcrc; /* rx decrypt failed on crc */ - u_int32_t is_rx_ahdemo_mgt; /* rx discard ahdemo mgt frame*/ - u_int32_t is_rx_bad_auth; /* rx bad auth request */ - u_int32_t is_rx_unauth; /* rx on unauthorized port */ - u_int32_t is_rx_badkeyid; /* rx w/ incorrect keyid */ - u_int32_t is_rx_ccmpreplay; /* rx seq# violation (CCMP) */ - u_int32_t is_rx_ccmpformat; /* rx format bad (CCMP) */ - u_int32_t is_rx_ccmpmic; /* rx MIC check failed (CCMP) */ - u_int32_t is_rx_tkipreplay; /* rx seq# violation (TKIP) */ - u_int32_t is_rx_tkipformat; /* rx format bad (TKIP) */ - u_int32_t is_rx_tkipmic; /* rx MIC check failed (TKIP) */ - u_int32_t is_rx_tkipicv; /* rx ICV check failed (TKIP) */ - u_int32_t is_rx_badcipher; /* rx failed 'cuz key type */ - u_int32_t is_rx_nocipherctx; /* rx failed 'cuz key !setup */ - u_int32_t is_rx_acl; /* rx discard 'cuz acl policy */ - u_int32_t is_tx_nobuf; /* tx failed for lack of buf */ - u_int32_t is_tx_nonode; /* tx failed for no node */ - u_int32_t is_tx_unknownmgt; /* tx of unknown mgt frame */ - u_int32_t is_tx_badcipher; /* tx failed 'cuz key type */ - u_int32_t is_tx_nodefkey; /* tx failed 'cuz no defkey */ - u_int32_t is_tx_noheadroom; /* tx failed 'cuz no space */ - u_int32_t is_tx_fragframes; /* tx frames fragmented */ - u_int32_t is_tx_frags; /* tx fragments created */ - u_int32_t is_scan_active; /* active scans started */ - u_int32_t is_scan_passive; /* passive scans started */ - u_int32_t is_node_timeout; /* nodes timed out inactivity */ - u_int32_t is_crypto_nomem; /* no memory for crypto ctx */ - u_int32_t is_crypto_tkip; /* tkip crypto done in s/w */ - u_int32_t is_crypto_tkipenmic; /* tkip en-MIC done in s/w */ - u_int32_t is_crypto_tkipdemic; /* tkip de-MIC done in s/w */ - u_int32_t is_crypto_tkipcm; /* tkip counter measures */ - u_int32_t is_crypto_ccmp; /* ccmp crypto done in s/w */ - u_int32_t is_crypto_wep; /* wep crypto done in s/w */ - u_int32_t is_crypto_setkey_cipher;/* cipher rejected key */ - u_int32_t is_crypto_setkey_nokey; /* no key index for setkey */ - u_int32_t is_crypto_delkey; /* driver key delete failed */ - u_int32_t is_crypto_badcipher; /* unknown cipher */ - u_int32_t is_crypto_nocipher; /* cipher not available */ - u_int32_t is_crypto_attachfail; /* cipher attach failed */ - u_int32_t is_crypto_swfallback; /* cipher fallback to s/w */ - u_int32_t is_crypto_keyfail; /* driver key alloc failed */ - u_int32_t is_crypto_enmicfail; /* en-MIC failed */ - u_int32_t is_ibss_capmismatch; /* merge failed-cap mismatch */ - u_int32_t is_ibss_norate; /* merge failed-rate mismatch */ - u_int32_t is_ps_unassoc; /* ps-poll for unassoc. sta */ - u_int32_t is_ps_badaid; /* ps-poll w/ incorrect aid */ - u_int32_t is_ps_qempty; /* ps-poll w/ nothing to send */ - u_int32_t is_ff_badhdr; /* fast frame rx'd w/ bad hdr */ - u_int32_t is_ff_tooshort; /* fast frame rx decap error */ - u_int32_t is_ff_split; /* fast frame rx split error */ - u_int32_t is_ff_decap; /* fast frames decap'd */ - u_int32_t is_ff_encap; /* fast frames encap'd for tx */ - u_int32_t is_rx_badbintval; /* rx frame w/ bogus bintval */ - u_int32_t is_rx_demicfail; /* rx demic failed */ - u_int32_t is_rx_defrag; /* rx defragmentation failed */ - u_int32_t is_rx_mgmt; /* rx management frames */ - u_int32_t is_rx_action; /* rx action mgt frames */ - u_int32_t is_amsdu_tooshort; /* A-MSDU rx decap error */ - u_int32_t is_amsdu_split; /* A-MSDU rx split error */ - u_int32_t is_amsdu_decap; /* A-MSDU decap'd */ - u_int32_t is_amsdu_encap; /* A-MSDU encap'd for tx */ - u_int32_t is_ampdu_bar_bad; /* A-MPDU BAR out of window */ - u_int32_t is_ampdu_bar_oow; /* A-MPDU BAR before ADDBA */ - u_int32_t is_ampdu_bar_rx; /* A-MPDU BAR frames handled */ - u_int32_t is_ampdu_rx_flush; /* A-MPDU frames flushed */ - u_int32_t is_ampdu_rx_oor; /* A-MPDU frames out-of-order */ - u_int32_t is_ampdu_rx_copy; /* A-MPDU frames copied down */ - u_int32_t is_spare[32]; + uint32_t is_rx_badversion; /* rx frame with bad version */ + uint32_t is_rx_tooshort; /* rx frame too short */ + uint32_t is_rx_wrongbss; /* rx from wrong bssid */ + uint32_t is_rx_dup; /* rx discard 'cuz dup */ + uint32_t is_rx_wrongdir; /* rx w/ wrong direction */ + uint32_t is_rx_mcastecho; /* rx discard 'cuz mcast echo */ + uint32_t is_rx_notassoc; /* rx discard 'cuz sta !assoc */ + uint32_t is_rx_noprivacy; /* rx w/ wep but privacy off */ + uint32_t is_rx_unencrypted; /* rx w/o wep and privacy on */ + uint32_t is_rx_wepfail; /* rx wep processing failed */ + uint32_t is_rx_decap; /* rx decapsulation failed */ + uint32_t is_rx_mgtdiscard; /* rx discard mgt frames */ + uint32_t is_rx_ctl; /* rx discard ctrl frames */ + uint32_t is_rx_beacon; /* rx beacon frames */ + uint32_t is_rx_rstoobig; /* rx rate set truncated */ + uint32_t is_rx_elem_missing; /* rx required element missing*/ + uint32_t is_rx_elem_toobig; /* rx element too big */ + uint32_t is_rx_elem_toosmall; /* rx element too small */ + uint32_t is_rx_elem_unknown; /* rx element unknown */ + uint32_t is_rx_badchan; /* rx frame w/ invalid chan */ + uint32_t is_rx_chanmismatch; /* rx frame chan mismatch */ + uint32_t is_rx_nodealloc; /* rx frame dropped */ + uint32_t is_rx_ssidmismatch; /* rx frame ssid mismatch */ + uint32_t is_rx_auth_unsupported; /* rx w/ unsupported auth alg */ + uint32_t is_rx_auth_fail; /* rx sta auth failure */ + uint32_t is_rx_auth_countermeasures;/* rx auth discard 'cuz CM */ + uint32_t is_rx_assoc_bss; /* rx assoc from wrong bssid */ + uint32_t is_rx_assoc_notauth; /* rx assoc w/o auth */ + uint32_t is_rx_assoc_capmismatch;/* rx assoc w/ cap mismatch */ + uint32_t is_rx_assoc_norate; /* rx assoc w/ no rate match */ + uint32_t is_rx_assoc_badwpaie; /* rx assoc w/ bad WPA IE */ + uint32_t is_rx_deauth; /* rx deauthentication */ + uint32_t is_rx_disassoc; /* rx disassociation */ + uint32_t is_rx_badsubtype; /* rx frame w/ unknown subtype*/ + uint32_t is_rx_nobuf; /* rx failed for lack of buf */ + uint32_t is_rx_decryptcrc; /* rx decrypt failed on crc */ + uint32_t is_rx_ahdemo_mgt; /* rx discard ahdemo mgt frame*/ + uint32_t is_rx_bad_auth; /* rx bad auth request */ + uint32_t is_rx_unauth; /* rx on unauthorized port */ + uint32_t is_rx_badkeyid; /* rx w/ incorrect keyid */ + uint32_t is_rx_ccmpreplay; /* rx seq# violation (CCMP) */ + uint32_t is_rx_ccmpformat; /* rx format bad (CCMP) */ + uint32_t is_rx_ccmpmic; /* rx MIC check failed (CCMP) */ + uint32_t is_rx_tkipreplay; /* rx seq# violation (TKIP) */ + uint32_t is_rx_tkipformat; /* rx format bad (TKIP) */ + uint32_t is_rx_tkipmic; /* rx MIC check failed (TKIP) */ + uint32_t is_rx_tkipicv; /* rx ICV check failed (TKIP) */ + uint32_t is_rx_badcipher; /* rx failed 'cuz key type */ + uint32_t is_rx_nocipherctx; /* rx failed 'cuz key !setup */ + uint32_t is_rx_acl; /* rx discard 'cuz acl policy */ + uint32_t is_tx_nobuf; /* tx failed for lack of buf */ + uint32_t is_tx_nonode; /* tx failed for no node */ + uint32_t is_tx_unknownmgt; /* tx of unknown mgt frame */ + uint32_t is_tx_badcipher; /* tx failed 'cuz key type */ + uint32_t is_tx_nodefkey; /* tx failed 'cuz no defkey */ + uint32_t is_tx_noheadroom; /* tx failed 'cuz no space */ + uint32_t is_tx_fragframes; /* tx frames fragmented */ + uint32_t is_tx_frags; /* tx fragments created */ + uint32_t is_scan_active; /* active scans started */ + uint32_t is_scan_passive; /* passive scans started */ + uint32_t is_node_timeout; /* nodes timed out inactivity */ + uint32_t is_crypto_nomem; /* no memory for crypto ctx */ + uint32_t is_crypto_tkip; /* tkip crypto done in s/w */ + uint32_t is_crypto_tkipenmic; /* tkip en-MIC done in s/w */ + uint32_t is_crypto_tkipdemic; /* tkip de-MIC done in s/w */ + uint32_t is_crypto_tkipcm; /* tkip counter measures */ + uint32_t is_crypto_ccmp; /* ccmp crypto done in s/w */ + uint32_t is_crypto_wep; /* wep crypto done in s/w */ + uint32_t is_crypto_setkey_cipher;/* cipher rejected key */ + uint32_t is_crypto_setkey_nokey; /* no key index for setkey */ + uint32_t is_crypto_delkey; /* driver key delete failed */ + uint32_t is_crypto_badcipher; /* unknown cipher */ + uint32_t is_crypto_nocipher; /* cipher not available */ + uint32_t is_crypto_attachfail; /* cipher attach failed */ + uint32_t is_crypto_swfallback; /* cipher fallback to s/w */ + uint32_t is_crypto_keyfail; /* driver key alloc failed */ + uint32_t is_crypto_enmicfail; /* en-MIC failed */ + uint32_t is_ibss_capmismatch; /* merge failed-cap mismatch */ + uint32_t is_ibss_norate; /* merge failed-rate mismatch */ + uint32_t is_ps_unassoc; /* ps-poll for unassoc. sta */ + uint32_t is_ps_badaid; /* ps-poll w/ incorrect aid */ + uint32_t is_ps_qempty; /* ps-poll w/ nothing to send */ + uint32_t is_ff_badhdr; /* fast frame rx'd w/ bad hdr */ + uint32_t is_ff_tooshort; /* fast frame rx decap error */ + uint32_t is_ff_split; /* fast frame rx split error */ + uint32_t is_ff_decap; /* fast frames decap'd */ + uint32_t is_ff_encap; /* fast frames encap'd for tx */ + uint32_t is_rx_badbintval; /* rx frame w/ bogus bintval */ + uint32_t is_rx_demicfail; /* rx demic failed */ + uint32_t is_rx_defrag; /* rx defragmentation failed */ + uint32_t is_rx_mgmt; /* rx management frames */ + uint32_t is_rx_action; /* rx action mgt frames */ + uint32_t is_amsdu_tooshort; /* A-MSDU rx decap error */ + uint32_t is_amsdu_split; /* A-MSDU rx split error */ + uint32_t is_amsdu_decap; /* A-MSDU decap'd */ + uint32_t is_amsdu_encap; /* A-MSDU encap'd for tx */ + uint32_t is_ampdu_bar_bad; /* A-MPDU BAR out of window */ + uint32_t is_ampdu_bar_oow; /* A-MPDU BAR before ADDBA */ + uint32_t is_ampdu_bar_rx; /* A-MPDU BAR frames handled */ + uint32_t is_ampdu_rx_flush; /* A-MPDU frames flushed */ + uint32_t is_ampdu_rx_oor; /* A-MPDU frames out-of-order */ + uint32_t is_ampdu_rx_copy; /* A-MPDU frames copied down */ + uint32_t is_spare[32]; }; /* @@ -217,17 +217,17 @@ more than IEEE80211_KEYBUF_SIZE. */ struct ieee80211req_key { - u_int8_t ik_type; /* key/cipher type */ - u_int8_t ik_pad; - u_int16_t ik_keyix; /* key index */ - u_int8_t ik_keylen; /* key length in bytes */ - u_int8_t ik_flags; + uint8_t ik_type; /* key/cipher type */ + uint8_t ik_pad; + uint16_t ik_keyix; /* key index */ + uint8_t ik_keylen; /* key length in bytes */ + uint8_t ik_flags; /* NB: IEEE80211_KEY_XMIT and IEEE80211_KEY_RECV defined elsewhere */ #define IEEE80211_KEY_DEFAULT 0x80 /* default xmit key */ - u_int8_t ik_macaddr[IEEE80211_ADDR_LEN]; - u_int64_t ik_keyrsc; /* key receive sequence counter */ - u_int64_t ik_keytsc; /* key transmit sequence counter */ - u_int8_t ik_keydata[IEEE80211_KEYBUF_SIZE+IEEE80211_MICBUF_SIZE]; + uint8_t ik_macaddr[IEEE80211_ADDR_LEN]; + uint64_t ik_keyrsc; /* key receive sequence counter */ + uint64_t ik_keytsc; /* key transmit sequence counter */ + uint8_t ik_keydata[IEEE80211_KEYBUF_SIZE+IEEE80211_MICBUF_SIZE]; }; /* @@ -235,8 +235,8 @@ * to IEEE80211_KEYIX_NONE when deleting a unicast key. */ struct ieee80211req_del_key { - u_int8_t idk_keyix; /* key index */ - u_int8_t idk_macaddr[IEEE80211_ADDR_LEN]; + uint8_t idk_keyix; /* key index */ + uint8_t idk_macaddr[IEEE80211_ADDR_LEN]; }; /* @@ -246,16 +246,16 @@ * ap (to effect a station). */ struct ieee80211req_mlme { - u_int8_t im_op; /* operation to perform */ + uint8_t im_op; /* operation to perform */ #define IEEE80211_MLME_ASSOC 1 /* associate station */ #define IEEE80211_MLME_DISASSOC 2 /* disassociate station */ #define IEEE80211_MLME_DEAUTH 3 /* deauthenticate station */ #define IEEE80211_MLME_AUTHORIZE 4 /* authorize station */ #define IEEE80211_MLME_UNAUTHORIZE 5 /* unauthorize station */ - u_int8_t im_ssid_len; /* length of optional ssid */ - u_int16_t im_reason; /* 802.11 reason code */ - u_int8_t im_macaddr[IEEE80211_ADDR_LEN]; - u_int8_t im_ssid[IEEE80211_NWID_LEN]; + uint8_t im_ssid_len; /* length of optional ssid */ + uint16_t im_reason; /* 802.11 reason code */ + uint8_t im_macaddr[IEEE80211_ADDR_LEN]; + uint8_t im_ssid[IEEE80211_NWID_LEN]; }; /* @@ -272,7 +272,7 @@ }; struct ieee80211req_maclist { - u_int8_t ml_macaddr[IEEE80211_ADDR_LEN]; + uint8_t ml_macaddr[IEEE80211_ADDR_LEN]; }; /* @@ -282,7 +282,7 @@ * scanning. */ struct ieee80211req_chanlist { - u_int8_t ic_channels[IEEE80211_CHAN_BYTES]; + uint8_t ic_channels[IEEE80211_CHAN_BYTES]; }; /* @@ -297,13 +297,13 @@ * Retrieve the WPA/RSN information element for an associated station. */ struct ieee80211req_wpaie { /* old version w/ only one ie */ - u_int8_t wpa_macaddr[IEEE80211_ADDR_LEN]; - u_int8_t wpa_ie[IEEE80211_MAX_OPT_IE]; + uint8_t wpa_macaddr[IEEE80211_ADDR_LEN]; + uint8_t wpa_ie[IEEE80211_MAX_OPT_IE]; }; struct ieee80211req_wpaie2 { - u_int8_t wpa_macaddr[IEEE80211_ADDR_LEN]; - u_int8_t wpa_ie[IEEE80211_MAX_OPT_IE]; - u_int8_t rsn_ie[IEEE80211_MAX_OPT_IE]; + uint8_t wpa_macaddr[IEEE80211_ADDR_LEN]; + uint8_t wpa_ie[IEEE80211_MAX_OPT_IE]; + uint8_t rsn_ie[IEEE80211_MAX_OPT_IE]; }; /* @@ -312,8 +312,8 @@ struct ieee80211req_sta_stats { union { /* NB: explicitly force 64-bit alignment */ - u_int8_t macaddr[IEEE80211_ADDR_LEN]; - u_int64_t pad; + uint8_t macaddr[IEEE80211_ADDR_LEN]; + uint64_t pad; } is_u; struct ieee80211_nodestats is_stats; }; @@ -323,27 +323,27 @@ * to retrieve other data like stats, unicast key, etc. */ struct ieee80211req_sta_info { - u_int16_t isi_len; /* length (mult of 4) */ - u_int16_t isi_freq; /* MHz */ - u_int16_t isi_flags; /* channel flags */ - u_int16_t isi_state; /* state flags */ - u_int8_t isi_authmode; /* authentication algorithm */ + uint16_t isi_len; /* length (mult of 4) */ + uint16_t isi_freq; /* MHz */ + uint16_t isi_flags; /* channel flags */ + uint16_t isi_state; /* state flags */ + uint8_t isi_authmode; /* authentication algorithm */ int8_t isi_rssi; /* receive signal strength */ int8_t isi_noise; /* noise floor */ - u_int8_t isi_capinfo; /* capabilities */ - u_int8_t isi_erp; /* ERP element */ - u_int8_t isi_macaddr[IEEE80211_ADDR_LEN]; - u_int8_t isi_nrates; + uint8_t isi_capinfo; /* capabilities */ + uint8_t isi_erp; /* ERP element */ + uint8_t isi_macaddr[IEEE80211_ADDR_LEN]; + uint8_t isi_nrates; /* negotiated rates */ - u_int8_t isi_rates[IEEE80211_RATE_MAXSIZE]; - u_int8_t isi_txrate; /* index to isi_rates[] */ - u_int16_t isi_ie_len; /* IE length */ - u_int16_t isi_associd; /* assoc response */ - u_int16_t isi_txpower; /* current tx power */ - u_int16_t isi_vlan; /* vlan tag */ - u_int16_t isi_txseqs[17]; /* seq to be transmitted */ - u_int16_t isi_rxseqs[17]; /* seq previous for qos frames*/ - u_int16_t isi_inact; /* inactivity timer */ + uint8_t isi_rates[IEEE80211_RATE_MAXSIZE]; + uint8_t isi_txrate; /* index to isi_rates[] */ + uint16_t isi_ie_len; /* IE length */ + uint16_t isi_associd; /* assoc response */ + uint16_t isi_txpower; /* current tx power */ + uint16_t isi_vlan; /* vlan tag */ + uint16_t isi_txseqs[17]; /* seq to be transmitted */ + uint16_t isi_rxseqs[17]; /* seq previous for qos frames*/ + uint16_t isi_inact; /* inactivity timer */ /* XXX frag state? */ /* variable length IE data */ }; @@ -355,8 +355,8 @@ struct ieee80211req_sta_req { union { /* NB: explicitly force 64-bit alignment */ - u_int8_t macaddr[IEEE80211_ADDR_LEN]; - u_int64_t pad; + uint8_t macaddr[IEEE80211_ADDR_LEN]; + uint64_t pad; } is_u; struct ieee80211req_sta_info info[1]; /* variable length */ }; @@ -365,8 +365,8 @@ * Get/set per-station tx power cap. */ struct ieee80211req_sta_txpow { - u_int8_t it_macaddr[IEEE80211_ADDR_LEN]; - u_int8_t it_txpow; + uint8_t it_macaddr[IEEE80211_ADDR_LEN]; + uint8_t it_txpow; }; /* @@ -386,7 +386,7 @@ /* the first member must be matched with struct ifreq */ struct ieee80211req { char i_name[IFNAMSIZ]; /* if_name, e.g. "wi0" */ - u_int16_t i_type; /* req type */ + uint16_t i_type; /* req type */ int16_t i_val; /* Index or simple value */ int16_t i_len; /* Index or simple value */ void *i_data; /* Extra data */ @@ -506,20 +506,20 @@ * in isr_len. Result records are rounded to a multiple of 4 bytes. */ struct ieee80211req_scan_result { - u_int16_t isr_len; /* length (mult of 4) */ - u_int16_t isr_ie_len; /* IE length */ - u_int16_t isr_freq; /* MHz */ - u_int16_t isr_flags; /* channel flags */ + uint16_t isr_len; /* length (mult of 4) */ + uint16_t isr_ie_len; /* IE length */ + uint16_t isr_freq; /* MHz */ + uint16_t isr_flags; /* channel flags */ int8_t isr_noise; int8_t isr_rssi; - u_int8_t isr_intval; /* beacon interval */ - u_int8_t isr_capinfo; /* capabilities */ - u_int8_t isr_erp; /* ERP element */ - u_int8_t isr_bssid[IEEE80211_ADDR_LEN]; - u_int8_t isr_nrates; - u_int8_t isr_rates[IEEE80211_RATE_MAXSIZE]; - u_int8_t isr_ssid_len; /* SSID length */ - u_int8_t isr_pad[8]; + uint8_t isr_intval; /* beacon interval */ + uint8_t isr_capinfo; /* capabilities */ + uint8_t isr_erp; /* ERP element */ + uint8_t isr_bssid[IEEE80211_ADDR_LEN]; + uint8_t isr_nrates; + uint8_t isr_rates[IEEE80211_RATE_MAXSIZE]; + uint8_t isr_ssid_len; /* SSID length */ + uint8_t isr_pad[8]; /* variable length SSID followed by IE data */ }; From owner-p4-projects@FreeBSD.ORG Sun May 13 04:56:22 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D0F9316A404; Sun, 13 May 2007 04:56:21 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 300EF16A400 for ; Sun, 13 May 2007 04:56:21 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1FBE713C43E for ; Sun, 13 May 2007 04:56:21 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4D4uLiF049143 for ; Sun, 13 May 2007 04:56:21 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4D4uK9J049140 for perforce@freebsd.org; Sun, 13 May 2007 04:56:20 GMT (envelope-from sephe@FreeBSD.org) Date: Sun, 13 May 2007 04:56:20 GMT Message-Id: <200705130456.l4D4uK9J049140@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 119751 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, 13 May 2007 04:56:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=119751 Change 119751 by sephe@sephe_zealot:sam_wifi on 2007/05/13 04:55:54 u_intX_t -> uintX_t Approved by: sam Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_node.c#93 edit .. //depot/projects/wifi/sys/net80211/ieee80211_node.h#45 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_node.c#93 (text+ko) ==== @@ -74,7 +74,7 @@ static void node_getsignal(const struct ieee80211_node *, int8_t *, int8_t *); static void ieee80211_setup_node(struct ieee80211_node_table *, - struct ieee80211_node *, const u_int8_t *); + struct ieee80211_node *, const uint8_t *); static void _ieee80211_free_node(struct ieee80211_node *); static void ieee80211_node_table_init(struct ieee80211com *ic, @@ -114,8 +114,8 @@ if (ic->ic_max_aid > IEEE80211_AID_MAX) ic->ic_max_aid = IEEE80211_AID_MAX; - MALLOC(ic->ic_aid_bitmap, u_int32_t *, - howmany(ic->ic_max_aid, 32) * sizeof(u_int32_t), + MALLOC(ic->ic_aid_bitmap, uint32_t *, + howmany(ic->ic_max_aid, 32) * sizeof(uint32_t), M_80211_NODE, M_NOWAIT | M_ZERO); if (ic->ic_aid_bitmap == NULL) { /* XXX no way to recover */ @@ -398,7 +398,7 @@ static int check_bss(struct ieee80211com *ic, struct ieee80211_node *ni) { - u_int8_t rate; + uint8_t rate; if (isclr(ic->ic_chan_active, ieee80211_chan2ieee(ic, ni->ni_chan))) return 0; @@ -437,7 +437,7 @@ static void check_bss_debug(struct ieee80211com *ic, struct ieee80211_node *ni) { - u_int8_t rate; + uint8_t rate; int fail; fail = 0; @@ -787,7 +787,7 @@ static void ieee80211_setup_node(struct ieee80211_node_table *nt, - struct ieee80211_node *ni, const u_int8_t *macaddr) + struct ieee80211_node *ni, const uint8_t *macaddr) { struct ieee80211com *ic = nt->nt_ic; int hash; @@ -817,7 +817,7 @@ } struct ieee80211_node * -ieee80211_alloc_node(struct ieee80211_node_table *nt, const u_int8_t *macaddr) +ieee80211_alloc_node(struct ieee80211_node_table *nt, const uint8_t *macaddr) { struct ieee80211com *ic = nt->nt_ic; struct ieee80211_node *ni; @@ -837,7 +837,7 @@ * once the send completes. */ struct ieee80211_node * -ieee80211_tmp_node(struct ieee80211com *ic, const u_int8_t *macaddr) +ieee80211_tmp_node(struct ieee80211com *ic, const uint8_t *macaddr) { struct ieee80211_node *ni; @@ -867,7 +867,7 @@ } struct ieee80211_node * -ieee80211_dup_bss(struct ieee80211_node_table *nt, const u_int8_t *macaddr) +ieee80211_dup_bss(struct ieee80211_node_table *nt, const uint8_t *macaddr) { struct ieee80211com *ic = nt->nt_ic; struct ieee80211_node *ni; @@ -892,10 +892,10 @@ static struct ieee80211_node * #ifdef IEEE80211_DEBUG_REFCNT _ieee80211_find_node_debug(struct ieee80211_node_table *nt, - const u_int8_t *macaddr, const char *func, int line) + const uint8_t *macaddr, const char *func, int line) #else _ieee80211_find_node(struct ieee80211_node_table *nt, - const u_int8_t *macaddr) + const uint8_t *macaddr) #endif { struct ieee80211_node *ni; @@ -927,9 +927,9 @@ struct ieee80211_node * #ifdef IEEE80211_DEBUG_REFCNT ieee80211_find_node_debug(struct ieee80211_node_table *nt, - const u_int8_t *macaddr, const char *func, int line) + const uint8_t *macaddr, const char *func, int line) #else -ieee80211_find_node(struct ieee80211_node_table *nt, const u_int8_t *macaddr) +ieee80211_find_node(struct ieee80211_node_table *nt, const uint8_t *macaddr) #endif { struct ieee80211_node *ni; @@ -948,7 +948,7 @@ */ struct ieee80211_node * ieee80211_fakeup_adhoc_node(struct ieee80211_node_table *nt, - const u_int8_t macaddr[IEEE80211_ADDR_LEN]) + const uint8_t macaddr[IEEE80211_ADDR_LEN]) { struct ieee80211com *ic = nt->nt_ic; struct ieee80211_node *ni; @@ -1145,10 +1145,10 @@ */ struct ieee80211_node * #ifdef IEEE80211_DEBUG_REFCNT -ieee80211_find_txnode_debug(struct ieee80211com *ic, const u_int8_t *macaddr, +ieee80211_find_txnode_debug(struct ieee80211com *ic, const uint8_t *macaddr, const char *func, int line) #else -ieee80211_find_txnode(struct ieee80211com *ic, const u_int8_t *macaddr) +ieee80211_find_txnode(struct ieee80211com *ic, const uint8_t *macaddr) #endif { struct ieee80211_node_table *nt = &ic->ic_sta; @@ -1206,16 +1206,16 @@ struct ieee80211_node * #ifdef IEEE80211_DEBUG_REFCNT ieee80211_find_node_with_ssid_debug(struct ieee80211_node_table *nt, - const u_int8_t *macaddr, u_int ssidlen, const u_int8_t *ssid, + const uint8_t *macaddr, u_int ssidlen, const uint8_t *ssid, const char *func, int line) #else ieee80211_find_node_with_ssid(struct ieee80211_node_table *nt, - const u_int8_t *macaddr, u_int ssidlen, const u_int8_t *ssid) + const uint8_t *macaddr, u_int ssidlen, const uint8_t *ssid) #endif { #define MATCH_SSID(ni, ssid, ssidlen) \ (ni->ni_esslen == ssidlen && memcmp(ni->ni_essid, ssid, ssidlen) == 0) - static const u_int8_t zeromac[IEEE80211_ADDR_LEN]; + static const uint8_t zeromac[IEEE80211_ADDR_LEN]; struct ieee80211_node *ni; int hash; @@ -1702,7 +1702,7 @@ int newassoc; if (ni->ni_associd == 0) { - u_int16_t aid; + uint16_t aid; /* * It would be good to search the bitmap ==== //depot/projects/wifi/sys/net80211/ieee80211_node.h#45 (text+ko) ==== @@ -64,18 +64,18 @@ #define IEEE80211_NODE_HASHSIZE 32 /* simple hash is enough for variation of macaddr */ #define IEEE80211_NODE_HASH(addr) \ - (((const u_int8_t *)(addr))[IEEE80211_ADDR_LEN - 1] % \ + (((const uint8_t *)(addr))[IEEE80211_ADDR_LEN - 1] % \ IEEE80211_NODE_HASHSIZE) struct ieee80211_rsnparms { - u_int8_t rsn_mcastcipher; /* mcast/group cipher */ - u_int8_t rsn_mcastkeylen; /* mcast key length */ - u_int8_t rsn_ucastcipherset; /* unicast cipher set */ - u_int8_t rsn_ucastcipher; /* selected unicast cipher */ - u_int8_t rsn_ucastkeylen; /* unicast key length */ - u_int8_t rsn_keymgmtset; /* key mangement algorithms */ - u_int8_t rsn_keymgmt; /* selected key mgmt algo */ - u_int16_t rsn_caps; /* capabilities */ + uint8_t rsn_mcastcipher; /* mcast/group cipher */ + uint8_t rsn_mcastkeylen; /* mcast key length */ + uint8_t rsn_ucastcipherset; /* unicast cipher set */ + uint8_t rsn_ucastcipher; /* selected unicast cipher */ + uint8_t rsn_ucastkeylen; /* unicast key length */ + uint8_t rsn_keymgmtset; /* key mangement algorithms */ + uint8_t rsn_keymgmt; /* selected key mgmt algo */ + uint16_t rsn_caps; /* capabilities */ }; struct ieee80211_node_table; @@ -94,8 +94,8 @@ LIST_ENTRY(ieee80211_node) ni_hash; u_int ni_refcnt; u_int ni_scangen; /* gen# for timeout scan */ - u_int8_t ni_authmode; /* authentication algorithm */ - u_int8_t ni_ath_flags; /* Atheros feature flags */ + uint8_t ni_authmode; /* authentication algorithm */ + uint8_t ni_ath_flags; /* Atheros feature flags */ /* NB: These must have the same values as IEEE80211_ATHC_* */ #define IEEE80211_NODE_TURBOP 0x0001 /* Turbo prime enable */ #define IEEE80211_NODE_COMP 0x0002 /* Compresssion enable */ @@ -105,7 +105,7 @@ #define IEEE80211_NODE_BOOST 0x0080 #define IEEE80211_NODE_PSUPDATE 0x0200 /* power save state changed */ #define IEEE80211_NODE_CHWUPDATE 0x0400 /* 11n channel width change */ - u_int16_t ni_flags; /* special-purpose state */ + uint16_t ni_flags; /* special-purpose state */ #define IEEE80211_NODE_AUTH 0x0001 /* authorized for data */ #define IEEE80211_NODE_QOS 0x0002 /* QoS enabled */ #define IEEE80211_NODE_ERP 0x0004 /* ERP enabled */ @@ -114,59 +114,59 @@ #define IEEE80211_NODE_AREF 0x0020 /* authentication ref held */ #define IEEE80211_NODE_HT 0x0040 /* HT enabled */ #define IEEE80211_NODE_HTCOMPAT 0x0080 /* HT setup w/ vendor OUI's */ - u_int16_t ni_ath_defkeyix;/* Atheros def key index */ - u_int16_t ni_associd; /* assoc response */ - u_int16_t ni_txpower; /* current transmit power */ - u_int16_t ni_vlan; /* vlan tag */ - u_int32_t *ni_challenge; /* shared-key challenge */ - u_int8_t *ni_wpa_ie; /* captured WPA ie */ - u_int8_t *ni_rsn_ie; /* captured RSN ie */ - u_int8_t *ni_wme_ie; /* captured WME ie */ - u_int8_t *ni_ath_ie; /* captured Atheros ie */ + uint16_t ni_ath_defkeyix;/* Atheros def key index */ + uint16_t ni_associd; /* assoc response */ + uint16_t ni_txpower; /* current transmit power */ + uint16_t ni_vlan; /* vlan tag */ + uint32_t *ni_challenge; /* shared-key challenge */ + uint8_t *ni_wpa_ie; /* captured WPA ie */ + uint8_t *ni_rsn_ie; /* captured RSN ie */ + uint8_t *ni_wme_ie; /* captured WME ie */ + uint8_t *ni_ath_ie; /* captured Atheros ie */ #define IEEE80211_NONQOS_TID 16 /* index for non-QoS sta */ - u_int16_t ni_txseqs[17]; /* tx seq per-tid */ - u_int16_t ni_rxseqs[17]; /* rx seq previous per-tid*/ - u_int32_t ni_rxfragstamp; /* time stamp of last rx frag */ + uint16_t ni_txseqs[17]; /* tx seq per-tid */ + uint16_t ni_rxseqs[17]; /* rx seq previous per-tid*/ + uint32_t ni_rxfragstamp; /* time stamp of last rx frag */ struct mbuf *ni_rxfrag[3]; /* rx frag reassembly */ struct ieee80211_rsnparms ni_rsn; /* RSN/WPA parameters */ struct ieee80211_key ni_ucastkey; /* unicast key */ /* hardware */ - u_int32_t ni_rstamp; /* recv timestamp */ + uint32_t ni_rstamp; /* recv timestamp */ int8_t ni_rssi; /* recv ssi */ int8_t ni_noise; /* noise floor */ /* header */ - u_int8_t ni_macaddr[IEEE80211_ADDR_LEN]; - u_int8_t ni_bssid[IEEE80211_ADDR_LEN]; + uint8_t ni_macaddr[IEEE80211_ADDR_LEN]; + uint8_t ni_bssid[IEEE80211_ADDR_LEN]; /* beacon, probe response */ union { - u_int8_t data[8]; - u_int64_t tsf; + uint8_t data[8]; + uint64_t tsf; } ni_tstamp; /* from last rcv'd beacon */ - u_int16_t ni_intval; /* beacon interval */ - u_int16_t ni_capinfo; /* capabilities */ - u_int8_t ni_esslen; - u_int8_t ni_essid[IEEE80211_NWID_LEN]; + uint16_t ni_intval; /* beacon interval */ + uint16_t ni_capinfo; /* capabilities */ + uint8_t ni_esslen; + uint8_t ni_essid[IEEE80211_NWID_LEN]; struct ieee80211_rateset ni_rates; /* negotiated rate set */ struct ieee80211_channel *ni_chan; - u_int16_t ni_fhdwell; /* FH only */ - u_int8_t ni_fhindex; /* FH only */ - u_int8_t ni_erp; /* ERP from beacon/probe resp */ - u_int16_t ni_timoff; /* byte offset to TIM ie */ - u_int8_t ni_dtim_period; /* DTIM period */ - u_int8_t ni_dtim_count; /* DTIM count for last bcn */ + uint16_t ni_fhdwell; /* FH only */ + uint8_t ni_fhindex; /* FH only */ + uint8_t ni_erp; /* ERP from beacon/probe resp */ + uint16_t ni_timoff; /* byte offset to TIM ie */ + uint8_t ni_dtim_period; /* DTIM period */ + uint8_t ni_dtim_count; /* DTIM count for last bcn */ /* 11n state */ - u_int16_t ni_htcap; /* HT capabilities */ - u_int8_t ni_htparam; /* HT params */ - u_int8_t ni_htctlchan; /* HT control channel */ - u_int8_t ni_ht2ndchan; /* HT 2nd channel */ - u_int8_t ni_htopmode; /* HT operating mode */ - u_int8_t ni_htstbc; /* HT */ - u_int8_t ni_reqcw; /* requested tx channel width */ - u_int8_t ni_chw; /* negotiated channel width */ + uint16_t ni_htcap; /* HT capabilities */ + uint8_t ni_htparam; /* HT params */ + uint8_t ni_htctlchan; /* HT control channel */ + uint8_t ni_ht2ndchan; /* HT 2nd channel */ + uint8_t ni_htopmode; /* HT operating mode */ + uint8_t ni_htstbc; /* HT */ + uint8_t ni_reqcw; /* requested tx channel width */ + uint8_t ni_chw; /* negotiated channel width */ struct ieee80211_htrateset ni_htrates; /* negotiated ht rate set */ struct ieee80211_tx_ampdu ni_tx_ampdu[WME_NUM_AC]; struct ieee80211_rx_ampdu ni_rx_ampdu[WME_NUM_TID]; @@ -247,34 +247,34 @@ }; struct ieee80211_node *ieee80211_alloc_node( - struct ieee80211_node_table *, const u_int8_t *); + struct ieee80211_node_table *, const uint8_t *); struct ieee80211_node *ieee80211_tmp_node(struct ieee80211com *, - const u_int8_t *macaddr); + const uint8_t *macaddr); struct ieee80211_node *ieee80211_dup_bss(struct ieee80211_node_table *, - const u_int8_t *); + const uint8_t *); #ifdef IEEE80211_DEBUG_REFCNT void ieee80211_free_node_debug(struct ieee80211_node *, const char *func, int line); struct ieee80211_node *ieee80211_find_node_debug(struct ieee80211_node_table *, - const u_int8_t *, + const uint8_t *, const char *func, int line); struct ieee80211_node * ieee80211_find_rxnode_debug(struct ieee80211com *, const struct ieee80211_frame_min *, const char *func, int line); struct ieee80211_node * ieee80211_find_rxnode_withkey_debug( struct ieee80211com *, - const struct ieee80211_frame_min *, u_int16_t keyix, + const struct ieee80211_frame_min *, uint16_t keyix, const char *func, int line); struct ieee80211_node * ieee80211_find_rxnode_withkey_debug( struct ieee80211com *, - const struct ieee80211_frame_min *, u_int16_t keyix, + const struct ieee80211_frame_min *, uint16_t keyix, const char *func, int line); struct ieee80211_node *ieee80211_find_txnode_debug(struct ieee80211com *, - const u_int8_t *, + const uint8_t *, const char *func, int line); struct ieee80211_node *ieee80211_find_node_with_ssid_debug( - struct ieee80211_node_table *, const u_int8_t *macaddr, - u_int ssidlen, const u_int8_t *ssid, + struct ieee80211_node_table *, const uint8_t *macaddr, + u_int ssidlen, const uint8_t *ssid, const char *func, int line); #define ieee80211_free_node(ni) \ ieee80211_free_node_debug(ni, __func__, __LINE__) @@ -291,16 +291,16 @@ #else void ieee80211_free_node(struct ieee80211_node *); struct ieee80211_node *ieee80211_find_node(struct ieee80211_node_table *, - const u_int8_t *); + const uint8_t *); struct ieee80211_node * ieee80211_find_rxnode(struct ieee80211com *, const struct ieee80211_frame_min *); struct ieee80211_node * ieee80211_find_rxnode_withkey(struct ieee80211com *, - const struct ieee80211_frame_min *, u_int16_t keyix); + const struct ieee80211_frame_min *, uint16_t keyix); struct ieee80211_node *ieee80211_find_txnode(struct ieee80211com *, - const u_int8_t *); + const uint8_t *); struct ieee80211_node *ieee80211_find_node_with_ssid( - struct ieee80211_node_table *, const u_int8_t *macaddr, - u_int ssidlen, const u_int8_t *ssid); + struct ieee80211_node_table *, const uint8_t *macaddr, + u_int ssidlen, const uint8_t *ssid); #endif int ieee80211_node_delucastkey(struct ieee80211_node *); void ieee80211_node_timeout(void *arg); @@ -314,7 +314,7 @@ void ieee80211_dump_nodes(struct ieee80211_node_table *); struct ieee80211_node *ieee80211_fakeup_adhoc_node( - struct ieee80211_node_table *, const u_int8_t macaddr[]); + struct ieee80211_node_table *, const uint8_t macaddr[]); struct ieee80211_scanparams; void ieee80211_init_neighbor(struct ieee80211_node *, const struct ieee80211_frame *, From owner-p4-projects@FreeBSD.ORG Sun May 13 05:03:30 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8FADB16A409; Sun, 13 May 2007 05:03:30 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4394816A405 for ; Sun, 13 May 2007 05:03:30 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3259513C45A for ; Sun, 13 May 2007 05:03:30 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4D53UYB051541 for ; Sun, 13 May 2007 05:03:30 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4D53U9V051538 for perforce@freebsd.org; Sun, 13 May 2007 05:03:30 GMT (envelope-from sephe@FreeBSD.org) Date: Sun, 13 May 2007 05:03:30 GMT Message-Id: <200705130503.l4D53U9V051538@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 119752 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, 13 May 2007 05:03:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=119752 Change 119752 by sephe@sephe_zealot:sam_wifi on 2007/05/13 05:02:36 u_intX_t -> uintX_t Approved by: sam Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_output.c#74 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_output.c#74 (text+ko) ==== @@ -99,9 +99,9 @@ struct ieee80211_node *ni, struct ieee80211_frame *wh, int type, - const u_int8_t sa[IEEE80211_ADDR_LEN], - const u_int8_t da[IEEE80211_ADDR_LEN], - const u_int8_t bssid[IEEE80211_ADDR_LEN]) + const uint8_t sa[IEEE80211_ADDR_LEN], + const uint8_t da[IEEE80211_ADDR_LEN], + const uint8_t bssid[IEEE80211_ADDR_LEN]) { #define WH4(wh) ((struct ieee80211_frame_addr4 *)wh) @@ -144,9 +144,9 @@ IEEE80211_ADDR_COPY(wh->i_addr2, sa); IEEE80211_ADDR_COPY(wh->i_addr3, bssid); } - *(u_int16_t *)&wh->i_dur[0] = 0; + *(uint16_t *)&wh->i_dur[0] = 0; /* NB: use non-QoS tid */ - *(u_int16_t *)&wh->i_seq[0] = + *(uint16_t *)&wh->i_seq[0] = htole16(ni->ni_txseqs[IEEE80211_NONQOS_TID] << IEEE80211_SEQ_SEQ_SHIFT); ni->ni_txseqs[IEEE80211_NONQOS_TID]++; #undef WH4 @@ -450,7 +450,7 @@ eh = mtod(m, struct ether_header *); if (eh->ether_type == htons(ETHERTYPE_IP)) { const struct ip *ip = (struct ip *) - (mtod(m, u_int8_t *) + sizeof (*eh)); + (mtod(m, uint8_t *) + sizeof (*eh)); /* * IP frame, map the TOS field. */ @@ -687,7 +687,7 @@ else hdrsize = sizeof(struct ieee80211_frame); if (ic->ic_flags & IEEE80211_F_DATAPAD) - hdrsize = roundup(hdrsize, sizeof(u_int32_t)); + hdrsize = roundup(hdrsize, sizeof(uint32_t)); if ((isff = m->m_flags & M_FF) != 0) { struct mbuf *m2; @@ -712,7 +712,7 @@ * ieee80211_encap_fastframe will do. */ m = ieee80211_mbuf_adjust(ic, - hdrsize + sizeof(struct llc) + sizeof(u_int32_t) + 2 + + hdrsize + sizeof(struct llc) + sizeof(uint32_t) + 2 + sizeof(struct ether_header), key, m); if (m == NULL) { @@ -766,7 +766,7 @@ } wh = mtod(m, struct ieee80211_frame *); wh->i_fc[0] = IEEE80211_FC0_VERSION_0 | IEEE80211_FC0_TYPE_DATA; - *(u_int16_t *)wh->i_dur = 0; + *(uint16_t *)wh->i_dur = 0; switch (ic->ic_opmode) { case IEEE80211_M_STA: wh->i_fc[1] = IEEE80211_FC1_DIR_TODS; @@ -840,11 +840,11 @@ qwh->i_qos[1] = 0; qwh->i_fc[0] |= IEEE80211_FC0_SUBTYPE_QOS; - *(u_int16_t *)wh->i_seq = + *(uint16_t *)wh->i_seq = htole16(ni->ni_txseqs[tid] << IEEE80211_SEQ_SEQ_SHIFT); ni->ni_txseqs[tid]++; } else { - *(u_int16_t *)wh->i_seq = + *(uint16_t *)wh->i_seq = htole16(ni->ni_txseqs[IEEE80211_NONQOS_TID] << IEEE80211_SEQ_SEQ_SHIFT); ni->ni_txseqs[IEEE80211_NONQOS_TID]++; } @@ -908,7 +908,7 @@ const struct ether_header *eh) { struct llc *llc; - u_int16_t payload; + uint16_t payload; /* XXX optimize by combining m_adj+M_PREPEND */ m_adj(m, sizeof(struct ether_header) - sizeof(struct llc)); @@ -996,14 +996,14 @@ */ m->m_next = m2; /* NB: last mbuf from above */ m1->m_pkthdr.len += m2->m_pkthdr.len; - M_PREPEND(m1, sizeof(u_int32_t)+2, M_DONTWAIT); + M_PREPEND(m1, sizeof(uint32_t)+2, M_DONTWAIT); if (m1 == NULL) { /* XXX cannot happen */ IEEE80211_DPRINTF(ic, IEEE80211_MSG_SUPERG, "%s: no space for tunnel header\n", __func__); ic->ic_stats.is_tx_nobuf++; return NULL; } - memset(mtod(m1, void *), 0, sizeof(u_int32_t)+2); + memset(mtod(m1, void *), 0, sizeof(uint32_t)+2); M_PREPEND(m1, sizeof(struct llc), M_DONTWAIT); if (m1 == NULL) { /* XXX cannot happen */ @@ -1076,14 +1076,14 @@ */ whf = mtod(m, struct ieee80211_frame *); memcpy(whf, wh, hdrsize); - *(u_int16_t *)&whf->i_seq[0] |= htole16( + *(uint16_t *)&whf->i_seq[0] |= htole16( (fragno & IEEE80211_SEQ_FRAG_MASK) << IEEE80211_SEQ_FRAG_SHIFT); fragno++; payload = fragsize - totalhdrsize; /* NB: destination is known to be contiguous */ - m_copydata(m0, off, payload, mtod(m, u_int8_t *) + hdrsize); + m_copydata(m0, off, payload, mtod(m, uint8_t *) + hdrsize); m->m_len = hdrsize + payload; m->m_pkthdr.len = hdrsize + payload; m->m_flags |= M_FRAG; @@ -1120,8 +1120,8 @@ /* * Add a supported rates element id to a frame. */ -static u_int8_t * -ieee80211_add_rates(u_int8_t *frm, const struct ieee80211_rateset *rs) +static uint8_t * +ieee80211_add_rates(uint8_t *frm, const struct ieee80211_rateset *rs) { int nrates; @@ -1137,8 +1137,8 @@ /* * Add an extended supported rates element id to a frame. */ -static u_int8_t * -ieee80211_add_xrates(u_int8_t *frm, const struct ieee80211_rateset *rs) +static uint8_t * +ieee80211_add_xrates(uint8_t *frm, const struct ieee80211_rateset *rs) { /* * Add an extended supported rates element if operating in 11g mode. @@ -1156,8 +1156,8 @@ /* * Add an ssid elemet to a frame. */ -static u_int8_t * -ieee80211_add_ssid(u_int8_t *frm, const u_int8_t *ssid, u_int len) +static uint8_t * +ieee80211_add_ssid(uint8_t *frm, const uint8_t *ssid, u_int len) { *frm++ = IEEE80211_ELEMID_SSID; *frm++ = len; @@ -1168,10 +1168,10 @@ /* * Add an erp element to a frame. */ -static u_int8_t * -ieee80211_add_erp(u_int8_t *frm, struct ieee80211com *ic) +static uint8_t * +ieee80211_add_erp(uint8_t *frm, struct ieee80211com *ic) { - u_int8_t erp; + uint8_t erp; *frm++ = IEEE80211_ELEMID_ERP; *frm++ = 1; @@ -1186,8 +1186,8 @@ return frm; } -static u_int8_t * -ieee80211_setup_wpa_ie(struct ieee80211com *ic, u_int8_t *ie) +static uint8_t * +ieee80211_setup_wpa_ie(struct ieee80211com *ic, uint8_t *ie) { #define WPA_OUI_BYTES 0x00, 0x50, 0xf2 #define ADDSHORT(frm, v) do { \ @@ -1199,8 +1199,8 @@ memcpy(frm, sel, 4); \ frm += 4; \ } while (0) - static const u_int8_t oui[4] = { WPA_OUI_BYTES, WPA_OUI_TYPE }; - static const u_int8_t cipher_suite[][4] = { + static const uint8_t oui[4] = { WPA_OUI_BYTES, WPA_OUI_TYPE }; + static const uint8_t cipher_suite[][4] = { { WPA_OUI_BYTES, WPA_CSE_WEP40 }, /* NB: 40-bit */ { WPA_OUI_BYTES, WPA_CSE_TKIP }, { 0x00, 0x00, 0x00, 0x00 }, /* XXX WRAP */ @@ -1208,15 +1208,15 @@ { 0x00, 0x00, 0x00, 0x00 }, /* XXX CKIP */ { WPA_OUI_BYTES, WPA_CSE_NULL }, }; - static const u_int8_t wep104_suite[4] = + static const uint8_t wep104_suite[4] = { WPA_OUI_BYTES, WPA_CSE_WEP104 }; - static const u_int8_t key_mgt_unspec[4] = + static const uint8_t key_mgt_unspec[4] = { WPA_OUI_BYTES, WPA_ASE_8021X_UNSPEC }; - static const u_int8_t key_mgt_psk[4] = + static const uint8_t key_mgt_psk[4] = { WPA_OUI_BYTES, WPA_ASE_8021X_PSK }; const struct ieee80211_rsnparms *rsn = &ic->ic_bss->ni_rsn; - u_int8_t *frm = ie; - u_int8_t *selcnt; + uint8_t *frm = ie; + uint8_t *selcnt; *frm++ = IEEE80211_ELEMID_VENDOR; *frm++ = 0; /* length filled in below */ @@ -1272,8 +1272,8 @@ #undef WPA_OUI_BYTES } -static u_int8_t * -ieee80211_setup_rsn_ie(struct ieee80211com *ic, u_int8_t *ie) +static uint8_t * +ieee80211_setup_rsn_ie(struct ieee80211com *ic, uint8_t *ie) { #define RSN_OUI_BYTES 0x00, 0x0f, 0xac #define ADDSHORT(frm, v) do { \ @@ -1285,7 +1285,7 @@ memcpy(frm, sel, 4); \ frm += 4; \ } while (0) - static const u_int8_t cipher_suite[][4] = { + static const uint8_t cipher_suite[][4] = { { RSN_OUI_BYTES, RSN_CSE_WEP40 }, /* NB: 40-bit */ { RSN_OUI_BYTES, RSN_CSE_TKIP }, { RSN_OUI_BYTES, RSN_CSE_WRAP }, @@ -1293,15 +1293,15 @@ { 0x00, 0x00, 0x00, 0x00 }, /* XXX CKIP */ { RSN_OUI_BYTES, RSN_CSE_NULL }, }; - static const u_int8_t wep104_suite[4] = + static const uint8_t wep104_suite[4] = { RSN_OUI_BYTES, RSN_CSE_WEP104 }; - static const u_int8_t key_mgt_unspec[4] = + static const uint8_t key_mgt_unspec[4] = { RSN_OUI_BYTES, RSN_ASE_8021X_UNSPEC }; - static const u_int8_t key_mgt_psk[4] = + static const uint8_t key_mgt_psk[4] = { RSN_OUI_BYTES, RSN_ASE_8021X_PSK }; const struct ieee80211_rsnparms *rsn = &ic->ic_bss->ni_rsn; - u_int8_t *frm = ie; - u_int8_t *selcnt; + uint8_t *frm = ie; + uint8_t *selcnt; *frm++ = IEEE80211_ELEMID_RSN; *frm++ = 0; /* length filled in below */ @@ -1358,8 +1358,8 @@ /* * Add a WPA/RSN element to a frame. */ -static u_int8_t * -ieee80211_add_wpa(u_int8_t *frm, struct ieee80211com *ic) +static uint8_t * +ieee80211_add_wpa(uint8_t *frm, struct ieee80211com *ic) { KASSERT(ic->ic_flags & IEEE80211_F_WPA, ("no WPA/RSN!")); @@ -1374,8 +1374,8 @@ /* * Add a WME information element to a frame. */ -static u_int8_t * -ieee80211_add_wme_info(u_int8_t *frm, struct ieee80211_wme_state *wme) +static uint8_t * +ieee80211_add_wme_info(uint8_t *frm, struct ieee80211_wme_state *wme) { static const struct ieee80211_wme_info info = { .wme_id = IEEE80211_ELEMID_VENDOR, @@ -1393,8 +1393,8 @@ /* * Add a WME parameters element to a frame. */ -static u_int8_t * -ieee80211_add_wme_param(u_int8_t *frm, struct ieee80211_wme_state *wme) +static uint8_t * +ieee80211_add_wme_param(uint8_t *frm, struct ieee80211_wme_state *wme) { #define SM(_v, _f) (((_v) << _f##_S) & _f) #define ADDSHORT(frm, v) do { \ @@ -1439,8 +1439,8 @@ /* * Add a WME information element to a frame. */ -static u_int8_t * -ieee80211_add_ath(u_int8_t *frm, u_int8_t caps, u_int16_t defkeyix) +static uint8_t * +ieee80211_add_ath(uint8_t *frm, uint8_t caps, uint16_t defkeyix) { static const struct ieee80211_ath_ie info = { .ath_id = IEEE80211_ELEMID_VENDOR, @@ -1466,17 +1466,17 @@ */ int ieee80211_send_probereq(struct ieee80211_node *ni, - const u_int8_t sa[IEEE80211_ADDR_LEN], - const u_int8_t da[IEEE80211_ADDR_LEN], - const u_int8_t bssid[IEEE80211_ADDR_LEN], - const u_int8_t *ssid, size_t ssidlen, + const uint8_t sa[IEEE80211_ADDR_LEN], + const uint8_t da[IEEE80211_ADDR_LEN], + const uint8_t bssid[IEEE80211_ADDR_LEN], + const uint8_t *ssid, size_t ssidlen, const void *optie, size_t optielen) { struct ieee80211com *ic = ni->ni_ic; struct ieee80211_frame *wh; const struct ieee80211_rateset *rs; struct mbuf *m; - u_int8_t *frm; + uint8_t *frm; /* * Hold a reference on the node so it doesn't go away until after @@ -1519,7 +1519,7 @@ memcpy(frm, optie, optielen); frm += optielen; } - m->m_pkthdr.len = m->m_len = frm - mtod(m, u_int8_t *); + m->m_pkthdr.len = m->m_len = frm - mtod(m, uint8_t *); M_PREPEND(m, sizeof(struct ieee80211_frame), M_DONTWAIT); if (m == NULL) @@ -1549,10 +1549,10 @@ /* * Calculate capability information for mgt frames. */ -static u_int16_t +static uint16_t getcapinfo(struct ieee80211com *ic, struct ieee80211_channel *chan) { - u_int16_t capinfo; + uint16_t capinfo; KASSERT(ic->ic_opmode != IEEE80211_M_STA, ("station mode")); @@ -1583,8 +1583,8 @@ { #define senderr(_x, _v) do { ic->ic_stats._v++; ret = _x; goto bad; } while (0) struct mbuf *m; - u_int8_t *frm; - u_int16_t capinfo; + uint8_t *frm; + uint16_t capinfo; int has_challenge, is_shared_key, ret, status; KASSERT(ni != NULL, ("null node")); @@ -1625,8 +1625,8 @@ m = ieee80211_getmgtframe(&frm, ic->ic_headroom + sizeof(struct ieee80211_frame), 8 - + sizeof(u_int16_t) - + sizeof(u_int16_t) + + sizeof(uint16_t) + + sizeof(uint16_t) + 2 + IEEE80211_NWID_LEN + 2 + IEEE80211_RATE_SIZE + 7 /* max(7,3) */ @@ -1647,10 +1647,10 @@ memset(frm, 0, 8); /* timestamp should be filled later */ frm += 8; - *(u_int16_t *)frm = htole16(ic->ic_bss->ni_intval); + *(uint16_t *)frm = htole16(ic->ic_bss->ni_intval); frm += 2; capinfo = getcapinfo(ic, ic->ic_curchan); - *(u_int16_t *)frm = htole16(capinfo); + *(uint16_t *)frm = htole16(capinfo); frm += 2; frm = ieee80211_add_ssid(frm, ic->ic_bss->ni_essid, @@ -1696,7 +1696,7 @@ if (ni->ni_ath_ie != NULL) frm = ieee80211_add_ath(frm, ni->ni_ath_flags, ni->ni_ath_defkeyix); - m->m_pkthdr.len = m->m_len = frm - mtod(m, u_int8_t *); + m->m_pkthdr.len = m->m_len = frm - mtod(m, uint8_t *); break; case IEEE80211_FC0_SUBTYPE_AUTH: @@ -1720,27 +1720,27 @@ m = ieee80211_getmgtframe(&frm, ic->ic_headroom + sizeof(struct ieee80211_frame), - 3 * sizeof(u_int16_t) + 3 * sizeof(uint16_t) + (has_challenge && status == IEEE80211_STATUS_SUCCESS ? - sizeof(u_int16_t)+IEEE80211_CHALLENGE_LEN : 0) + sizeof(uint16_t)+IEEE80211_CHALLENGE_LEN : 0) ); if (m == NULL) senderr(ENOMEM, is_tx_nobuf); - ((u_int16_t *)frm)[0] = + ((uint16_t *)frm)[0] = (is_shared_key) ? htole16(IEEE80211_AUTH_ALG_SHARED) : htole16(IEEE80211_AUTH_ALG_OPEN); - ((u_int16_t *)frm)[1] = htole16(arg); /* sequence number */ - ((u_int16_t *)frm)[2] = htole16(status);/* status */ + ((uint16_t *)frm)[1] = htole16(arg); /* sequence number */ + ((uint16_t *)frm)[2] = htole16(status);/* status */ if (has_challenge && status == IEEE80211_STATUS_SUCCESS) { - ((u_int16_t *)frm)[3] = + ((uint16_t *)frm)[3] = htole16((IEEE80211_CHALLENGE_LEN << 8) | IEEE80211_ELEMID_CHALLENGE); - memcpy(&((u_int16_t *)frm)[4], ni->ni_challenge, + memcpy(&((uint16_t *)frm)[4], ni->ni_challenge, IEEE80211_CHALLENGE_LEN); m->m_pkthdr.len = m->m_len = - 4 * sizeof(u_int16_t) + IEEE80211_CHALLENGE_LEN; + 4 * sizeof(uint16_t) + IEEE80211_CHALLENGE_LEN; if (arg == IEEE80211_AUTH_SHARED_RESPONSE) { IEEE80211_DPRINTF(ic, IEEE80211_MSG_AUTH, "[%s] request encrypt frame (%s)\n", @@ -1748,7 +1748,7 @@ m->m_flags |= M_LINK0; /* WEP-encrypt, please */ } } else - m->m_pkthdr.len = m->m_len = 3 * sizeof(u_int16_t); + m->m_pkthdr.len = m->m_len = 3 * sizeof(uint16_t); /* XXX not right for shared key */ if (status == IEEE80211_STATUS_SUCCESS) @@ -1767,11 +1767,11 @@ ether_sprintf(ni->ni_macaddr), arg); m = ieee80211_getmgtframe(&frm, ic->ic_headroom + sizeof(struct ieee80211_frame), - sizeof(u_int16_t)); + sizeof(uint16_t)); if (m == NULL) senderr(ENOMEM, is_tx_nobuf); - *(u_int16_t *)frm = htole16(arg); /* reason */ - m->m_pkthdr.len = m->m_len = sizeof(u_int16_t); + *(uint16_t *)frm = htole16(arg); /* reason */ + m->m_pkthdr.len = m->m_len = sizeof(uint16_t); IEEE80211_NODE_STAT(ni, tx_deauth); IEEE80211_NODE_STAT_SET(ni, tx_deauth_code, arg); @@ -1797,8 +1797,8 @@ */ m = ieee80211_getmgtframe(&frm, ic->ic_headroom + sizeof(struct ieee80211_frame), - sizeof(u_int16_t) - + sizeof(u_int16_t) + sizeof(uint16_t) + + sizeof(uint16_t) + IEEE80211_ADDR_LEN + 2 + IEEE80211_NWID_LEN + 2 + IEEE80211_RATE_SIZE @@ -1826,13 +1826,13 @@ if (IEEE80211_IS_CHAN_ANYG(ic->ic_curchan) && (ic->ic_caps & IEEE80211_C_SHSLOT)) capinfo |= IEEE80211_CAPINFO_SHORT_SLOTTIME; - *(u_int16_t *)frm = htole16(capinfo); + *(uint16_t *)frm = htole16(capinfo); frm += 2; KASSERT(ic->ic_bss->ni_intval != 0, ("beacon interval is zero!")); - *(u_int16_t *)frm = htole16(howmany(ic->ic_lintval, - ic->ic_bss->ni_intval)); + *(uint16_t *)frm = htole16(howmany(ic->ic_lintval, + ic->ic_bss->ni_intval)); frm += 2; if (type == IEEE80211_FC0_SUBTYPE_REASSOC_REQ) { @@ -1861,7 +1861,7 @@ memcpy(frm, ic->ic_opt_ie, ic->ic_opt_ie_len); frm += ic->ic_opt_ie_len; } - m->m_pkthdr.len = m->m_len = frm - mtod(m, u_int8_t *); + m->m_pkthdr.len = m->m_len = frm - mtod(m, uint8_t *); ieee80211_add_callback(m, ieee80211_tx_mgt_cb, (void *) ic->ic_state); @@ -1883,9 +1883,9 @@ */ m = ieee80211_getmgtframe(&frm, ic->ic_headroom + sizeof(struct ieee80211_frame), - sizeof(u_int16_t) - + sizeof(u_int16_t) - + sizeof(u_int16_t) + sizeof(uint16_t) + + sizeof(uint16_t) + + sizeof(uint16_t) + 2 + IEEE80211_RATE_SIZE + 2 + (IEEE80211_RATE_MAXSIZE - IEEE80211_RATE_SIZE) + sizeof(struct ieee80211_wme_param) @@ -1897,14 +1897,14 @@ senderr(ENOMEM, is_tx_nobuf); capinfo = getcapinfo(ic, ic->ic_curchan); - *(u_int16_t *)frm = htole16(capinfo); + *(uint16_t *)frm = htole16(capinfo); frm += 2; - *(u_int16_t *)frm = htole16(arg); /* status */ + *(uint16_t *)frm = htole16(arg); /* status */ frm += 2; if (arg == IEEE80211_STATUS_SUCCESS) { - *(u_int16_t *)frm = htole16(ni->ni_associd); + *(uint16_t *)frm = htole16(ni->ni_associd); IEEE80211_NODE_STAT(ni, tx_assoc); } else IEEE80211_NODE_STAT(ni, tx_assoc_fail); @@ -1928,7 +1928,7 @@ frm = ieee80211_add_ath(frm, IEEE80211_ATH_CAP(ic, ni, IEEE80211_F_ATHEROS), ni->ni_ath_defkeyix); - m->m_pkthdr.len = m->m_len = frm - mtod(m, u_int8_t *); + m->m_pkthdr.len = m->m_len = frm - mtod(m, uint8_t *); break; case IEEE80211_FC0_SUBTYPE_DISASSOC: @@ -1937,11 +1937,11 @@ ether_sprintf(ni->ni_macaddr), arg); m = ieee80211_getmgtframe(&frm, ic->ic_headroom + sizeof(struct ieee80211_frame), - sizeof(u_int16_t)); + sizeof(uint16_t)); if (m == NULL) senderr(ENOMEM, is_tx_nobuf); - *(u_int16_t *)frm = htole16(arg); /* reason */ - m->m_pkthdr.len = m->m_len = sizeof(u_int16_t); + *(uint16_t *)frm = htole16(arg); /* reason */ + m->m_pkthdr.len = m->m_len = sizeof(uint16_t); IEEE80211_NODE_STAT(ni, tx_disassoc); IEEE80211_NODE_STAT_SET(ni, tx_disassoc_code, arg); @@ -2016,8 +2016,8 @@ struct ieee80211_frame *wh; struct mbuf *m; int pktlen; - u_int8_t *frm; - u_int16_t capinfo; + uint8_t *frm; + uint16_t capinfo; struct ieee80211_rateset *rs; /* @@ -2043,8 +2043,8 @@ */ rs = &ni->ni_rates; pktlen = 8 /* time stamp */ - + sizeof(u_int16_t) /* beacon interval */ - + sizeof(u_int16_t) /* capabilities */ + + sizeof(uint16_t) /* beacon interval */ + + sizeof(uint16_t) /* capabilities */ + 2 + ni->ni_esslen /* ssid */ + 2 + IEEE80211_RATE_SIZE /* supported rates */ + 2 + 1 /* DS parameters */ @@ -2071,11 +2071,11 @@ memset(frm, 0, 8); /* XXX timestamp is set by hardware/driver */ frm += 8; - *(u_int16_t *)frm = htole16(ni->ni_intval); + *(uint16_t *)frm = htole16(ni->ni_intval); frm += 2; capinfo = getcapinfo(ic, ni->ni_chan); - bo->bo_caps = (u_int16_t *)frm; - *(u_int16_t *)frm = htole16(capinfo); + bo->bo_caps = (uint16_t *)frm; + *(uint16_t *)frm = htole16(capinfo); frm += 2; *frm++ = IEEE80211_ELEMID_SSID; if ((ic->ic_flags & IEEE80211_F_HIDESSID) == 0) { @@ -2137,7 +2137,7 @@ } else bo->bo_htinfo = NULL; bo->bo_trailer_len = frm - bo->bo_trailer; - m->m_pkthdr.len = m->m_len = frm - mtod(m, u_int8_t *); + m->m_pkthdr.len = m->m_len = frm - mtod(m, uint8_t *); M_PREPEND(m, sizeof(struct ieee80211_frame), M_DONTWAIT); KASSERT(m != NULL, ("no space for 802.11 header?")); @@ -2145,11 +2145,11 @@ wh->i_fc[0] = IEEE80211_FC0_VERSION_0 | IEEE80211_FC0_TYPE_MGT | IEEE80211_FC0_SUBTYPE_BEACON; wh->i_fc[1] = IEEE80211_FC1_DIR_NODS; - *(u_int16_t *)wh->i_dur = 0; + *(uint16_t *)wh->i_dur = 0; IEEE80211_ADDR_COPY(wh->i_addr1, ifp->if_broadcastaddr); IEEE80211_ADDR_COPY(wh->i_addr2, ic->ic_myaddr); IEEE80211_ADDR_COPY(wh->i_addr3, ni->ni_bssid); - *(u_int16_t *)wh->i_seq = 0; + *(uint16_t *)wh->i_seq = 0; return m; } @@ -2162,7 +2162,7 @@ struct ieee80211_beacon_offsets *bo, struct mbuf *m, int mcast) { int len_changed = 0; - u_int16_t capinfo; + uint16_t capinfo; IEEE80211_BEACON_LOCK(ic); /* XXX faster to recalculate entirely or just changes? */ From owner-p4-projects@FreeBSD.ORG Sun May 13 05:07:54 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 894CC16A406; Sun, 13 May 2007 05:07:54 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 61E7016A402 for ; Sun, 13 May 2007 05:07:54 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5252513C447 for ; Sun, 13 May 2007 05:07:54 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4D57sBu051979 for ; Sun, 13 May 2007 05:07:54 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4D57s25051976 for perforce@freebsd.org; Sun, 13 May 2007 05:07:54 GMT (envelope-from sephe@FreeBSD.org) Date: Sun, 13 May 2007 05:07:54 GMT Message-Id: <200705130507.l4D57s25051976@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 119753 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, 13 May 2007 05:07:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=119753 Change 119753 by sephe@sephe_zealot:sam_wifi on 2007/05/13 05:06:53 u_intX_t -> uintX_t Approved by: sam Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_power.c#7 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_power.c#7 (text+ko) ==== @@ -69,8 +69,8 @@ * know adhoc mode doesn't support ATIM yet... */ if (ic->ic_opmode == IEEE80211_M_HOSTAP) { - ic->ic_tim_len = howmany(ic->ic_max_aid,8) * sizeof(u_int8_t); - MALLOC(ic->ic_tim_bitmap, u_int8_t *, ic->ic_tim_len, + ic->ic_tim_len = howmany(ic->ic_max_aid,8) * sizeof(uint8_t); + MALLOC(ic->ic_tim_bitmap, uint8_t *, ic->ic_tim_len, M_DEVBUF, M_NOWAIT | M_ZERO); if (ic->ic_tim_bitmap == NULL) { printf("%s: no memory for TIM bitmap!\n", __func__); @@ -150,7 +150,7 @@ ieee80211_set_tim(struct ieee80211_node *ni, int set) { struct ieee80211com *ic = ni->ni_ic; - u_int16_t aid; + uint16_t aid; KASSERT(ic->ic_opmode == IEEE80211_M_HOSTAP || ic->ic_opmode == IEEE80211_M_IBSS, From owner-p4-projects@FreeBSD.ORG Sun May 13 05:15:04 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DEEE416A402; Sun, 13 May 2007 05:15:03 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7093816A405 for ; Sun, 13 May 2007 05:15:03 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6052A13C43E for ; Sun, 13 May 2007 05:15:03 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4D5F3XM053555 for ; Sun, 13 May 2007 05:15:03 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4D5F2lq053548 for perforce@freebsd.org; Sun, 13 May 2007 05:15:02 GMT (envelope-from sephe@FreeBSD.org) Date: Sun, 13 May 2007 05:15:02 GMT Message-Id: <200705130515.l4D5F2lq053548@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 119754 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, 13 May 2007 05:15:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=119754 Change 119754 by sephe@sephe_zealot:sam_wifi on 2007/05/13 05:14:38 u_intX_t -> uintX_t Approved by: sam Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_proto.c#56 edit .. //depot/projects/wifi/sys/net80211/ieee80211_proto.h#36 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.c#56 (text+ko) ==== @@ -244,9 +244,9 @@ } void -ieee80211_print_essid(const u_int8_t *essid, int len) +ieee80211_print_essid(const uint8_t *essid, int len) { - const u_int8_t *p; + const uint8_t *p; int i; if (len > IEEE80211_NWID_LEN) @@ -270,7 +270,7 @@ void ieee80211_dump_pkt(struct ieee80211com *ic, - const u_int8_t *buf, int len, int rate, int rssi) + const uint8_t *buf, int len, int rate, int rssi) { const struct ieee80211_frame *wh; int i; @@ -293,7 +293,7 @@ printf("(%s)", ether_sprintf(wh->i_addr2)); break; case IEEE80211_FC1_DIR_DSTODS: - printf("DSDS %s", ether_sprintf((const u_int8_t *)&wh[1])); + printf("DSDS %s", ether_sprintf((const uint8_t *)&wh[1])); printf("->%s", ether_sprintf(wh->i_addr3)); printf("(%s", ether_sprintf(wh->i_addr2)); printf("->%s)", ether_sprintf(wh->i_addr1)); @@ -364,7 +364,7 @@ int i, j, rix, error; int okrate, badrate, fixedrate; const struct ieee80211_rateset *srs; - u_int8_t r; + uint8_t r; error = 0; okrate = badrate = 0; @@ -550,11 +550,11 @@ * WME protocol support. The following parameters come from the spec. */ typedef struct phyParamType { - u_int8_t aifsn; - u_int8_t logcwmin; - u_int8_t logcwmax; - u_int16_t txopLimit; - u_int8_t acm; + uint8_t aifsn; + uint8_t logcwmin; + uint8_t logcwmax; + uint16_t txopLimit; + uint8_t acm; } paramType; static const struct phyParamType phyParamForAC_BE[IEEE80211_MODE_MAX] = { @@ -833,7 +833,7 @@ if (ic->ic_opmode == IEEE80211_M_HOSTAP && ic->ic_sta_assoc < 2 && (wme->wme_flags & WME_F_AGGRMODE) != 0) { - static const u_int8_t logCwMin[IEEE80211_MODE_MAX] = { + static const uint8_t logCwMin[IEEE80211_MODE_MAX] = { 3, /* IEEE80211_MODE_AUTO */ 3, /* IEEE80211_MODE_11A */ 4, /* IEEE80211_MODE_11B */ ==== //depot/projects/wifi/sys/net80211/ieee80211_proto.h#36 (text+ko) ==== @@ -58,16 +58,16 @@ struct ieee80211_node; int ieee80211_input(struct ieee80211com *, struct mbuf *, - struct ieee80211_node *, int, int, u_int32_t); + struct ieee80211_node *, int, int, uint32_t); void ieee80211_deliver_data(struct ieee80211com *, struct ieee80211_node *, struct mbuf *); struct mbuf *ieee80211_decap1(struct mbuf *, int *); int ieee80211_setup_rates(struct ieee80211_node *ni, - const u_int8_t *rates, const u_int8_t *xrates, int flags); -void ieee80211_saveie(u_int8_t **, const u_int8_t *); -void ieee80211_saveath(struct ieee80211_node *, u_int8_t *); + const uint8_t *rates, const uint8_t *xrates, int flags); +void ieee80211_saveie(uint8_t **, const uint8_t *); +void ieee80211_saveath(struct ieee80211_node *, uint8_t *); void ieee80211_recv_mgmt(struct ieee80211com *, struct mbuf *, - struct ieee80211_node *, int, int, int, u_int32_t); + struct ieee80211_node *, int, int, int, uint32_t); int ieee80211_mgmt_output(struct ieee80211com *, struct ieee80211_node *, struct mbuf *, int type); struct ieee80211_bpf_params; @@ -79,10 +79,10 @@ int ieee80211_send_mgmt(struct ieee80211com *, struct ieee80211_node *, int, int); int ieee80211_send_probereq(struct ieee80211_node *ni, - const u_int8_t sa[IEEE80211_ADDR_LEN], - const u_int8_t da[IEEE80211_ADDR_LEN], - const u_int8_t bssid[IEEE80211_ADDR_LEN], - const u_int8_t *ssid, size_t ssidlen, + const uint8_t sa[IEEE80211_ADDR_LEN], + const uint8_t da[IEEE80211_ADDR_LEN], + const uint8_t bssid[IEEE80211_ADDR_LEN], + const uint8_t *ssid, size_t ssidlen, const void *optie, size_t optielen); int ieee80211_classify(struct ieee80211com *, struct mbuf *, struct ieee80211_node *); @@ -111,7 +111,7 @@ if ((wh->i_fc[1] & IEEE80211_FC1_DIR_MASK) == IEEE80211_FC1_DIR_DSTODS) size += IEEE80211_ADDR_LEN; if (IEEE80211_QOS_HAS_SEQ(wh)) - size += sizeof(u_int16_t); + size += sizeof(uint16_t); return size; } @@ -166,11 +166,11 @@ int (*iac_attach)(struct ieee80211com *); void (*iac_detach)(struct ieee80211com *); int (*iac_check)(struct ieee80211com *, - const u_int8_t mac[IEEE80211_ADDR_LEN]); + const uint8_t mac[IEEE80211_ADDR_LEN]); int (*iac_add)(struct ieee80211com *, - const u_int8_t mac[IEEE80211_ADDR_LEN]); + const uint8_t mac[IEEE80211_ADDR_LEN]); int (*iac_remove)(struct ieee80211com *, - const u_int8_t mac[IEEE80211_ADDR_LEN]); + const uint8_t mac[IEEE80211_ADDR_LEN]); int (*iac_flush)(struct ieee80211com *); int (*iac_setpolicy)(struct ieee80211com *, int); int (*iac_getpolicy)(struct ieee80211com *); @@ -195,18 +195,18 @@ * WME/WMM support. */ struct wmeParams { - u_int8_t wmep_acm; - u_int8_t wmep_aifsn; - u_int8_t wmep_logcwmin; /* log2(cwmin) */ - u_int8_t wmep_logcwmax; /* log2(cwmax) */ - u_int8_t wmep_txopLimit; - u_int8_t wmep_noackPolicy; /* 0 (ack), 1 (no ack) */ + uint8_t wmep_acm; + uint8_t wmep_aifsn; + uint8_t wmep_logcwmin; /* log2(cwmin) */ + uint8_t wmep_logcwmax; /* log2(cwmax) */ + uint8_t wmep_txopLimit; + uint8_t wmep_noackPolicy; /* 0 (ack), 1 (no ack) */ }; #define IEEE80211_TXOP_TO_US(_txop) ((_txop)<<5) #define IEEE80211_US_TO_TXOP(_us) ((_us)>>5) struct chanAccParams { - u_int8_t cap_info; /* version of the current set */ + uint8_t cap_info; /* version of the current set */ struct wmeParams cap_wmeParams[WME_NUM_AC]; }; @@ -235,9 +235,9 @@ int ieee80211_init(struct ieee80211com *, int forcescan); void ieee80211_dturbo_switch(struct ieee80211com *, int newflags); void ieee80211_beacon_miss(struct ieee80211com *); -void ieee80211_print_essid(const u_int8_t *, int); +void ieee80211_print_essid(const uint8_t *, int); void ieee80211_dump_pkt(struct ieee80211com *, - const u_int8_t *, int, int, int); + const uint8_t *, int, int, int); extern const char *ieee80211_opmode_name[]; extern const char *ieee80211_state_name[IEEE80211_S_MAX]; @@ -249,14 +249,14 @@ * can update the frame later w/ minimal overhead. */ struct ieee80211_beacon_offsets { - u_int16_t *bo_caps; /* capabilities */ - u_int8_t *bo_tim; /* start of atim/dtim */ - u_int8_t *bo_wme; /* start of WME parameters */ - u_int8_t *bo_trailer; /* start of fixed-size trailer */ - u_int16_t bo_tim_len; /* atim/dtim length in bytes */ - u_int16_t bo_trailer_len; /* trailer length in bytes */ - u_int8_t *bo_erp; /* start of ERP element */ - u_int8_t *bo_htinfo; /* start of HT info element */ + uint16_t *bo_caps; /* capabilities */ + uint8_t *bo_tim; /* start of atim/dtim */ + uint8_t *bo_wme; /* start of WME parameters */ + uint8_t *bo_trailer; /* start of fixed-size trailer */ + uint16_t bo_tim_len; /* atim/dtim length in bytes */ + uint16_t bo_trailer_len; /* trailer length in bytes */ + uint8_t *bo_erp; /* start of ERP element */ + uint8_t *bo_htinfo; /* start of HT info element */ }; struct mbuf *ieee80211_beacon_alloc(struct ieee80211com *, struct ieee80211_node *, struct ieee80211_beacon_offsets *); From owner-p4-projects@FreeBSD.ORG Sun May 13 05:22:34 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2515E16A403; Sun, 13 May 2007 05:22:34 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A216916A400 for ; Sun, 13 May 2007 05:22:33 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9222013C459 for ; Sun, 13 May 2007 05:22:33 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4D5MXKv054526 for ; Sun, 13 May 2007 05:22:33 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4D5MWFw054522 for perforce@freebsd.org; Sun, 13 May 2007 05:22:32 GMT (envelope-from sephe@FreeBSD.org) Date: Sun, 13 May 2007 05:22:32 GMT Message-Id: <200705130522.l4D5MWFw054522@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 119755 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, 13 May 2007 05:22:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=119755 Change 119755 by sephe@sephe_zealot:sam_wifi on 2007/05/13 05:21:31 u_intX_t -> uintX_t Approved by: sam Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_radiotap.h#11 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_radiotap.h#11 (text+ko) ==== @@ -60,18 +60,18 @@ * Note well: all radiotap fields are little-endian. */ struct ieee80211_radiotap_header { - u_int8_t it_version; /* Version 0. Only increases + uint8_t it_version; /* Version 0. Only increases * for drastic changes, * introduction of compatible * new fields does not count. */ - u_int8_t it_pad; - u_int16_t it_len; /* length of the whole + uint8_t it_pad; + uint16_t it_len; /* length of the whole * header in bytes, including * it_version, it_pad, * it_len, and data fields. */ - u_int32_t it_present; /* A bitmap telling which + uint32_t it_present; /* A bitmap telling which * fields are present. Set bit 31 * (0x80000000) to extend the * bitmap by another 32 bits. @@ -84,22 +84,22 @@ * Name Data type Units * ---- --------- ----- * - * IEEE80211_RADIOTAP_TSFT u_int64_t microseconds + * IEEE80211_RADIOTAP_TSFT uint64_t microseconds * * Value in microseconds of the MAC's 64-bit 802.11 Time * Synchronization Function timer when the first bit of the * MPDU arrived at the MAC. For received frames, only. * - * IEEE80211_RADIOTAP_CHANNEL 2 x u_int16_t MHz, bitmap + * IEEE80211_RADIOTAP_CHANNEL 2 x uint16_t MHz, bitmap * * Tx/Rx frequency in MHz, followed by flags (see below). * - * IEEE80211_RADIOTAP_FHSS u_int16_t see below + * IEEE80211_RADIOTAP_FHSS uint16_t see below * * For frequency-hopping radios, the hop set (first byte) * and pattern (second byte). * - * IEEE80211_RADIOTAP_RATE u_int8_t 500kb/s or index + * IEEE80211_RADIOTAP_RATE uint8_t 500kb/s or index * * Tx/Rx data rate. If bit 0x80 is set then it represents an * an MCS index and not an IEEE rate. @@ -116,30 +116,30 @@ * RF noise power at the antenna, decibel difference from one * milliwatt. * - * IEEE80211_RADIOTAP_DB_ANTSIGNAL u_int8_t decibel (dB) + * IEEE80211_RADIOTAP_DB_ANTSIGNAL uint8_t decibel (dB) * * RF signal power at the antenna, decibel difference from an * arbitrary, fixed reference. * - * IEEE80211_RADIOTAP_DB_ANTNOISE u_int8_t decibel (dB) + * IEEE80211_RADIOTAP_DB_ANTNOISE uint8_t decibel (dB) * * RF noise power at the antenna, decibel difference from an * arbitrary, fixed reference point. * - * IEEE80211_RADIOTAP_LOCK_QUALITY u_int16_t unitless + * IEEE80211_RADIOTAP_LOCK_QUALITY uint16_t unitless * * Quality of Barker code lock. Unitless. Monotonically * nondecreasing with "better" lock strength. Called "Signal * Quality" in datasheets. (Is there a standard way to measure * this?) * - * IEEE80211_RADIOTAP_TX_ATTENUATION u_int16_t unitless + * IEEE80211_RADIOTAP_TX_ATTENUATION uint16_t unitless * * Transmit power expressed as unitless distance from max * power set at factory calibration. 0 is max power. * Monotonically nondecreasing with lower power levels. * - * IEEE80211_RADIOTAP_DB_TX_ATTENUATION u_int16_t decibels (dB) + * IEEE80211_RADIOTAP_DB_TX_ATTENUATION uint16_t decibels (dB) * * Transmit power expressed as decibel distance from max power * set at factory calibration. 0 is max power. Monotonically @@ -152,20 +152,20 @@ * reference). This is the absolute power level measured at * the antenna port. * - * IEEE80211_RADIOTAP_FLAGS u_int8_t bitmap + * IEEE80211_RADIOTAP_FLAGS uint8_t bitmap * * Properties of transmitted and received frames. See flags * defined below. * - * IEEE80211_RADIOTAP_ANTENNA u_int8_t antenna index + * IEEE80211_RADIOTAP_ANTENNA uint8_t antenna index * * Unitless indication of the Rx/Tx antenna for this packet. * The first antenna is antenna 0. * - * IEEE80211_RADIOTAP_XCHANNEL u_int32_t bitmap - * u_int16_t MHz - * u_int8_t channel number - * u_int8_t .5 dBm + * IEEE80211_RADIOTAP_XCHANNEL uint32_t bitmap + * uint16_t MHz + * uint8_t channel number + * uint8_t .5 dBm * * Extended channel specification: flags (see below) followed by * frequency in MHz, the corresponding IEEE channel number, and From owner-p4-projects@FreeBSD.ORG Sun May 13 05:24:37 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F21C516A405; Sun, 13 May 2007 05:24:36 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AA95316A403 for ; Sun, 13 May 2007 05:24:36 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9B39213C44C for ; Sun, 13 May 2007 05:24:36 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4D5Oa9V055021 for ; Sun, 13 May 2007 05:24:36 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4D5OapU055015 for perforce@freebsd.org; Sun, 13 May 2007 05:24:36 GMT (envelope-from sephe@FreeBSD.org) Date: Sun, 13 May 2007 05:24:36 GMT Message-Id: <200705130524.l4D5OapU055015@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 119756 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, 13 May 2007 05:24:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=119756 Change 119756 by sephe@sephe_zealot:sam_wifi on 2007/05/13 05:24:20 u_intX_t -> uintX_t Approved by: sam Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_regdomain.c#4 edit .. //depot/projects/wifi/sys/net80211/ieee80211_regdomain.h#3 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_regdomain.c#4 (text+ko) ==== @@ -115,8 +115,8 @@ /* * Add Country Information IE. */ -u_int8_t * -ieee80211_add_countryie(u_int8_t *frm, struct ieee80211com *ic, +uint8_t * +ieee80211_add_countryie(uint8_t *frm, struct ieee80211com *ic, enum ISOCountryCode cc, int location) { #define CHAN_UNINTERESTING \ @@ -139,7 +139,7 @@ }; struct ieee80211_country_ie *ie = (struct ieee80211_country_ie *)frm; const char *iso_name; - u_int8_t nextchan, chans[IEEE80211_CHAN_BYTES]; + uint8_t nextchan, chans[IEEE80211_CHAN_BYTES]; int i, skip; ie->ie = IEEE80211_ELEMID_COUNTRY; @@ -162,7 +162,7 @@ /* * Run-length encoded channel+max tx power info. */ - frm = (u_int8_t *)&ie->band[0]; + frm = (uint8_t *)&ie->band[0]; nextchan = 0; /* NB: impossible channel # */ memset(chans, 0, sizeof(chans)); skip = skipflags[ic->ic_curmode]; ==== //depot/projects/wifi/sys/net80211/ieee80211_regdomain.h#3 (text+ko) ==== @@ -173,7 +173,7 @@ void ieee80211_init_channels(struct ieee80211com *ic, int rd, enum ISOCountryCode cc, int bands, int outdoor, int ecm); -u_int8_t *ieee80211_add_countryie(u_int8_t *, struct ieee80211com *, +uint8_t *ieee80211_add_countryie(uint8_t *, struct ieee80211com *, enum ISOCountryCode cc, int location); const char *ieee80211_cctoiso(enum ISOCountryCode); int ieee80211_isotocc(const char iso[2]); From owner-p4-projects@FreeBSD.ORG Sun May 13 05:35:51 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1AB5416A405; Sun, 13 May 2007 05:35:51 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C1AD416A402 for ; Sun, 13 May 2007 05:35:50 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B162713C45B for ; Sun, 13 May 2007 05:35:50 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4D5ZoMu056846 for ; Sun, 13 May 2007 05:35:50 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4D5ZotF056843 for perforce@freebsd.org; Sun, 13 May 2007 05:35:50 GMT (envelope-from sephe@FreeBSD.org) Date: Sun, 13 May 2007 05:35:50 GMT Message-Id: <200705130535.l4D5ZotF056843@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 119757 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, 13 May 2007 05:35:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=119757 Change 119757 by sephe@sephe_zealot:sam_wifi on 2007/05/13 05:35:45 u_intX_t -> uintX_t Approved by: sam Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_scan.c#13 edit .. //depot/projects/wifi/sys/net80211/ieee80211_scan.h#8 edit .. //depot/projects/wifi/sys/net80211/ieee80211_scan_ap.c#7 edit .. //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#19 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_scan.c#13 (text+ko) ==== @@ -833,8 +833,8 @@ #ifdef IEEE80211_DEBUG static void -dump_probe_beacon(u_int8_t subtype, int isnew, - const u_int8_t mac[IEEE80211_ADDR_LEN], +dump_probe_beacon(uint8_t subtype, int isnew, + const uint8_t mac[IEEE80211_ADDR_LEN], const struct ieee80211_scanparams *sp) { @@ -940,7 +940,7 @@ * Mark a scan cache entry after a successful associate. */ void -ieee80211_scan_assoc_success(struct ieee80211com *ic, const u_int8_t mac[]) +ieee80211_scan_assoc_success(struct ieee80211com *ic, const uint8_t mac[]) { struct ieee80211_scan_state *ss = ic->ic_scan; @@ -956,7 +956,7 @@ */ void ieee80211_scan_assoc_fail(struct ieee80211com *ic, - const u_int8_t mac[], int reason) + const uint8_t mac[], int reason) { struct ieee80211_scan_state *ss = ic->ic_scan; ==== //depot/projects/wifi/sys/net80211/ieee80211_scan.h#8 (text+ko) ==== @@ -38,8 +38,8 @@ struct ieee80211_scanner; struct ieee80211_scan_ssid { - int len; /* length in bytes */ - u_int8_t ssid[IEEE80211_NWID_LEN]; /* ssid contents */ + int len; /* length in bytes */ + uint8_t ssid[IEEE80211_NWID_LEN]; /* ssid contents */ }; #define IEEE80211_SCAN_MAX_SSID 1 @@ -47,20 +47,20 @@ struct ieee80211com *ss_ic; const struct ieee80211_scanner *ss_ops; /* policy hookup, see below */ void *ss_priv; /* scanner private state */ - u_int16_t ss_flags; + uint16_t ss_flags; #define IEEE80211_SCAN_NOPICK 0x0001 /* scan only, no selection */ #define IEEE80211_SCAN_ACTIVE 0x0002 /* active scan (probe req) */ #define IEEE80211_SCAN_PICK1ST 0x0004 /* ``hey sailor'' mode */ #define IEEE80211_SCAN_BGSCAN 0x0008 /* bg scan, exit ps at end */ #define IEEE80211_SCAN_ONCE 0x0010 /* do one complete pass */ #define IEEE80211_SCAN_GOTPICK 0x1000 /* got candidate, can stop */ - u_int8_t ss_nssid; /* # ssid's to probe/match */ + uint8_t ss_nssid; /* # ssid's to probe/match */ struct ieee80211_scan_ssid ss_ssid[IEEE80211_SCAN_MAX_SSID]; /* ssid's to probe/match */ /* ordered channel set */ struct ieee80211_channel *ss_chans[IEEE80211_SCAN_MAX]; - u_int16_t ss_next; /* ix of next chan to scan */ - u_int16_t ss_last; /* ix+1 of last chan to scan */ + uint16_t ss_next; /* ix of next chan to scan */ + uint16_t ss_last; /* ix+1 of last chan to scan */ unsigned long ss_mindwell; /* min dwell on channel */ unsigned long ss_maxdwell; /* max dwell on channel */ }; @@ -98,13 +98,13 @@ void ieee80211_scan_timeout(struct ieee80211com *); void ieee80211_scan_assoc_success(struct ieee80211com *, - const u_int8_t mac[IEEE80211_ADDR_LEN]); + const uint8_t mac[IEEE80211_ADDR_LEN]); enum { IEEE80211_SCAN_FAIL_TIMEOUT = 1, /* no response to mgmt frame */ IEEE80211_SCAN_FAIL_STATUS = 2 /* negative response to " " */ }; void ieee80211_scan_assoc_fail(struct ieee80211com *, - const u_int8_t mac[IEEE80211_ADDR_LEN], int reason); + const uint8_t mac[IEEE80211_ADDR_LEN], int reason); void ieee80211_scan_flush(struct ieee80211com *); struct ieee80211_scan_entry; @@ -121,27 +121,27 @@ * All multi-byte values must be in host byte order. */ struct ieee80211_scanparams { - u_int16_t capinfo; /* 802.11 capabilities */ - u_int16_t fhdwell; /* FHSS dwell interval */ - u_int8_t chan; /* */ - u_int8_t bchan; - u_int8_t fhindex; - u_int8_t erp; - u_int16_t bintval; - u_int8_t timoff; - u_int8_t *tim; - u_int8_t *tstamp; - u_int8_t *country; - u_int8_t *ssid; - u_int8_t *rates; - u_int8_t *xrates; - u_int8_t *doth; - u_int8_t *wpa; - u_int8_t *rsn; - u_int8_t *wme; - u_int8_t *htcap; - u_int8_t *htinfo; - u_int8_t *ath; + uint16_t capinfo; /* 802.11 capabilities */ + uint16_t fhdwell; /* FHSS dwell interval */ + uint8_t chan; /* */ + uint8_t bchan; + uint8_t fhindex; + uint8_t erp; + uint16_t bintval; + uint8_t timoff; + uint8_t *tim; + uint8_t *tstamp; + uint8_t *country; + uint8_t *ssid; + uint8_t *rates; + uint8_t *xrates; + uint8_t *doth; + uint8_t *wpa; + uint8_t *rsn; + uint8_t *wme; + uint8_t *htcap; + uint8_t *htinfo; + uint8_t *ath; }; /* @@ -149,32 +149,32 @@ * module; this data may be represented some other way internally. */ struct ieee80211_scan_entry { - u_int8_t se_macaddr[IEEE80211_ADDR_LEN]; - u_int8_t se_bssid[IEEE80211_ADDR_LEN]; - u_int8_t se_ssid[2+IEEE80211_NWID_LEN]; - u_int8_t se_rates[2+IEEE80211_RATE_MAXSIZE]; - u_int8_t se_xrates[2+IEEE80211_RATE_MAXSIZE]; - u_int32_t se_rstamp; /* recv timestamp */ + uint8_t se_macaddr[IEEE80211_ADDR_LEN]; + uint8_t se_bssid[IEEE80211_ADDR_LEN]; + uint8_t se_ssid[2+IEEE80211_NWID_LEN]; + uint8_t se_rates[2+IEEE80211_RATE_MAXSIZE]; + uint8_t se_xrates[2+IEEE80211_RATE_MAXSIZE]; + uint32_t se_rstamp; /* recv timestamp */ union { - u_int8_t data[8]; - u_int64_t tsf; + uint8_t data[8]; + uint64_t tsf; } se_tstamp; /* from last rcv'd beacon */ - u_int16_t se_intval; /* beacon interval (host byte order) */ - u_int16_t se_capinfo; /* capabilities (host byte order) */ + uint16_t se_intval; /* beacon interval (host byte order) */ + uint16_t se_capinfo; /* capabilities (host byte order) */ struct ieee80211_channel *se_chan;/* channel where sta found */ - u_int16_t se_timoff; /* byte offset to TIM ie */ - u_int16_t se_fhdwell; /* FH only (host byte order) */ - u_int8_t se_fhindex; /* FH only */ - u_int8_t se_erp; /* ERP from beacon/probe resp */ + uint16_t se_timoff; /* byte offset to TIM ie */ + uint16_t se_fhdwell; /* FH only (host byte order) */ + uint8_t se_fhindex; /* FH only */ + uint8_t se_erp; /* ERP from beacon/probe resp */ int8_t se_rssi; /* avg'd recv ssi */ int8_t se_noise; /* noise floor */ - u_int8_t se_dtimperiod; /* DTIM period */ - u_int8_t *se_wpa_ie; /* captured WPA ie */ - u_int8_t *se_rsn_ie; /* captured RSN ie */ - u_int8_t *se_wme_ie; /* captured WME ie */ - u_int8_t *se_htcap_ie; /* captured HTP cap ie */ - u_int8_t *se_htinfo_ie; /* captured HTP info ie */ - u_int8_t *se_ath_ie; /* captured Atheros ie */ + uint8_t se_dtimperiod; /* DTIM period */ + uint8_t *se_wpa_ie; /* captured WPA ie */ + uint8_t *se_rsn_ie; /* captured RSN ie */ + uint8_t *se_wme_ie; /* captured WME ie */ + uint8_t *se_htcap_ie; /* captured HTP cap ie */ + uint8_t *se_htinfo_ie; /* captured HTP info ie */ + uint8_t *se_ath_ie; /* captured Atheros ie */ u_int se_age; /* age of entry (0 on create) */ }; MALLOC_DECLARE(M_80211_SCAN); @@ -206,11 +206,11 @@ void (*scan_age)(struct ieee80211_scan_state *); /* note that association failed for an entry */ void (*scan_assoc_fail)(struct ieee80211_scan_state *, - const u_int8_t macaddr[IEEE80211_ADDR_LEN], + const uint8_t macaddr[IEEE80211_ADDR_LEN], int reason); /* note that association succeed for an entry */ void (*scan_assoc_success)(struct ieee80211_scan_state *, - const u_int8_t macaddr[IEEE80211_ADDR_LEN]); + const uint8_t macaddr[IEEE80211_ADDR_LEN]); /* iterate over entries in the scan cache */ void (*scan_iterate)(struct ieee80211_scan_state *, ieee80211_scan_iter_func *, void *); ==== //depot/projects/wifi/sys/net80211/ieee80211_scan_ap.c#7 (text+ko) ==== @@ -351,14 +351,14 @@ static void ap_assoc_success(struct ieee80211_scan_state *ss, - const u_int8_t macaddr[IEEE80211_ADDR_LEN]) + const uint8_t macaddr[IEEE80211_ADDR_LEN]) { /* should not be called */ } static void ap_assoc_fail(struct ieee80211_scan_state *ss, - const u_int8_t macaddr[IEEE80211_ADDR_LEN], int reason) + const uint8_t macaddr[IEEE80211_ADDR_LEN], int reason) { /* should not be called */ } ==== //depot/projects/wifi/sys/net80211/ieee80211_scan_sta.c#19 (text+ko) ==== @@ -83,13 +83,13 @@ struct ieee80211_scan_entry base; TAILQ_ENTRY(sta_entry) se_list; LIST_ENTRY(sta_entry) se_hash; - u_int8_t se_fails; /* failure to associate count */ - u_int8_t se_seen; /* seen during current scan */ - u_int8_t se_notseen; /* not seen in previous scans */ - u_int8_t se_flags; + uint8_t se_fails; /* failure to associate count */ + uint8_t se_seen; /* seen during current scan */ + uint8_t se_notseen; /* not seen in previous scans */ + uint8_t se_flags; #define STA_SSID_MATCH 0x01 #define STA_BSSID_MATCH 0x02 - u_int32_t se_avgrssi; /* LPF rssi state */ + uint32_t se_avgrssi; /* LPF rssi state */ unsigned long se_lastupdate; /* time of last update */ unsigned long se_lastfail; /* time of last failure */ unsigned long se_lastassoc; /* time of last association */ @@ -99,7 +99,7 @@ #define STA_HASHSIZE 32 /* simple hash is enough for variation of macaddr */ #define STA_HASH(addr) \ - (((const u_int8_t *)(addr))[IEEE80211_ADDR_LEN - 1] % STA_HASHSIZE) + (((const uint8_t *)(addr))[IEEE80211_ADDR_LEN - 1] % STA_HASHSIZE) struct sta_table { struct mtx st_lock; /* on scan table */ @@ -187,7 +187,7 @@ } static void -saveie(u_int8_t **iep, const u_int8_t *ie) +saveie(uint8_t **iep, const uint8_t *ie) { if (ie == NULL) @@ -211,7 +211,7 @@ ((ss->ss_flags & (IEEE80211_SCAN_PICK1ST | IEEE80211_SCAN_GOTPICK)) == \ IEEE80211_SCAN_PICK1ST) struct sta_table *st = ss->ss_priv; - const u_int8_t *macaddr = wh->i_addr2; + const uint8_t *macaddr = wh->i_addr2; struct ieee80211com *ic = ss->ss_ic; struct sta_entry *se; struct ieee80211_scan_entry *ise; @@ -355,7 +355,7 @@ static void add_channels(struct ieee80211com *ic, struct ieee80211_scan_state *ss, - enum ieee80211_phymode mode, const u_int16_t freq[], int nfreq) + enum ieee80211_phymode mode, const uint16_t freq[], int nfreq) { #define N(a) (sizeof(a) / sizeof(a[0])) struct ieee80211_channel *c, *cg; @@ -385,41 +385,41 @@ #undef N } -static const u_int16_t rcl1[] = /* 8 FCC channel: 52, 56, 60, 64, 36, 40, 44, 48 */ +static const uint16_t rcl1[] = /* 8 FCC channel: 52, 56, 60, 64, 36, 40, 44, 48 */ { 5260, 5280, 5300, 5320, 5180, 5200, 5220, 5240 }; -static const u_int16_t rcl2[] = /* 4 MKK channels: 34, 38, 42, 46 */ +static const uint16_t rcl2[] = /* 4 MKK channels: 34, 38, 42, 46 */ { 5170, 5190, 5210, 5230 }; -static const u_int16_t rcl3[] = /* 2.4Ghz ch: 1,6,11,7,13 */ +static const uint16_t rcl3[] = /* 2.4Ghz ch: 1,6,11,7,13 */ { 2412, 2437, 2462, 2442, 2472 }; -static const u_int16_t rcl4[] = /* 5 FCC channel: 149, 153, 161, 165 */ +static const uint16_t rcl4[] = /* 5 FCC channel: 149, 153, 161, 165 */ { 5745, 5765, 5785, 5805, 5825 }; -static const u_int16_t rcl7[] = /* 11 ETSI channel: 100,104,108,112,116,120,124,128,132,136,140 */ +static const uint16_t rcl7[] = /* 11 ETSI channel: 100,104,108,112,116,120,124,128,132,136,140 */ { 5500, 5520, 5540, 5560, 5580, 5600, 5620, 5640, 5660, 5680, 5700 }; -static const u_int16_t rcl8[] = /* 2.4Ghz ch: 2,3,4,5,8,9,10,12 */ +static const uint16_t rcl8[] = /* 2.4Ghz ch: 2,3,4,5,8,9,10,12 */ { 2417, 2422, 2427, 2432, 2447, 2452, 2457, 2467 }; -static const u_int16_t rcl9[] = /* 2.4Ghz ch: 14 */ +static const uint16_t rcl9[] = /* 2.4Ghz ch: 14 */ { 2484 }; -static const u_int16_t rcl10[] = /* Added Korean channels 2312-2372 */ +static const uint16_t rcl10[] = /* Added Korean channels 2312-2372 */ { 2312, 2317, 2322, 2327, 2332, 2337, 2342, 2347, 2352, 2357, 2362, 2367, 2372 }; -static const u_int16_t rcl11[] = /* Added Japan channels in 4.9/5.0 spectrum */ +static const uint16_t rcl11[] = /* Added Japan channels in 4.9/5.0 spectrum */ { 5040, 5060, 5080, 4920, 4940, 4960, 4980 }; #ifdef ATH_TURBO_SCAN -static const u_int16_t rcl5[] = /* 3 static turbo channels */ +static const uint16_t rcl5[] = /* 3 static turbo channels */ { 5210, 5250, 5290 }; -static const u_int16_t rcl6[] = /* 2 static turbo channels */ +static const uint16_t rcl6[] = /* 2 static turbo channels */ { 5760, 5800 }; -static const u_int16_t rcl6x[] = /* 4 FCC3 turbo channels */ +static const uint16_t rcl6x[] = /* 4 FCC3 turbo channels */ { 5540, 5580, 5620, 5660 }; -static const u_int16_t rcl12[] = /* 2.4Ghz Turbo channel 6 */ +static const uint16_t rcl12[] = /* 2.4Ghz Turbo channel 6 */ { 2437 }; -static const u_int16_t rcl13[] = /* dynamic Turbo channels */ +static const uint16_t rcl13[] = /* dynamic Turbo channels */ { 5200, 5240, 5280, 5765, 5805 }; #endif /* ATH_TURBO_SCAN */ struct scanlist { - u_int16_t mode; - u_int16_t count; - const u_int16_t *list; + uint16_t mode; + uint16_t count; + const uint16_t *list; }; #define X(a) .count = sizeof(a)/sizeof(a[0]), .list = a @@ -605,10 +605,10 @@ return 0; } -static u_int8_t +static uint8_t maxrate(const struct ieee80211_scan_entry *se) { - u_int8_t rmax, r; + uint8_t rmax, r; int i; rmax = 0; @@ -639,7 +639,7 @@ if (((_a) ^ (_b)) & (_what)) \ return ((_a) & (_what)) ? 1 : -1; \ } while (0) - u_int8_t maxa, maxb; + uint8_t maxa, maxb; int8_t rssia, rssib; int weight; @@ -695,7 +695,7 @@ #define RV(v) ((v) & IEEE80211_RATE_VAL) const struct ieee80211_rateset *srs; int i, j, nrs, r, okrate, badrate, fixedrate; - const u_int8_t *rs; + const uint8_t *rs; okrate = badrate = fixedrate = 0; @@ -747,7 +747,7 @@ } static int -match_ssid(const u_int8_t *ie, +match_ssid(const uint8_t *ie, int nssid, const struct ieee80211_scan_ssid ssids[]) { int i; @@ -769,8 +769,8 @@ int debug) { struct ieee80211_scan_entry *se = &se0->base; - u_int8_t rate; - int fail; + uint8_t rate; + int fail; fail = 0; if (isclr(ic->ic_chan_active, ieee80211_chan2ieee(ic, se->se_chan))) @@ -963,7 +963,7 @@ * a reference to an entry w/o holding the lock on the table. */ static struct sta_entry * -sta_lookup(struct sta_table *st, const u_int8_t macaddr[IEEE80211_ADDR_LEN]) +sta_lookup(struct sta_table *st, const uint8_t macaddr[IEEE80211_ADDR_LEN]) { struct sta_entry *se; int hash = STA_HASH(macaddr); @@ -983,7 +983,7 @@ struct ieee80211_node *ni = ic->ic_bss; struct sta_table *st = ss->ss_priv; struct sta_entry *se, *selbs; - u_int8_t roamRate, curRate; + uint8_t roamRate, curRate; int8_t roamRssi, curRssi; se = sta_lookup(st, ni->ni_macaddr); @@ -1118,7 +1118,7 @@ static void sta_assoc_fail(struct ieee80211_scan_state *ss, - const u_int8_t macaddr[IEEE80211_ADDR_LEN], int reason) + const uint8_t macaddr[IEEE80211_ADDR_LEN], int reason) { struct sta_table *st = ss->ss_priv; struct sta_entry *se; @@ -1135,7 +1135,7 @@ static void sta_assoc_success(struct ieee80211_scan_state *ss, - const u_int8_t macaddr[IEEE80211_ADDR_LEN]) + const uint8_t macaddr[IEEE80211_ADDR_LEN]) { struct sta_table *st = ss->ss_priv; struct sta_entry *se; @@ -1172,13 +1172,13 @@ * Adhoc mode-specific support. */ -static const u_int16_t adhocWorld[] = /* 36, 40, 44, 48 */ +static const uint16_t adhocWorld[] = /* 36, 40, 44, 48 */ { 5180, 5200, 5220, 5240 }; -static const u_int16_t adhocFcc3[] = /* 36, 40, 44, 48 145, 149, 153, 157, 161, 165 */ +static const uint16_t adhocFcc3[] = /* 36, 40, 44, 48 145, 149, 153, 157, 161, 165 */ { 5180, 5200, 5220, 5240, 5725, 5745, 5765, 5785, 5805, 5825 }; -static const u_int16_t adhocMkk[] = /* 34, 38, 42, 46 */ +static const uint16_t adhocMkk[] = /* 34, 38, 42, 46 */ { 5170, 5190, 5210, 5230 }; -static const u_int16_t adhoc11b[] = /* 10, 11 */ +static const uint16_t adhoc11b[] = /* 10, 11 */ { 2457, 2462 }; static const struct scanlist adhocScanTable[] = { From owner-p4-projects@FreeBSD.ORG Sun May 13 07:02:38 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DBC9916A407; Sun, 13 May 2007 07:02:37 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AE10416A403 for ; Sun, 13 May 2007 07:02:37 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9E47213C45B for ; Sun, 13 May 2007 07:02:37 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4D72bQw071649 for ; Sun, 13 May 2007 07:02:37 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4D72blZ071640 for perforce@freebsd.org; Sun, 13 May 2007 07:02:37 GMT (envelope-from sephe@FreeBSD.org) Date: Sun, 13 May 2007 07:02:37 GMT Message-Id: <200705130702.l4D72blZ071640@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 119759 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, 13 May 2007 07:02:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=119759 Change 119759 by sephe@sephe_zealot:sam_wifi on 2007/05/13 07:02:24 Fix comment. Reviewed by: sam Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_radiotap.h#12 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_radiotap.h#12 (text+ko) ==== @@ -163,15 +163,15 @@ * The first antenna is antenna 0. * * IEEE80211_RADIOTAP_XCHANNEL uint32_t bitmap - * uint16_t MHz - * uint8_t channel number - * uint8_t .5 dBm + * uint16_t MHz + * uint8_t channel number + * int8_t .5 dBm * - * Extended channel specification: flags (see below) followed by - * frequency in MHz, the corresponding IEEE channel number, and - * finally the maximum regulatory transmit power cap in .5 dBm - * units. This property supersedes IEEE80211_RADIOTAP_CHANNEL - * and only one of the two should be present. + * Extended channel specification: flags (see below) followed by + * frequency in MHz, the corresponding IEEE channel number, and + * finally the maximum regulatory transmit power cap in .5 dBm + * units. This property supersedes IEEE80211_RADIOTAP_CHANNEL + * and only one of the two should be present. */ enum ieee80211_radiotap_type { IEEE80211_RADIOTAP_TSFT = 0, From owner-p4-projects@FreeBSD.ORG Sun May 13 07:20:28 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 71CF916A406; Sun, 13 May 2007 07:20:28 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2691016A402 for ; Sun, 13 May 2007 07:20:28 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1511F13C459 for ; Sun, 13 May 2007 07:20:28 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4D7KSnT075179 for ; Sun, 13 May 2007 07:20:28 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4D7KRDK075176 for perforce@freebsd.org; Sun, 13 May 2007 07:20:27 GMT (envelope-from cdjones@FreeBSD.org) Date: Sun, 13 May 2007 07:20:27 GMT Message-Id: <200705130720.l4D7KRDK075176@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 119760 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, 13 May 2007 07:20:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=119760 Change 119760 by cdjones@cdjones_iconoclast on 2007/05/13 07:19:27 Integrate sys/compat, since we need to update the freebsd32_syscalls list. Affected files ... .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/freebsd32/Makefile#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/freebsd32/freebsd32.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/freebsd32/freebsd32_misc.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/freebsd32/freebsd32_proto.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/freebsd32/freebsd32_signal.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/freebsd32/freebsd32_syscall.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/freebsd32/freebsd32_syscalls.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/freebsd32/freebsd32_sysent.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/freebsd32/freebsd32_util.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/freebsd32/syscalls.conf#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/freebsd32/syscalls.master#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/ia32/ia32_genassym.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/ia32/ia32_reg.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/ia32/ia32_signal.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/ia32/ia32_sysvec.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/ia32/ia32_util.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/linprocfs/linprocfs.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/linsysfs/linsysfs.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/linux/linux_emul.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/linux/linux_emul.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/linux/linux_file.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/linux/linux_futex.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/linux/linux_futex.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/linux/linux_getcwd.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/linux/linux_ioctl.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/linux/linux_ioctl.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/linux/linux_ipc.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/linux/linux_ipc.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/linux/linux_mib.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/linux/linux_mib.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/linux/linux_misc.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/linux/linux_misc.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/linux/linux_signal.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/linux/linux_signal.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/linux/linux_socket.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/linux/linux_socket.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/linux/linux_stats.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/linux/linux_sysctl.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/linux/linux_sysproto.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/linux/linux_time.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/linux/linux_uid16.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/linux/linux_util.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/linux/linux_util.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/ndis/cfg_var.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/ndis/hal_var.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/ndis/kern_ndis.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/ndis/kern_windrv.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/ndis/ndis_var.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/ndis/ntoskrnl_var.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/ndis/pe_var.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/ndis/resource_var.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/ndis/subr_hal.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/ndis/subr_ndis.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/ndis/subr_ntoskrnl.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/ndis/subr_pe.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/ndis/subr_usbd.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/ndis/usbd_var.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/ndis/winx32_wrap.S#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/ndis/winx64_wrap.S#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/netbsd/dvcfg.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/netbsd/physio_proc.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/kern/opensolaris_kstat.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/kern/opensolaris_misc.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/kern/opensolaris_policy.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/kern/opensolaris_string.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/kern/opensolaris_zone.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/machine/endian.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/rpc/xdr.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/sys/acl.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/sys/byteorder.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/sys/callb.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/sys/cmn_err.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/sys/cred.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/sys/debug.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/sys/dirent.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/sys/dkio.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/sys/kcondvar.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/sys/kmem.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/sys/kobj.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/sys/kstat.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/sys/lock.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/sys/misc.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/sys/mntent.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/sys/mnttab.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/sys/mount.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/sys/mutex.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/sys/policy.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/sys/proc.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/sys/random.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/sys/rwlock.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/sys/sdt.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/sys/string.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/sys/sunddi.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/sys/sysmacros.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/sys/systm.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/sys/taskq.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/sys/taskq_impl.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/sys/time.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/sys/types.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/sys/uio.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/sys/varargs.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/sys/vfs.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/sys/vnode.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/opensolaris/sys/zone.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/pecoff/imgact_pecoff.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/pecoff/imgact_pecoff.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/Makefile#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/imgact_svr4.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_acl.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_dirent.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_errno.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_exec.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_fcntl.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_fcntl.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_filio.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_filio.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_fuser.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_hrt.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_ioctl.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_ioctl.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_ipc.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_ipc.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_misc.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_mman.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_proto.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_resource.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_resource.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_siginfo.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_signal.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_signal.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_socket.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_socket.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_sockio.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_sockio.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_sockmod.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_stat.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_stat.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_statvfs.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_stream.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_stropts.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_syscall.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_syscallnames.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_sysconfig.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_sysent.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_systeminfo.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_sysvec.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_termios.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_termios.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_time.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_timod.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_ttold.c#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_ttold.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_types.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_ucontext.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_ulimit.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_ustat.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_util.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_utsname.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/svr4_wait.h#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/syscalls.conf#1 branch .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/svr4/syscalls.master#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sun May 13 08:27:53 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B0B916A408; Sun, 13 May 2007 08:27:53 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9626716A405 for ; Sun, 13 May 2007 08:27:52 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8037313C489 for ; Sun, 13 May 2007 08:27:52 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4D8Rqt3088091 for ; Sun, 13 May 2007 08:27:52 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4D8RqZG088088 for perforce@freebsd.org; Sun, 13 May 2007 08:27:52 GMT (envelope-from cdjones@FreeBSD.org) Date: Sun, 13 May 2007 08:27:52 GMT Message-Id: <200705130827.l4D8RqZG088088@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 119762 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, 13 May 2007 08:27:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=119762 Change 119762 by cdjones@cdjones_iconoclast on 2007/05/13 08:27:07 Well, it compiles and links --- and runs (without jails) okay. Now, to test.... Affected files ... .. //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/freebsd32/syscalls.master#2 edit .. //depot/projects/soc2006/cdjones_jail_current/src/sys/kern/kern_jail.c#2 edit .. //depot/projects/soc2006/cdjones_jail_current/src/sys/kern/kern_mib.c#2 integrate .. //depot/projects/soc2006/cdjones_jail_current/src/sys/kern/sched_4bsd.c#2 edit .. //depot/projects/soc2006/cdjones_jail_current/src/sys/kern/syscalls.master#2 edit .. //depot/projects/soc2006/cdjones_jail_current/src/sys/sys/jail.h#2 edit .. //depot/projects/soc2006/cdjones_jail_current/src/sys/vm/vm_pageout.c#2 edit .. //depot/projects/soc2006/cdjones_jail_current/src/sys/vm/vm_pageout.h#2 edit .. //depot/projects/soc2006/cdjones_jail_current/src/usr.sbin/jail/jail.8#2 edit .. //depot/projects/soc2006/cdjones_jail_current/src/usr.sbin/jail/jail.c#2 edit .. //depot/projects/soc2006/cdjones_jail_current/src/usr.sbin/jls/jls.8#2 edit .. //depot/projects/soc2006/cdjones_jail_current/src/usr.sbin/jtune/Makefile#1 add .. //depot/projects/soc2006/cdjones_jail_current/src/usr.sbin/jtune/jtune.8#1 add .. //depot/projects/soc2006/cdjones_jail_current/src/usr.sbin/jtune/jtune.c#1 add Differences ... ==== //depot/projects/soc2006/cdjones_jail_current/src/sys/compat/freebsd32/syscalls.master#2 (text+ko) ==== @@ -781,3 +781,5 @@ 474 AUE_NULL NOPROTO { int sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, \ struct sockaddr * from, __socklen_t *fromlenaddr, \ struct sctp_sndrcvinfo *sinfo, int *msg_flags); } +475 AUE_NULL STD { int jail_set_resource_limits(unsigned int jid, \ + int cpushares, int memlimit); } ==== //depot/projects/soc2006/cdjones_jail_current/src/sys/kern/kern_jail.c#2 (text+ko) ==== @@ -5,6 +5,35 @@ * can do whatever you want with this stuff. If we meet some day, and you think * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- + * + * Portions copyright (c) 2006 Chris Jones + * All rights reserved. + * + * This software was developed for the FreeBSD Project by Chris Jones + * thanks to the support of Google's Summer of Code program and + * mentoring by Kip Macy. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 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. + * + * THIS SOFTWARE IS PROVIDED BY AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + * */ #include @@ -15,6 +44,7 @@ #include #include #include +#include #include #include #include @@ -33,6 +63,10 @@ #include #include #include +#include +#include +#include +#include #include #include @@ -78,6 +112,17 @@ &jail_mount_allowed, 0, "Processes in jail can mount/unmount jail-friendly file systems"); +int jail_limit_memory = 0; +SYSCTL_INT(_security_jail, OID_AUTO, limit_jail_memory, CTLFLAG_RW, + &jail_limit_memory, 0, + "Limit jails' memory usage"); + +int jail_memory_pager_interval = 5; +SYSCTL_INT(_security_jail, OID_AUTO, jail_pager_interval, + CTLTYPE_INT | CTLFLAG_RW, + &jail_memory_pager_interval, 0, + "Interval between jail memory limit checks"); + /* allprison, lastprid, and prisoncount are protected by allprison_lock. */ struct prisonlist allprison; struct sx allprison_lock; @@ -114,6 +159,99 @@ SYSINIT(prison, SI_SUB_INTRINSIC, SI_ORDER_ANY, init_prison, NULL); +static void +jpager_td(void *arg) +{ + struct proc *p; + struct prison *pr = arg; + struct thread *td; + long limit, cursize, newsize, usage; + int breakout; + int flags = J_PAGER_TD_ACTIVE; + pr->pr_pager_flags_ptr = &flags; + + for (;;) { + if (flags & J_PAGER_TD_DIE) + break; + + if (jail_limit_memory && pr->pr_mem_limit) { + /* + * TODO: consider whether it might be better to start + * pushing back when we approach the limit, rather than + * when we hit it. + * + */ + limit = prison_memory_limit(pr); + usage = prison_memory(pr); + + /* + * The logic from vm_daemon() really needs to go here. + * Problem: we want to push things below their rlimits, + * and vm_daemon doesn't do that. It'd be better to + * refactor vm_daemon to fit, but this'll do for now. + * + */ + + if ((usage - limit) > 0) { + sx_slock(&allproc_lock); + LIST_FOREACH(p, &allproc, p_list) { + + if (pr != p->p_ucred->cr_prison) + continue; + + PROC_LOCK(p); + if (p->p_flag & (P_SYSTEM | P_WEXIT)) { + PROC_UNLOCK(p); + continue; + } + + mtx_lock_spin(&sched_lock); + breakout = 0; + FOREACH_THREAD_IN_PROC(p, td) { + if (!TD_ON_RUNQ(td) && + !TD_IS_RUNNING(td) && + !TD_IS_SLEEPING(td)) { + breakout = 1; + break; + } + } + mtx_unlock_spin(&sched_lock); + if (breakout) { + PROC_UNLOCK(p); + continue; + } + + /* NOTE: we differ here from vm_daemon b/c we don't + * care about the rlimit; things that are exceeding that will + * get caught in due course. We need, however, to decrease + * the pressure on our permitted memory allocation. Fortunately, + * we only care about eventually hitting the limit, so if we + * don't get there right away, it's okay. + */ + + /* TODO: this arbitrarily reduces each process's space by + * 6.25% (until it's completely swapped out) while + * we're under memory pressure. A better way would be + * to either hit large processes first, or to hit the + * least-active processes first, or go proportionally, + * or .... + */ + newsize = cursize = vmspace_resident_count(p->p_vmspace); + newsize -= newsize / 16; + if (cursize < 0) + newsize = 0; + PROC_UNLOCK(p); + vm_pageout_map_deactivate_pages(&p->p_vmspace->vm_map, newsize); + } /* end LIST_FOREACH procs */ + sx_sunlock(&allproc_lock); + } + } + tsleep(pr, 0, "-", jail_memory_pager_interval * hz); + } + + kthread_exit(0); +} + /* * struct jail_args { * struct jail *jail; @@ -126,6 +264,7 @@ struct prison *pr, *tpr; struct prison_service *psrv; struct jail j; + struct proc *j_pager_proc = NULL; struct jail_attach_args jaa; int vfslocked, error, tryprid; @@ -156,6 +295,8 @@ goto e_dropvnref; pr->pr_ip = j.ip_number; pr->pr_linux = NULL; + pr->pr_mem_limit = j.mem_limit; + pr->pr_sched_shares = j.sched_shares; pr->pr_securelevel = securelevel; if (prison_service_slots == 0) pr->pr_slots = NULL; @@ -190,6 +331,11 @@ } sx_sunlock(&allprison_lock); + if (kthread_create(jpager_td, pr, (void *) j_pager_proc, 0, 0, "jpager %d", pr->pr_id)) + goto e_dropprref; + KASSERT(j_pager_proc != NULL, ("NULL j_pager_proc")); + pr->pr_pager = j_pager_proc; + error = jail_attach(td, &jaa); if (error) goto e_dropprref; @@ -199,6 +345,10 @@ td->td_retval[0] = jaa.jid; return (0); e_dropprref: + if (j_pager_proc != NULL) { + *pr->pr_pager_flags_ptr = J_PAGER_TD_DIE; + wakeup(pr); + } sx_xlock(&allprison_lock); LIST_REMOVE(pr, pr_list); prisoncount--; @@ -314,6 +464,9 @@ pr->pr_ref--; if (pr->pr_ref == 0) { mtx_unlock(&pr->pr_mtx); + /* Kill pager; no need to wait. */ + *pr->pr_pager_flags_ptr = J_PAGER_TD_DIE; + wakeup(pr); TASK_INIT(&pr->pr_task, 0, prison_complete, pr); taskqueue_enqueue(taskqueue_thread, &pr->pr_task); return; @@ -435,6 +588,40 @@ ok = 0; return (ok); } +/* Given credential, return memory usage in bytes. */ +long +prison_memory(struct prison *pr) +{ + struct proc *p; + long mem_used = 0; + + /* + * TODO: this is a really bad way of doing the + * search, as we end up going across all processes + * for each jail. It'd be more efficient to just do + * this once in a period and update the relevant jail. + * + */ + FOREACH_PROC_IN_SYSTEM(p) { + if (!jailed(p->p_ucred) || + (pr != p->p_ucred->cr_prison)) + continue; + mem_used += vmspace_resident_count(p->p_vmspace); + } + mem_used *= PAGE_SIZE; + return mem_used; +} + +/* Given credential, return permitted memory usage in bytes. */ +long +prison_memory_limit(struct prison *pr) +{ + vm_pindex_t memlimit; + mtx_lock(&pr->pr_mtx); + memlimit = (vm_pindex_t) pr->pr_mem_limit; + mtx_unlock(&pr->pr_mtx); + return memlimit; +} /* * Return 0 if jails permit p1 to frob p2, otherwise ESRCH. @@ -566,6 +753,52 @@ } } +/* + * Change resource limit for a prison. + * + * unsigned int jid: id of jail to mess with + * + * int cpushares: 0 -> remove prison from cpu limits + * -1 -> don't change existing shares + * >0 -> set cpu shares + * + * int memlimit: 0 -> remove prison from mem limits + * -1 -> don't change existing limit + * >1 -> set memory limit (bytes) + * + * TODO: might this be better handled via a writable + * sysctl than with a new syscall? + */ +int +jail_set_resource_limits(struct thread *td, struct jail_set_resource_limits_args *uap) +{ + struct prison *pr; + int error; + + error = suser(td); + if (error) + return (error); + + sx_slock(&allprison_lock); + LIST_FOREACH(pr, &allprison, pr_list) { + if (pr->pr_id == uap->jid) + break; + } + if (NULL == pr) { + sx_sunlock(&allprison_lock); + return 1; + } + + mtx_lock(&pr->pr_mtx); + if (-1 != uap->cpushares) + pr->pr_sched_shares = uap->cpushares; + if (-1 != uap->memlimit) + pr->pr_mem_limit = uap->memlimit; + mtx_unlock(&pr->pr_mtx); + sx_sunlock(&allprison_lock); + return 0; +} + /* * Check with permission for a specific privilege is granted within jail. We * have a specific list of accepted privileges; the rest are denied. @@ -954,6 +1187,10 @@ xp->pr_version = XPRISON_VERSION; xp->pr_id = pr->pr_id; xp->pr_ip = pr->pr_ip; + xp->pr_sched_shares = pr->pr_sched_shares; + xp->pr_estcpu = pr->pr_estcpu; + xp->pr_mem_limit = pr->pr_mem_limit; + xp->pr_mem_usage = pr->pr_mem_usage; strlcpy(xp->pr_path, pr->pr_path, sizeof(xp->pr_path)); mtx_lock(&pr->pr_mtx); strlcpy(xp->pr_host, pr->pr_host, sizeof(xp->pr_host)); ==== //depot/projects/soc2006/cdjones_jail_current/src/sys/kern/kern_mib.c#2 (text+ko) ==== @@ -36,12 +36,13 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/kern_mib.c,v 1.77 2007/04/09 19:18:09 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_mib.c,v 1.78 2007/05/12 19:38:18 wkoszek Exp $"); #include "opt_posix.h" #include #include +#include #include #include #include @@ -295,6 +296,38 @@ CTLTYPE_INT|CTLFLAG_RW|CTLFLAG_PRISON, 0, 0, sysctl_kern_securelvl, "I", "Current secure level"); +/* Actual kernel configuration options. */ +extern char kernconfstring[]; + +static int +sysctl_kern_config(SYSCTL_HANDLER_ARGS) +{ + struct sbuf *sb; + int error; + char *p; + + sb = sbuf_new(NULL, NULL, 2048, SBUF_AUTOEXTEND); + if (sb == NULL) + return (ENOMEM); + sbuf_clear(sb); + p = kernconfstring; + if (p == NULL || *p == '\0') { + sbuf_printf(sb, "No kernel configuration\n"); + } else { + sbuf_printf(sb, "%s", p); + } + sbuf_trim(sb); + sbuf_putc(sb, '\n'); + sbuf_finish(sb); + error = sysctl_handle_string(oidp, sbuf_data(sb), sbuf_len(sb), req); + if (error) + return (error); + sbuf_delete(sb); + return (error); +} +SYSCTL_PROC(_kern, OID_AUTO, conftxt, CTLTYPE_STRING|CTLFLAG_RW, + 0, 0, sysctl_kern_config, "", "Kernel configuration file"); + char domainname[MAXHOSTNAMELEN]; SYSCTL_STRING(_kern, KERN_NISDOMAINNAME, domainname, CTLFLAG_RW, &domainname, sizeof(domainname), "Name of the current YP/NIS domain"); ==== //depot/projects/soc2006/cdjones_jail_current/src/sys/kern/sched_4bsd.c#2 (text+ko) ==== @@ -39,6 +39,7 @@ #include #include +#include #include #include #include @@ -122,6 +123,10 @@ static int forward_wakeup(int cpunum); #endif +static uint32_t total_cpu_sched_shares; +static u_int total_est_cpu; +extern int prisoncount; + static struct kproc_desc sched_kp = { "schedcpu", schedcpu_thread, @@ -227,6 +232,18 @@ "allow threads to share a quantum"); #endif +static int sched_limitjailcpu = 0; +SYSCTL_INT(_kern_sched, OID_AUTO, limit_jail_cpu, + CTLFLAG_RW, + &sched_limitjailcpu, 0, + "limit jailed process cpu usage"); + +static int sched_unjailedProcessShares = 0; +SYSCTL_INT(_kern_sched, OID_AUTO, system_cpu_shares, + CTLTYPE_INT | CTLFLAG_RW, + &sched_unjailedProcessShares, 0, + "number of shares to allocate to unjailed processes"); + static __inline void sched_load_add(void) { @@ -372,10 +389,23 @@ struct thread *td; struct proc *p; struct td_sched *ts; + struct prison *pr; int awake, realstathz; realstathz = stathz ? stathz : hz; + /* + * Need to acquire each jail's mutex and hold throughout to keep + * everything out while we recalculate per-jail CPU usage. + * TODO: this is excessively icky. + */ sx_slock(&allproc_lock); + sx_slock(&allprison_lock); + if (prisoncount) { + LIST_FOREACH(pr, &allprison, pr_list) { + pr->pr_estcpu = 0; + } + } + total_est_cpu = 0; FOREACH_PROC_IN_SYSTEM(p) { /* * Prevent state changes and protect run queue. @@ -459,11 +489,18 @@ if (td->td_slptime > 1) continue; td->td_estcpu = decay_cpu(loadfac, td->td_estcpu); + total_est_cpu += td->td_estcpu; + if (sched_limitjailcpu && + NULL != td->td_proc->p_ucred && + NULL != td->td_proc->p_ucred->cr_prison) + td->td_proc->p_ucred->cr_prison->pr_estcpu += + td->td_estcpu; resetpriority(td); resetpriority_thread(td); } /* end of thread loop */ mtx_unlock_spin(&sched_lock); } /* end of process loop */ + sx_sunlock(&allprison_lock); sx_sunlock(&allproc_lock); } @@ -473,8 +510,29 @@ static void schedcpu_thread(void) { +struct prison *pr; +u_int32_t shares = 0; for (;;) { + if (sched_limitjailcpu) { + /* + * Update total jail CPU shares in case they've changed. + * Safe to read pr_sched_shares without mutex because + * in worst case, we get a bogus value which will be + * corrected on the next pass. + * + * TODO: this should be done by forcing a recalculation + * when jail CPU shares are added / changed, rather than + * doing it every second. + */ + + shares = sched_unjailedProcessShares; + LIST_FOREACH(pr, &allprison, pr_list) { + shares += pr->pr_sched_shares; + } + total_cpu_sched_shares = shares; + } + schedcpu(); pause("-", hz); } @@ -512,12 +570,37 @@ resetpriority(struct thread *td) { register unsigned int newpriority; + struct prison *pr = NULL; + if (NULL != td->td_proc->p_ucred) + pr = td->td_proc->p_ucred->cr_prison; if (td->td_pri_class == PRI_TIMESHARE) { newpriority = PUSER + td->td_estcpu / INVERSE_ESTCPU_WEIGHT + NICE_WEIGHT * (td->td_proc->p_nice - PRIO_MIN); - newpriority = min(max(newpriority, PRI_MIN_TIMESHARE), - PRI_MAX_TIMESHARE); + if (sched_limitjailcpu && NULL != pr) { + /* + * Skew the priority by the jail's share of CPU resources. + * The unjailed processes get half the CPU time. + * + * TODO: this is a hard limit. We should really also have + * soft limits available. Also, the amount of CPU time + * reserved to unjailed processes really should be sysctl'd. + */ + register unsigned int skew; + skew = pr->pr_estcpu * total_cpu_sched_shares; + skew /= max(total_est_cpu, 1) * max(pr->pr_sched_shares, 1); + if (skew > 0) { + /* wait your turn until your cpu usage's proportionate */ + newpriority = PRI_MAX_IDLE - 1; + } else { + newpriority = min(max(newpriority, PRI_MIN_TIMESHARE), + PRI_MAX_TIMESHARE); + } + } else { + newpriority = min(max(newpriority, PRI_MIN_TIMESHARE), + PRI_MAX_TIMESHARE); + } + sched_user_prio(td, newpriority); } } ==== //depot/projects/soc2006/cdjones_jail_current/src/sys/kern/syscalls.master#2 (text+ko) ==== @@ -835,5 +835,8 @@ 474 AUE_NULL STD { int sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, \ struct sockaddr * from, __socklen_t *fromlenaddr, \ struct sctp_sndrcvinfo *sinfo, int *msg_flags); } +475 AUE_NULL STD { int jail_set_resource_limits(unsigned int jid, \ + int cpushares, int memlimit); } + ; Please copy any additions and changes to the following compatability tables: ; sys/compat/freebsd32/syscalls.master ==== //depot/projects/soc2006/cdjones_jail_current/src/sys/sys/jail.h#2 (text+ko) ==== @@ -18,6 +18,8 @@ char *path; char *hostname; u_int32_t ip_number; + unsigned int sched_shares; + unsigned int mem_limit; }; struct xprison { @@ -26,13 +28,24 @@ char pr_path[MAXPATHLEN]; char pr_host[MAXHOSTNAMELEN]; u_int32_t pr_ip; + unsigned int pr_sched_shares; + unsigned int pr_estcpu; + unsigned int pr_mem_limit; + unsigned int pr_mem_usage; }; -#define XPRISON_VERSION 1 +#define XPRISON_VERSION 2 + +#define JAIL_MINIMUM_SHARES 1 + +#define J_PAGER_TD_ACTIVE 0x01 +#define J_PAGER_TD_DIE 0x02 +#define J_PAGER_TD_DEAD 0x04 #ifndef _KERNEL int jail(struct jail *); int jail_attach(int); +int jail_set_resource_limits(unsigned int, int, int); #else /* _KERNEL */ @@ -74,6 +87,12 @@ struct task pr_task; /* (d) destroy task */ struct mtx pr_mtx; void **pr_slots; /* (p) additional data */ + u_int32_t pr_sched_shares; /* (p) jail priority */ + u_int pr_estcpu; /* (p) est. cpu of jail */ + struct proc *pr_pager; /* (c) pager pid */ + int *pr_pager_flags_ptr; /* (p) communication to pager */ + size_t pr_mem_limit; /* (p) memory allocation limit */ + size_t pr_mem_usage; /* (p) memory in use */ }; #endif /* _KERNEL || _WANT_PRISON */ @@ -114,6 +133,8 @@ int prison_if(struct ucred *cred, struct sockaddr *sa); int prison_ip(struct ucred *cred, int flag, u_int32_t *ip); int prison_priv_check(struct ucred *cred, int priv); +long prison_memory(struct prison *pr); +long prison_memory_limit(struct prison *pr); void prison_remote_ip(struct ucred *cred, int flags, u_int32_t *ip); /* ==== //depot/projects/soc2006/cdjones_jail_current/src/sys/vm/vm_pageout.c#2 (text+ko) ==== @@ -204,7 +204,6 @@ int vm_page_max_wired; /* XXX max # of wired pages system-wide */ #if !defined(NO_SWAPPING) -static void vm_pageout_map_deactivate_pages(vm_map_t, long); static void vm_pageout_object_deactivate_pages(pmap_t, vm_object_t, long); static void vm_req_vmdaemon(void); #endif @@ -596,7 +595,7 @@ * deactivate some number of pages in a map, try to do it fairly, but * that is really hard to do. */ -static void +void vm_pageout_map_deactivate_pages(map, desired) vm_map_t map; long desired; ==== //depot/projects/soc2006/cdjones_jail_current/src/sys/vm/vm_pageout.h#2 (text+ko) ==== @@ -87,6 +87,8 @@ * Exported routines. */ +void vm_pageout_map_deactivate_pages(vm_map_t map, long desired); + /* * Signal pageout-daemon and wait for it. */ ==== //depot/projects/soc2006/cdjones_jail_current/src/usr.sbin/jail/jail.8#2 (text+ko) ==== @@ -45,6 +45,8 @@ .Op Fl J Ar jid_file .Op Fl s Ar securelevel .Op Fl l u Ar username | Fl U Ar username +.Op Fl S Ar cpu_shares +.Op Fl M Ar mem_limit .Ar path hostname ip-number command ... .Sh DESCRIPTION The @@ -88,6 +90,10 @@ The user name from jailed environment as whom the .Ar command should run. +.It Fl S Ar cpu_shares +CPU shares to assign to the prison. +.It Fl M Ar mem_limit +Amount of memory (in MB) to allow the prison to use. .It Ar path Directory which is to be the root of the prison. .It Ar hostname @@ -546,6 +552,17 @@ privileged, and may manipulate system file flags subject to the usual constraints on .Va kern.securelevel . +.It Va security.jail.limit_jail_memory, Va security.jail.jail_pager_interval +These MIB entries determine whether and how often (in seconds) a +jail's memory-limit monitoring daemon will run, and consequently the +period during which a jail can be overcommitted for resident memory. +.It Va kern.sched.limit_jail_cpu +This MIB entry sets whether CPU usage limits will be enforced +against processes in jails with CPU limits. +.It Va kern.sched.system_cpu_shares +Number of CPU usage shares to allocate to unjailed processes for the +purposes of determining CPU usage permitted for jailed processes. +Unjailed processes are not subject to CPU usage limits. .It Va security.jail.mount_allowed This MIB entry determines if a privileged user inside a jail will be able to mount and unmount file system types marked as jail-friendly. ==== //depot/projects/soc2006/cdjones_jail_current/src/usr.sbin/jail/jail.c#2 (text+ko) ==== @@ -56,6 +56,8 @@ struct in_addr in; gid_t groups[NGROUPS]; int ch, i, iflag, Jflag, lflag, ngroups, securelevel, uflag, Uflag; + unsigned int mem_limit = 0; + unsigned int sched_shares = 0; char path[PATH_MAX], *ep, *username, *JidFile; static char *cleanenv; const char *shell, *p = NULL; @@ -67,7 +69,7 @@ username = JidFile = cleanenv = NULL; fp = NULL; - while ((ch = getopt(argc, argv, "ils:u:U:J:")) != -1) { + while ((ch = getopt(argc, argv, "ilS:M:s:u:U:J:")) != -1) { switch (ch) { case 'i': iflag = 1; @@ -76,6 +78,13 @@ JidFile = optarg; Jflag = 1; break; + case 'M': + mem_limit = atoi(optarg); + mem_limit *= 1024 * 1024; + break; + case 'S': + sched_shares = atoi(optarg); + break; case 's': ltmp = strtol(optarg, &ep, 0); if (*ep || ep == optarg || ltmp > INT_MAX || !ltmp) @@ -118,6 +127,8 @@ if (inet_aton(argv[2], &in) == 0) errx(1, "Could not make sense of ip-number: %s", argv[2]); j.ip_number = ntohl(in.s_addr); + j.mem_limit = mem_limit; + j.sched_shares = sched_shares; if (Jflag) { fp = fopen(JidFile, "w"); if (fp == NULL) @@ -183,7 +194,8 @@ { (void)fprintf(stderr, "%s%s%s\n", - "usage: jail [-i] [-J jid_file] [-s securelevel] [-l -u ", + "usage: jail [-i] [-J jid_file] [-M mem_limit] ", + "[-S cpu_shares] [-s securelevel] [-l -u ", "username | -U username]", " path hostname ip-number command ..."); exit(1); ==== //depot/projects/soc2006/cdjones_jail_current/src/usr.sbin/jls/jls.8#2 (text+ko) ==== @@ -42,7 +42,8 @@ .Sh SEE ALSO .Xr jail 2 , .Xr jail 8 , -.Xr jexec 8 +.Xr jexec 8 , +.Xr jtune 8 .Sh HISTORY The .Nm From owner-p4-projects@FreeBSD.ORG Sun May 13 12:09:48 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E575516A406; Sun, 13 May 2007 12:09:47 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9CBB716A404 for ; Sun, 13 May 2007 12:09:47 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8B3EA13C448 for ; Sun, 13 May 2007 12:09:47 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4DC9l2f036682 for ; Sun, 13 May 2007 12:09:47 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4DC9ggB036679 for perforce@freebsd.org; Sun, 13 May 2007 12:09:42 GMT (envelope-from sephe@FreeBSD.org) Date: Sun, 13 May 2007 12:09:42 GMT Message-Id: <200705131209.l4DC9ggB036679@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 119766 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, 13 May 2007 12:09:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=119766 Change 119766 by sephe@sephe_zealot:sam_wifi on 2007/05/13 12:09:15 - IFC 119758 - Make rum(4) work. Affected files ... .. //depot/projects/wifi/ObsoleteFiles.inc#15 integrate .. //depot/projects/wifi/bin/mv/mv.1#4 integrate .. //depot/projects/wifi/cddl/lib/libzfs/Makefile#3 integrate .. //depot/projects/wifi/compat/opensolaris/include/devid.h#2 integrate .. //depot/projects/wifi/compat/opensolaris/misc/deviceid.c#1 branch .. //depot/projects/wifi/contrib/amd/amq/amq.8#3 integrate .. //depot/projects/wifi/contrib/opensolaris/cmd/zpool/zpool_vdev.c#2 integrate .. //depot/projects/wifi/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 integrate .. //depot/projects/wifi/lib/libc/gdtoa/_hdtoa.c#4 integrate .. //depot/projects/wifi/lib/libc/sparc64/Symbol.map#3 integrate .. //depot/projects/wifi/lib/libc/stdio/vfprintf.c#8 integrate .. //depot/projects/wifi/lib/libfetch/http.c#5 integrate .. //depot/projects/wifi/lib/libgeom/Makefile#2 integrate .. //depot/projects/wifi/lib/libgeom/geom_util.c#1 branch .. //depot/projects/wifi/lib/libgeom/libgeom.3#3 integrate .. //depot/projects/wifi/lib/libgeom/libgeom.h#2 integrate .. //depot/projects/wifi/lib/libipsec/pfkey_dump.c#2 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_init.c#10 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_mutex.c#8 integrate .. //depot/projects/wifi/lib/libthr/thread/thr_umtx.c#4 integrate .. //depot/projects/wifi/lib/libutil/Makefile#5 integrate .. //depot/projects/wifi/lib/libutil/flopen.3#1 branch .. //depot/projects/wifi/lib/libutil/flopen.c#1 branch .. //depot/projects/wifi/lib/libutil/libutil.h#4 integrate .. //depot/projects/wifi/lib/libutil/pidfile.c#3 integrate .. //depot/projects/wifi/libexec/rtld-elf/rtld.1#7 integrate .. //depot/projects/wifi/libexec/rtld-elf/rtld.c#14 integrate .. //depot/projects/wifi/release/Makefile#19 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#23 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/installation/common/install.sgml#7 integrate .. //depot/projects/wifi/release/doc/en_US.ISO8859-1/relnotes/article.sgml#8 integrate .. //depot/projects/wifi/release/doc/share/misc/dev.archlist.txt#22 integrate .. //depot/projects/wifi/sbin/dumpfs/dumpfs.8#3 integrate .. //depot/projects/wifi/sbin/fdisk/fdisk.c#9 integrate .. //depot/projects/wifi/sbin/fdisk_pc98/fdisk.8#5 integrate .. //depot/projects/wifi/sbin/geom/class/eli/geom_eli.c#10 integrate .. //depot/projects/wifi/sbin/geom/class/multipath/gmultipath.8#2 integrate .. //depot/projects/wifi/sbin/ipfw/ipfw2.c#19 integrate .. //depot/projects/wifi/sbin/setkey/setkey.8#5 integrate .. //depot/projects/wifi/sbin/setkey/token.l#2 integrate .. //depot/projects/wifi/secure/lib/libcrypto/Makefile#10 integrate .. //depot/projects/wifi/secure/lib/libcrypto/Makefile.inc#6 integrate .. //depot/projects/wifi/secure/lib/libcrypto/opensslconf-amd64.h#4 integrate .. //depot/projects/wifi/secure/lib/libcrypto/opensslconf-i386.h#4 integrate .. //depot/projects/wifi/share/man/man4/Makefile#35 integrate .. //depot/projects/wifi/share/man/man4/altq.4#16 integrate .. //depot/projects/wifi/share/man/man4/axe.4#6 integrate .. //depot/projects/wifi/share/man/man4/hptiop.4#1 branch .. //depot/projects/wifi/share/man/man4/md.4#3 integrate .. //depot/projects/wifi/share/man/man4/rum.4#1 branch .. //depot/projects/wifi/share/man/man4/snd_atiixp.4#3 integrate .. //depot/projects/wifi/share/man/man4/snd_hda.4#4 integrate .. //depot/projects/wifi/share/man/man4/snd_via8233.4#6 integrate .. //depot/projects/wifi/share/man/man4/twa.4#5 integrate .. //depot/projects/wifi/share/man/man4/ubsa.4#4 integrate .. //depot/projects/wifi/share/man/man4/vlan.4#13 integrate .. //depot/projects/wifi/share/man/man5/passwd.5#5 integrate .. //depot/projects/wifi/share/man/man9/VFS_SYNC.9#5 integrate .. //depot/projects/wifi/share/man/man9/VOP_FSYNC.9#4 integrate .. //depot/projects/wifi/share/man/man9/disk.9#4 integrate .. //depot/projects/wifi/share/man/man9/g_bio.9#3 integrate .. //depot/projects/wifi/share/man/man9/make_dev.9#7 integrate .. //depot/projects/wifi/share/mklocale/ja_JP.eucJP.src#3 integrate .. //depot/projects/wifi/sys/amd64/acpica/madt.c#10 integrate .. //depot/projects/wifi/sys/amd64/amd64/intr_machdep.c#14 integrate .. //depot/projects/wifi/sys/amd64/amd64/io_apic.c#11 integrate .. //depot/projects/wifi/sys/amd64/amd64/local_apic.c#15 integrate .. //depot/projects/wifi/sys/amd64/amd64/mp_machdep.c#19 integrate .. //depot/projects/wifi/sys/amd64/amd64/mptable.c#8 integrate .. //depot/projects/wifi/sys/amd64/amd64/msi.c#5 integrate .. //depot/projects/wifi/sys/amd64/amd64/nexus.c#12 integrate .. //depot/projects/wifi/sys/amd64/conf/GENERIC#19 integrate .. //depot/projects/wifi/sys/amd64/conf/NOTES#21 integrate .. //depot/projects/wifi/sys/amd64/include/apicvar.h#12 integrate .. //depot/projects/wifi/sys/amd64/include/intr_machdep.h#11 integrate .. //depot/projects/wifi/sys/amd64/include/vmparam.h#4 integrate .. //depot/projects/wifi/sys/amd64/isa/atpic.c#8 integrate .. //depot/projects/wifi/sys/amd64/linux32/linux32_machdep.c#13 integrate .. //depot/projects/wifi/sys/arm/include/vmparam.h#5 integrate .. //depot/projects/wifi/sys/boot/common/loader.8#11 integrate .. //depot/projects/wifi/sys/conf/Makefile.amd64#8 integrate .. //depot/projects/wifi/sys/conf/Makefile.arm#12 integrate .. //depot/projects/wifi/sys/conf/Makefile.i386#8 integrate .. //depot/projects/wifi/sys/conf/Makefile.ia64#7 integrate .. //depot/projects/wifi/sys/conf/Makefile.pc98#8 integrate .. //depot/projects/wifi/sys/conf/Makefile.powerpc#9 integrate .. //depot/projects/wifi/sys/conf/Makefile.sparc64#7 integrate .. //depot/projects/wifi/sys/conf/Makefile.sun4v#2 integrate .. //depot/projects/wifi/sys/conf/NOTES#37 integrate .. //depot/projects/wifi/sys/conf/files#47 integrate .. //depot/projects/wifi/sys/conf/options#31 integrate .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#3 integrate .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 integrate .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 integrate .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 integrate .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate .. //depot/projects/wifi/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#3 integrate .. //depot/projects/wifi/sys/crypto/camellia/camellia-api.c#1 branch .. //depot/projects/wifi/sys/crypto/camellia/camellia.c#1 branch .. //depot/projects/wifi/sys/crypto/camellia/camellia.h#1 branch .. //depot/projects/wifi/sys/dev/acpica/acpi.c#24 integrate .. //depot/projects/wifi/sys/dev/ata/ata-disk.c#18 integrate .. //depot/projects/wifi/sys/dev/em/if_em.c#22 integrate .. //depot/projects/wifi/sys/dev/firewire/sbp_targ.c#6 integrate .. //depot/projects/wifi/sys/dev/hptiop/hptiop.c#1 branch .. //depot/projects/wifi/sys/dev/hptiop/hptiop.h#1 branch .. //depot/projects/wifi/sys/dev/isp/isp.c#11 integrate .. //depot/projects/wifi/sys/dev/isp/isp_freebsd.c#13 integrate .. //depot/projects/wifi/sys/dev/isp/isp_freebsd.h#12 integrate .. //depot/projects/wifi/sys/dev/isp/isp_pci.c#13 integrate .. //depot/projects/wifi/sys/dev/isp/isp_sbus.c#8 integrate .. //depot/projects/wifi/sys/dev/isp/isp_tpublic.h#8 integrate .. //depot/projects/wifi/sys/dev/mfi/mfi.c#5 integrate .. //depot/projects/wifi/sys/dev/mfi/mfi_disk.c#3 integrate .. //depot/projects/wifi/sys/dev/mfi/mfi_ioctl.h#3 integrate .. //depot/projects/wifi/sys/dev/mfi/mfi_pci.c#4 integrate .. //depot/projects/wifi/sys/dev/mfi/mfivar.h#3 integrate .. //depot/projects/wifi/sys/dev/mpt/mpt.c#9 integrate .. //depot/projects/wifi/sys/dev/mpt/mpt.h#12 integrate .. //depot/projects/wifi/sys/dev/mpt/mpt_cam.c#12 integrate .. //depot/projects/wifi/sys/dev/mpt/mpt_cam.h#5 integrate .. //depot/projects/wifi/sys/dev/mpt/mpt_pci.c#11 integrate .. //depot/projects/wifi/sys/dev/mpt/mpt_raid.c#7 integrate .. //depot/projects/wifi/sys/dev/mxge/eth_z8e.dat.gz.uu#4 integrate .. //depot/projects/wifi/sys/dev/mxge/ethp_z8e.dat.gz.uu#4 integrate .. //depot/projects/wifi/sys/dev/mxge/if_mxge.c#7 integrate .. //depot/projects/wifi/sys/dev/mxge/mxge_mcp.h#3 integrate .. //depot/projects/wifi/sys/dev/nve/if_nve.c#13 integrate .. //depot/projects/wifi/sys/dev/pci/pci.c#28 integrate .. //depot/projects/wifi/sys/dev/sk/if_sk.c#6 integrate .. //depot/projects/wifi/sys/dev/sound/pci/hda/hdac.c#8 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/buffer.h#7 integrate .. //depot/projects/wifi/sys/dev/sound/pcm/sound.h#11 integrate .. //depot/projects/wifi/sys/dev/twa/tw_cl.h#3 integrate .. //depot/projects/wifi/sys/dev/twa/tw_cl_externs.h#3 integrate .. //depot/projects/wifi/sys/dev/twa/tw_cl_fwif.h#3 integrate .. //depot/projects/wifi/sys/dev/twa/tw_cl_fwimg.c#3 delete .. //depot/projects/wifi/sys/dev/twa/tw_cl_init.c#3 integrate .. //depot/projects/wifi/sys/dev/twa/tw_cl_intr.c#3 integrate .. //depot/projects/wifi/sys/dev/twa/tw_cl_io.c#3 integrate .. //depot/projects/wifi/sys/dev/twa/tw_cl_ioctl.h#3 integrate .. //depot/projects/wifi/sys/dev/twa/tw_cl_misc.c#3 integrate .. //depot/projects/wifi/sys/dev/twa/tw_cl_share.h#3 integrate .. //depot/projects/wifi/sys/dev/twa/tw_osl.h#3 integrate .. //depot/projects/wifi/sys/dev/twa/tw_osl_cam.c#9 integrate .. //depot/projects/wifi/sys/dev/twa/tw_osl_externs.h#2 integrate .. //depot/projects/wifi/sys/dev/twa/tw_osl_freebsd.c#6 integrate .. //depot/projects/wifi/sys/dev/twa/tw_osl_includes.h#5 integrate .. //depot/projects/wifi/sys/dev/twa/tw_osl_inline.h#3 integrate .. //depot/projects/wifi/sys/dev/twa/tw_osl_ioctl.h#3 integrate .. //depot/projects/wifi/sys/dev/twa/tw_osl_share.h#6 integrate .. //depot/projects/wifi/sys/dev/twa/tw_osl_types.h#2 integrate .. //depot/projects/wifi/sys/dev/usb/if_axe.c#16 integrate .. //depot/projects/wifi/sys/dev/usb/if_cue.c#10 integrate .. //depot/projects/wifi/sys/dev/usb/if_cuereg.h#5 integrate .. //depot/projects/wifi/sys/dev/usb/if_kue.c#10 integrate .. //depot/projects/wifi/sys/dev/usb/if_kuereg.h#5 integrate .. //depot/projects/wifi/sys/dev/usb/if_rue.c#10 integrate .. //depot/projects/wifi/sys/dev/usb/if_ruereg.h#4 integrate .. //depot/projects/wifi/sys/dev/usb/if_rum.c#1 add .. //depot/projects/wifi/sys/dev/usb/if_rumreg.h#1 add .. //depot/projects/wifi/sys/dev/usb/if_rumvar.h#1 add .. //depot/projects/wifi/sys/dev/usb/if_udav.c#13 integrate .. //depot/projects/wifi/sys/dev/usb/if_ural.c#24 edit .. //depot/projects/wifi/sys/dev/usb/if_uralvar.h#9 integrate .. //depot/projects/wifi/sys/dev/usb/ubsa.c#5 integrate .. //depot/projects/wifi/sys/dev/usb/uhid.c#8 integrate .. //depot/projects/wifi/sys/dev/usb/ukbd.c#7 integrate .. //depot/projects/wifi/sys/dev/usb/ums.c#10 integrate .. //depot/projects/wifi/sys/dev/usb/usb.c#10 integrate .. //depot/projects/wifi/sys/dev/usb/usb_mem.c#6 integrate .. //depot/projects/wifi/sys/dev/usb/usb_subr.c#11 integrate .. //depot/projects/wifi/sys/dev/usb/usbdevs#25 integrate .. //depot/projects/wifi/sys/geom/eli/g_eli_ctl.c#7 integrate .. //depot/projects/wifi/sys/geom/geom.h#9 integrate .. //depot/projects/wifi/sys/geom/geom_dev.c#9 integrate .. //depot/projects/wifi/sys/geom/geom_disk.c#11 integrate .. //depot/projects/wifi/sys/geom/geom_disk.h#5 integrate .. //depot/projects/wifi/sys/geom/geom_io.c#9 integrate .. //depot/projects/wifi/sys/geom/geom_slice.c#6 integrate .. //depot/projects/wifi/sys/geom/geom_subr.c#7 integrate .. //depot/projects/wifi/sys/geom/part/g_part.c#3 integrate .. //depot/projects/wifi/sys/geom/part/g_part.h#2 integrate .. //depot/projects/wifi/sys/geom/part/g_part_apm.c#2 integrate .. //depot/projects/wifi/sys/geom/part/g_part_gpt.c#2 integrate .. //depot/projects/wifi/sys/i386/acpica/madt.c#10 integrate .. //depot/projects/wifi/sys/i386/conf/GENERIC#17 integrate .. //depot/projects/wifi/sys/i386/conf/NOTES#26 integrate .. //depot/projects/wifi/sys/i386/conf/PAE#10 integrate .. //depot/projects/wifi/sys/i386/i386/intr_machdep.c#13 integrate .. //depot/projects/wifi/sys/i386/i386/io_apic.c#12 integrate .. //depot/projects/wifi/sys/i386/i386/local_apic.c#18 integrate .. //depot/projects/wifi/sys/i386/i386/mp_machdep.c#23 integrate .. //depot/projects/wifi/sys/i386/i386/mptable.c#10 integrate .. //depot/projects/wifi/sys/i386/i386/msi.c#5 integrate .. //depot/projects/wifi/sys/i386/i386/nexus.c#11 integrate .. //depot/projects/wifi/sys/i386/include/apicvar.h#13 integrate .. //depot/projects/wifi/sys/i386/include/intr_machdep.h#12 integrate .. //depot/projects/wifi/sys/i386/include/vmparam.h#4 integrate .. //depot/projects/wifi/sys/i386/isa/atpic.c#8 integrate .. //depot/projects/wifi/sys/i386/linux/linux_machdep.c#11 integrate .. //depot/projects/wifi/sys/ia64/ia64/machdep.c#15 integrate .. //depot/projects/wifi/sys/ia64/include/vmparam.h#6 integrate .. //depot/projects/wifi/sys/kern/kern_condvar.c#6 integrate .. //depot/projects/wifi/sys/kern/kern_intr.c#17 integrate .. //depot/projects/wifi/sys/kern/kern_mib.c#7 integrate .. //depot/projects/wifi/sys/kern/kern_mutex.c#13 integrate .. //depot/projects/wifi/sys/kern/kern_rwlock.c#6 integrate .. //depot/projects/wifi/sys/kern/kern_sx.c#8 integrate .. //depot/projects/wifi/sys/kern/kern_synch.c#14 integrate .. //depot/projects/wifi/sys/kern/kern_timeout.c#9 integrate .. //depot/projects/wifi/sys/kern/uipc_socket.c#28 integrate .. //depot/projects/wifi/sys/kern/uipc_usrreq.c#19 integrate .. //depot/projects/wifi/sys/modules/Makefile#38 integrate .. //depot/projects/wifi/sys/modules/crypto/Makefile#5 integrate .. //depot/projects/wifi/sys/modules/em/Makefile#4 integrate .. //depot/projects/wifi/sys/modules/hptiop/Makefile#1 branch .. //depot/projects/wifi/sys/modules/twa/Makefile#6 integrate .. //depot/projects/wifi/sys/net/ieee8023ad_lacp.c#3 integrate .. //depot/projects/wifi/sys/net/ieee8023ad_lacp.h#2 integrate .. //depot/projects/wifi/sys/net/if_lagg.c#3 integrate .. //depot/projects/wifi/sys/net/if_lagg.h#3 integrate .. //depot/projects/wifi/sys/net/pfkeyv2.h#3 integrate .. //depot/projects/wifi/sys/netatalk/ddp_usrreq.c#8 integrate .. //depot/projects/wifi/sys/netgraph/ng_mppc.c#6 integrate .. //depot/projects/wifi/sys/netgraph/ng_socket.c#13 integrate .. //depot/projects/wifi/sys/netinet/if_ether.c#18 integrate .. //depot/projects/wifi/sys/netinet/in.c#15 integrate .. //depot/projects/wifi/sys/netinet/in_cksum.c#3 integrate .. //depot/projects/wifi/sys/netinet/in_gif.c#10 integrate .. //depot/projects/wifi/sys/netinet/in_pcb.c#15 integrate .. //depot/projects/wifi/sys/netinet/in_pcb.h#10 integrate .. //depot/projects/wifi/sys/netinet/in_rmx.c#6 integrate .. //depot/projects/wifi/sys/netinet/ip.h#4 integrate .. //depot/projects/wifi/sys/netinet/ip_divert.c#14 integrate .. //depot/projects/wifi/sys/netinet/ip_dummynet.c#13 integrate .. //depot/projects/wifi/sys/netinet/ip_ecn.c#3 integrate .. //depot/projects/wifi/sys/netinet/ip_encap.c#5 integrate .. //depot/projects/wifi/sys/netinet/ip_fw2.c#26 integrate .. //depot/projects/wifi/sys/netinet/ip_icmp.c#11 integrate .. //depot/projects/wifi/sys/netinet/ip_id.c#3 integrate .. //depot/projects/wifi/sys/netinet/ip_input.c#17 integrate .. //depot/projects/wifi/sys/netinet/ip_ipsec.c#2 integrate .. //depot/projects/wifi/sys/netinet/ip_mroute.c#11 integrate .. //depot/projects/wifi/sys/netinet/ip_options.c#3 integrate .. //depot/projects/wifi/sys/netinet/ip_options.h#2 integrate .. //depot/projects/wifi/sys/netinet/ip_output.c#18 integrate .. //depot/projects/wifi/sys/netinet/raw_ip.c#15 integrate .. //depot/projects/wifi/sys/netinet/sctp.h#4 integrate .. //depot/projects/wifi/sys/netinet/sctp_asconf.c#5 integrate .. //depot/projects/wifi/sys/netinet/sctp_asconf.h#4 integrate .. //depot/projects/wifi/sys/netinet/sctp_auth.c#6 integrate .. //depot/projects/wifi/sys/netinet/sctp_auth.h#4 integrate .. //depot/projects/wifi/sys/netinet/sctp_bsd_addr.c#5 integrate .. //depot/projects/wifi/sys/netinet/sctp_bsd_addr.h#4 integrate .. //depot/projects/wifi/sys/netinet/sctp_constants.h#7 integrate .. //depot/projects/wifi/sys/netinet/sctp_crc32.c#5 integrate .. //depot/projects/wifi/sys/netinet/sctp_crc32.h#3 integrate .. //depot/projects/wifi/sys/netinet/sctp_header.h#4 integrate .. //depot/projects/wifi/sys/netinet/sctp_indata.c#7 integrate .. //depot/projects/wifi/sys/netinet/sctp_indata.h#4 integrate .. //depot/projects/wifi/sys/netinet/sctp_input.c#7 integrate .. //depot/projects/wifi/sys/netinet/sctp_input.h#3 integrate .. //depot/projects/wifi/sys/netinet/sctp_lock_bsd.h#4 integrate .. //depot/projects/wifi/sys/netinet/sctp_os.h#5 integrate .. //depot/projects/wifi/sys/netinet/sctp_os_bsd.h#6 integrate .. //depot/projects/wifi/sys/netinet/sctp_output.c#7 integrate .. //depot/projects/wifi/sys/netinet/sctp_output.h#5 integrate .. //depot/projects/wifi/sys/netinet/sctp_pcb.c#7 integrate .. //depot/projects/wifi/sys/netinet/sctp_pcb.h#5 integrate .. //depot/projects/wifi/sys/netinet/sctp_peeloff.c#7 integrate .. //depot/projects/wifi/sys/netinet/sctp_peeloff.h#3 integrate .. //depot/projects/wifi/sys/netinet/sctp_structs.h#7 integrate .. //depot/projects/wifi/sys/netinet/sctp_sysctl.c#2 integrate .. //depot/projects/wifi/sys/netinet/sctp_sysctl.h#2 integrate .. //depot/projects/wifi/sys/netinet/sctp_timer.c#6 integrate .. //depot/projects/wifi/sys/netinet/sctp_timer.h#3 integrate .. //depot/projects/wifi/sys/netinet/sctp_uio.h#7 integrate .. //depot/projects/wifi/sys/netinet/sctp_usrreq.c#7 integrate .. //depot/projects/wifi/sys/netinet/sctp_var.h#6 integrate .. //depot/projects/wifi/sys/netinet/sctputil.c#7 integrate .. //depot/projects/wifi/sys/netinet/sctputil.h#7 integrate .. //depot/projects/wifi/sys/netinet/tcp_debug.c#4 integrate .. //depot/projects/wifi/sys/netinet/tcp_fsm.h#4 integrate .. //depot/projects/wifi/sys/netinet/tcp_input.c#24 integrate .. //depot/projects/wifi/sys/netinet/tcp_output.c#15 integrate .. //depot/projects/wifi/sys/netinet/tcp_reass.c#1 branch .. //depot/projects/wifi/sys/netinet/tcp_sack.c#18 integrate .. //depot/projects/wifi/sys/netinet/tcp_subr.c#28 integrate .. //depot/projects/wifi/sys/netinet/tcp_syncache.c#16 integrate .. //depot/projects/wifi/sys/netinet/tcp_timer.c#14 integrate .. //depot/projects/wifi/sys/netinet/tcp_timewait.c#1 branch .. //depot/projects/wifi/sys/netinet/tcp_usrreq.c#25 integrate .. //depot/projects/wifi/sys/netinet/tcp_var.h#19 integrate .. //depot/projects/wifi/sys/netinet/udp_usrreq.c#18 integrate .. //depot/projects/wifi/sys/netinet6/esp_camellia.c#1 branch .. //depot/projects/wifi/sys/netinet6/esp_camellia.h#1 branch .. //depot/projects/wifi/sys/netinet6/esp_core.c#5 integrate .. //depot/projects/wifi/sys/netinet6/in6_pcb.c#9 integrate .. //depot/projects/wifi/sys/netinet6/in6_pcb.h#4 integrate .. //depot/projects/wifi/sys/netinet6/in6_proto.c#10 integrate .. //depot/projects/wifi/sys/netinet6/raw_ip6.c#12 integrate .. //depot/projects/wifi/sys/netinet6/sctp6_usrreq.c#7 integrate .. //depot/projects/wifi/sys/netinet6/sctp6_var.h#4 integrate .. //depot/projects/wifi/sys/netipsec/xform_esp.c#4 integrate .. //depot/projects/wifi/sys/netipx/ipx.c#4 integrate .. //depot/projects/wifi/sys/netipx/ipx.h#5 integrate .. //depot/projects/wifi/sys/netipx/ipx_cksum.c#4 integrate .. //depot/projects/wifi/sys/netipx/ipx_if.h#4 integrate .. //depot/projects/wifi/sys/netipx/ipx_input.c#9 integrate .. //depot/projects/wifi/sys/netipx/ipx_outputfl.c#4 integrate .. //depot/projects/wifi/sys/netipx/ipx_pcb.c#8 integrate .. //depot/projects/wifi/sys/netipx/ipx_pcb.h#6 integrate .. //depot/projects/wifi/sys/netipx/ipx_usrreq.c#8 integrate .. //depot/projects/wifi/sys/netipx/ipx_var.h#5 integrate .. //depot/projects/wifi/sys/netipx/spx_debug.c#4 integrate .. //depot/projects/wifi/sys/netipx/spx_debug.h#4 integrate .. //depot/projects/wifi/sys/opencrypto/cryptodev.c#8 integrate .. //depot/projects/wifi/sys/opencrypto/cryptodev.h#5 integrate .. //depot/projects/wifi/sys/opencrypto/cryptosoft.c#6 integrate .. //depot/projects/wifi/sys/opencrypto/xform.c#6 integrate .. //depot/projects/wifi/sys/opencrypto/xform.h#4 integrate .. //depot/projects/wifi/sys/pc98/conf/GENERIC#17 integrate .. //depot/projects/wifi/sys/pci/if_tl.c#13 integrate .. //depot/projects/wifi/sys/powerpc/include/vmparam.h#3 integrate .. //depot/projects/wifi/sys/sparc64/include/profile.h#3 integrate .. //depot/projects/wifi/sys/sparc64/include/vmparam.h#3 integrate .. //depot/projects/wifi/sys/sun4v/include/profile.h#2 integrate .. //depot/projects/wifi/sys/sun4v/include/vmparam.h#3 integrate .. //depot/projects/wifi/sys/sys/callout.h#4 integrate .. //depot/projects/wifi/sys/sys/disk.h#4 integrate .. //depot/projects/wifi/sys/sys/interrupt.h#8 integrate .. //depot/projects/wifi/sys/sys/param.h#27 integrate .. //depot/projects/wifi/sys/sys/rwlock.h#6 integrate .. //depot/projects/wifi/sys/sys/sx.h#7 integrate .. //depot/projects/wifi/sys/vm/uma_int.h#10 integrate .. //depot/projects/wifi/sys/vm/vm_page.c#17 integrate .. //depot/projects/wifi/sys/vm/vm_page.h#9 integrate .. //depot/projects/wifi/tools/regression/sockets/sblock/Makefile#1 branch .. //depot/projects/wifi/tools/regression/sockets/sblock/sblock.c#1 branch .. //depot/projects/wifi/usr.bin/calendar/calendar.c#2 integrate .. //depot/projects/wifi/usr.bin/calendar/calendar.h#2 integrate .. //depot/projects/wifi/usr.bin/calendar/day.c#4 integrate .. //depot/projects/wifi/usr.bin/calendar/io.c#2 integrate .. //depot/projects/wifi/usr.bin/calendar/ostern.c#2 integrate .. //depot/projects/wifi/usr.bin/calendar/paskha.c#2 integrate .. //depot/projects/wifi/usr.bin/ldd/ldd.1#2 integrate .. //depot/projects/wifi/usr.bin/logger/Makefile#3 integrate .. //depot/projects/wifi/usr.bin/logger/logger.c#4 integrate .. //depot/projects/wifi/usr.bin/login/login.h#4 integrate .. //depot/projects/wifi/usr.bin/login/login_audit.c#2 integrate .. //depot/projects/wifi/usr.bin/login/login_fbtab.c#2 integrate .. //depot/projects/wifi/usr.bin/quota/quota.c#7 integrate .. //depot/projects/wifi/usr.bin/tar/read.c#10 integrate .. //depot/projects/wifi/usr.bin/time/Makefile#2 integrate .. //depot/projects/wifi/usr.bin/time/time.c#4 integrate .. //depot/projects/wifi/usr.bin/tip/tip/acu.c#3 integrate .. //depot/projects/wifi/usr.sbin/boot0cfg/boot0cfg.8#4 integrate .. //depot/projects/wifi/usr.sbin/config/Makefile#3 integrate .. //depot/projects/wifi/usr.sbin/config/config.8#6 integrate .. //depot/projects/wifi/usr.sbin/config/config.h#6 integrate .. //depot/projects/wifi/usr.sbin/config/config.y#8 integrate .. //depot/projects/wifi/usr.sbin/config/configvers.h#8 integrate .. //depot/projects/wifi/usr.sbin/config/kernconf.tmpl#1 branch .. //depot/projects/wifi/usr.sbin/config/lang.l#6 integrate .. //depot/projects/wifi/usr.sbin/config/main.c#12 integrate .. //depot/projects/wifi/usr.sbin/diskinfo/diskinfo.c#4 integrate .. //depot/projects/wifi/usr.sbin/iostat/iostat.c#4 integrate .. //depot/projects/wifi/usr.sbin/mixer/mixer.8#4 integrate .. //depot/projects/wifi/usr.sbin/nologin/nologin.5#2 integrate .. //depot/projects/wifi/usr.sbin/pccard/pccardc/pccardc.8#2 integrate Differences ... ==== //depot/projects/wifi/ObsoleteFiles.inc#15 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.81 2007/04/24 16:58:54 emax Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.82 2007/05/10 13:25:27 roberto Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,9 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070510: zpool/zfs moved to /sbin +OLD_FILES+=usr/sbin/zfs +OLD_FILES+=usr/sbin/zpool # 20070423: rc.bluetooth (examples) removed OLD_FILES+=usr/share/examples/netgraph/bluetooth/rc.bluetooth # 20070421: worm.4 removed ==== //depot/projects/wifi/bin/mv/mv.1#4 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mv.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/mv/mv.1,v 1.28 2005/01/16 16:41:58 ru Exp $ +.\" $FreeBSD: src/bin/mv/mv.1,v 1.29 2007/05/12 22:18:27 pav Exp $ .\" .Dd July 9, 2002 .Dt MV 1 @@ -113,9 +113,9 @@ to be verbose, showing files after they are moved. .El .Pp -It is an error for either the +It is an error for the .Ar source -operand or the destination path to specify a directory unless both do. +operand to specify a directory if the target exists and is not a directory. .Pp If the destination path does not have a mode which permits writing, .Nm ==== //depot/projects/wifi/cddl/lib/libzfs/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/cddl/lib/libzfs/Makefile,v 1.2 2007/04/16 21:20:25 ru Exp $ +# $FreeBSD: src/cddl/lib/libzfs/Makefile,v 1.3 2007/05/06 01:39:38 pjd Exp $ .PATH: ${.CURDIR}/../../../compat/opensolaris/misc .PATH: ${.CURDIR}/../../../sys/contrib/opensolaris/common/zfs @@ -9,7 +9,8 @@ DPADD= ${LIBUTIL} LDADD= -lutil -SRCS= mnttab.c \ +SRCS= deviceid.c \ + mnttab.c \ mkdirp.c \ zmount.c \ fsshare.c \ ==== //depot/projects/wifi/compat/opensolaris/include/devid.h#2 (text+ko) ==== @@ -27,23 +27,28 @@ #ifndef _OPENSOLARIS_DEVID_H_ #define _OPENSOLARIS_DEVID_H_ -#include +#include +#include #include -typedef int ddi_devid_t; +typedef struct ddi_devid { + char devid[DISK_IDENT_SIZE]; +} ddi_devid_t; typedef struct devid_nmlist { - char *devname; + char devname[MAXPATHLEN]; dev_t dev; } devid_nmlist_t; -static inline int devid_str_decode(char *devidstr, ddi_devid_t *retdevid, char **retminor_name) { abort(); } -static inline int devid_deviceid_to_nmlist(char *search_path, ddi_devid_t devid, char *minor_name, devid_nmlist_t **retlist) { abort(); } -static inline void devid_str_free(char *str) { abort(); } -static inline void devid_free(ddi_devid_t devid) { abort(); } -static inline void devid_free_nmlist(devid_nmlist_t *list) { abort(); } -static inline int devid_get(int fd, ddi_devid_t *retdevid) { return -1; } -static inline int devid_get_minor_name(int fd, char **retminor_name) { abort(); } -static inline char *devid_str_encode(ddi_devid_t devid, char *minor_name) { abort(); } +int devid_str_decode(char *devidstr, ddi_devid_t *retdevid, + char **retminor_name); +int devid_deviceid_to_nmlist(char *search_path, ddi_devid_t devid, + char *minor_name, devid_nmlist_t **retlist); +void devid_str_free(char *str); +void devid_free(ddi_devid_t devid); +void devid_free_nmlist(devid_nmlist_t *list); +int devid_get(int fd, ddi_devid_t *retdevid); +int devid_get_minor_name(int fd, char **retminor_name); +char *devid_str_encode(ddi_devid_t devid, char *minor_name); #endif /* !_OPENSOLARIS_DEVID_H_ */ ==== //depot/projects/wifi/contrib/amd/amq/amq.8#3 (text+ko) ==== @@ -39,7 +39,7 @@ .\" %W% (Berkeley) %G% .\" .\" $Id: amq.8,v 1.3.2.8 2004/01/06 03:15:16 ezk Exp $ -.\" $FreeBSD: src/contrib/amd/amq/amq.8,v 1.12 2005/06/16 20:21:02 ru Exp $ +.\" $FreeBSD: src/contrib/amd/amq/amq.8,v 1.13 2007/05/12 10:25:31 pav Exp $ .\" .Dd March 16, 1991 .Dt AMQ 8 @@ -133,7 +133,7 @@ Ask the automounter to use the logging options specified in .Ar log_options from now on. -.It Fl D Ar log_options +.It Fl D Ar debug_options Ask the automounter to use the debugging options specified in .Ar debug_options from now on. ==== //depot/projects/wifi/contrib/opensolaris/cmd/zpool/zpool_vdev.c#2 (text+ko) ==== @@ -159,18 +159,14 @@ static boolean_t is_provider(const char *name) { - off_t mediasize; int fd; - fd = open(name, O_RDONLY); - if (fd == -1) - return (B_FALSE); - if (ioctl(fd, DIOCGMEDIASIZE, &mediasize) == -1) { - close(fd); - return (B_FALSE); + fd = g_open(name, 0); + if (fd >= 0) { + g_close(fd); + return (B_TRUE); } - close(fd); - return (B_TRUE); + return (B_FALSE); } /* @@ -183,9 +179,11 @@ nvlist_t * make_leaf_vdev(const char *arg) { - char path[MAXPATHLEN]; + char ident[DISK_IDENT_SIZE], path[MAXPATHLEN]; + struct stat64 statbuf; nvlist_t *vdev = NULL; char *type = NULL; + boolean_t wholedisk = B_FALSE; if (strncmp(arg, _PATH_DEV, sizeof(_PATH_DEV) - 1) == 0) strlcpy(path, arg, sizeof (path)); @@ -212,6 +210,41 @@ verify(nvlist_add_uint64(vdev, ZPOOL_CONFIG_WHOLE_DISK, (uint64_t)B_FALSE) == 0); + /* + * For a whole disk, defer getting its devid until after labeling it. + */ + if (1 || (S_ISBLK(statbuf.st_mode) && !wholedisk)) { + /* + * Get the devid for the device. + */ + int fd; + ddi_devid_t devid; + char *minor = NULL, *devid_str = NULL; + + if ((fd = open(path, O_RDONLY)) < 0) { + (void) fprintf(stderr, gettext("cannot open '%s': " + "%s\n"), path, strerror(errno)); + nvlist_free(vdev); + return (NULL); + } + + if (devid_get(fd, &devid) == 0) { + if (devid_get_minor_name(fd, &minor) == 0 && + (devid_str = devid_str_encode(devid, minor)) != + NULL) { + verify(nvlist_add_string(vdev, + ZPOOL_CONFIG_DEVID, devid_str) == 0); + } + if (devid_str != NULL) + devid_str_free(devid_str); + if (minor != NULL) + devid_str_free(minor); + devid_free(devid); + } + + (void) close(fd); + } + return (vdev); } ==== //depot/projects/wifi/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 (text+ko) ==== @@ -446,10 +446,6 @@ extern int ddi_strtoul(const char *str, char **nptr, int base, unsigned long *result); -#ifdef __cplusplus -} -#endif - /* ZFS Boot Related stuff. */ struct _buf { @@ -508,4 +504,8 @@ #define ERESTART (-1) #endif +#ifdef __cplusplus +} +#endif + #endif /* _SYS_ZFS_CONTEXT_H */ ==== //depot/projects/wifi/lib/libc/gdtoa/_hdtoa.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_hdtoa.c,v 1.4 2007/01/03 04:57:58 das Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_hdtoa.c,v 1.5 2007/05/08 02:59:37 das Exp $"); #include #include @@ -78,7 +78,7 @@ break; case 1: /* to nearest, halfway rounds to even */ if ((s0[ndigits] > 8) || - (s0[ndigits] == 8 && s0[ndigits - 1] & 1)) + (s0[ndigits] == 8 && s0[ndigits + 1] & 1)) adjust = roundup(s0, ndigits); break; case 2: /* toward +inf */ ==== //depot/projects/wifi/lib/libc/sparc64/Symbol.map#3 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/sparc64/Symbol.map,v 1.3 2007/04/29 14:05:19 deischen Exp $ + * $FreeBSD: src/lib/libc/sparc64/Symbol.map,v 1.4 2007/05/11 23:43:55 marius Exp $ */ /* @@ -11,6 +11,7 @@ /* PSEUDO syscalls */ _exit; + _mcount; _setjmp; _longjmp; fabs; ==== //depot/projects/wifi/lib/libc/stdio/vfprintf.c#8 (text+ko) ==== @@ -34,7 +34,7 @@ static char sccsid[] = "@(#)vfprintf.c 8.1 (Berkeley) 6/4/93"; #endif /* LIBC_SCCS and not lint */ #include -__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.76 2007/01/09 00:28:07 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/stdio/vfprintf.c,v 1.77 2007/05/08 03:08:28 das Exp $"); /* * Actual printf innards. @@ -908,6 +908,7 @@ } else cp = (ch >= 'a') ? "inf" : "INF"; size = 3; + flags &= ~ZEROPAD; break; } flags |= FPT; ==== //depot/projects/wifi/lib/libfetch/http.c#5 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libfetch/http.c,v 1.77 2005/08/24 12:28:05 des Exp $"); +__FBSDID("$FreeBSD: src/lib/libfetch/http.c,v 1.78 2007/05/08 19:28:03 des Exp $"); /* * The following copyright applies to the base64 code: @@ -92,6 +92,7 @@ #define HTTP_MOVED_PERM 301 #define HTTP_MOVED_TEMP 302 #define HTTP_SEE_OTHER 303 +#define HTTP_TEMP_REDIRECT 307 #define HTTP_NEED_AUTH 401 #define HTTP_NEED_PROXY_AUTH 407 #define HTTP_BAD_RANGE 416 @@ -99,6 +100,7 @@ #define HTTP_REDIRECT(xyz) ((xyz) == HTTP_MOVED_PERM \ || (xyz) == HTTP_MOVED_TEMP \ + || (xyz) == HTTP_TEMP_REDIRECT \ || (xyz) == HTTP_SEE_OTHER) #define HTTP_ERROR(xyz) ((xyz) > 400 && (xyz) < 599) ==== //depot/projects/wifi/lib/libgeom/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libgeom/Makefile,v 1.10 2004/03/07 16:07:57 phk Exp $ +# $FreeBSD: src/lib/libgeom/Makefile,v 1.11 2007/05/06 01:17:46 pjd Exp $ LIB= geom SHLIBDIR?= /lib @@ -6,6 +6,7 @@ SRCS+= geom_stats.c SRCS+= geom_xml2tree.c SRCS+= geom_ctl.c +SRCS+= geom_util.c INCS= libgeom.h CFLAGS += -I${.CURDIR} @@ -31,6 +32,15 @@ libgeom.3 gctl_rw_param.3 \ libgeom.3 gctl_issue.3 \ libgeom.3 gctl_free.3 \ - libgeom.3 gctl_dump.3 + libgeom.3 gctl_dump.3 \ + libgeom.3 g_close.3 \ + libgeom.3 g_delete.3 \ + libgeom.3 g_flush.3 \ + libgeom.3 g_get_ident.3 \ + libgeom.3 g_get_name.3 \ + libgeom.3 g_mediasize.3 \ + libgeom.3 g_open.3 \ + libgeom.3 g_open_by_ident.3 \ + libgeom.3 g_sectorsize.3 .include ==== //depot/projects/wifi/lib/libgeom/libgeom.3#3 (text+ko) ==== @@ -1,4 +1,5 @@ .\" Copyright (c) 2003 Poul-Henning Kamp +.\" Copyright (c) 2007 Pawel Jakub Dawidek .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without @@ -25,9 +26,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libgeom/libgeom.3,v 1.7 2005/11/24 10:43:35 ru Exp $ +.\" $FreeBSD: src/lib/libgeom/libgeom.3,v 1.8 2007/05/06 01:17:46 pjd Exp $ .\" -.Dd March 7, 2004 +.Dd May 6, 2007 .Dt LIBGEOM 3 .Os .Sh NAME @@ -44,7 +45,16 @@ .Nm gctl_rw_param , .Nm gctl_issue , .Nm gctl_free , -.Nm gctl_dump +.Nm gctl_dump , +.Nm g_open , +.Nm g_close , +.Nm g_mediasize , +.Nm g_sectorsize , +.Nm g_flush , +.Nm g_delete , +.Nm g_get_ident , +.Nm g_get_name , +.Nm g_open_by_ident .Nd userland API library for kernel GEOM subsystem .Sh LIBRARY .Lb libgeom @@ -80,6 +90,25 @@ .Fn gctl_free "struct gctl_req *req" .Ft void .Fn gctl_dump "struct gctl_req *req" "FILE *f" +.Ss "Utility Functions" +.Ft int +.Fn g_open "const char *name" "int write" +.Ft int +.Fn g_close "int fd" +.Ft off_t +.Fn g_mediasize "int fd" +.Ft ssize_t +.Fn g_sectorsize "int fd" +.Ft int +.Fn g_flush "int fd" +.Ft int +.Fn g_delete "int fd" "off_t offset" "off_t length" +.Ft int +.Fn g_get_ident "int fd" "char *ident" "size_t size" +.Ft int +.Fn g_get_name "const char *ident" "char *name" "size_t size" +.Ft int +.Fn g_open_by_ident "const char *ident" "int write" "char *name" "size_t size" .Sh DESCRIPTION The .Nm geom @@ -232,6 +261,76 @@ .Dv NULL on success, or an error message corresponding to the first error which happened. +.Ss "Utility Functions" +The +.Fn g_* +functions are used to communicate with GEOM providers. +.Pp +The +.Fn g_open +function opens the given provider and returns file descriptor number, which can +be used with other functions. +The +.Fa write +argument indicates if operations that modify the provider (like +.Fn g_flush +or +.Fn g_delete ) +are going to be called. +.Pp +The +.Fn g_close +function closes the provider. +.Pp +The +.Fn g_mediasize +function returns size of the given provider. +.Pp +The +.Fn g_sectorsize +function returns sector size of the given provider. +.Pp +The +.Fn g_flush +function sends +.Dv BIO_FLUSH +request to flush write cache of the provider. +.Pp +The +.Fn g_delete +function tells the provider that the given data range is no longer used. +.Pp +The +.Fn g_get_ident +function returns provider's fixed and unique identifier. +The +.Fa ident +argument should be at least +.Dv DISK_IDENT_SIZE +big. +.Pp +The +.Fn g_get_name +function returns name of the provider, which identifier is equal to the +.Fa ident +string. +.Pp +The +.Fn g_open_by_ident +function opens provider using its ident, unlike +.Fn g_open +which uses provider's name. +If the +.Fa name +argument is not +.Dv NULL , +the function will store provider's name there. +.Pp +All functions return value greater than or equal to +.Va 0 +on success or +.Va -1 +on failure. .Sh EXAMPLES Create a request that is to be sent to the CCD class, and tell it to destroy a specific geom: @@ -256,3 +355,4 @@ .Sh AUTHORS .An Poul-Henning Kamp Aq phk@FreeBSD.org .An Lukas Ertl Aq le@FreeBSD.org +.An Pawel Jakub Dawidek pjd@FreeBSD.org ==== //depot/projects/wifi/lib/libgeom/libgeom.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libgeom/libgeom.h,v 1.10 2004/03/09 21:14:18 jhb Exp $ + * $FreeBSD: src/lib/libgeom/libgeom.h,v 1.12 2007/05/06 10:00:27 des Exp $ */ #ifndef _LIBGEOM_H_ #define _LIBGEOM_H_ @@ -44,10 +44,10 @@ void geom_stats_resync(void); int geom_stats_open(void); void *geom_stats_snapshot_get(void); -void geom_stats_snapshot_free(void *arg); -void geom_stats_snapshot_timestamp(void *arg, struct timespec *tp); -void geom_stats_snapshot_reset(void *arg); -struct devstat *geom_stats_snapshot_next(void *arg); +void geom_stats_snapshot_free(void *); +void geom_stats_snapshot_timestamp(void *, struct timespec *); +void geom_stats_snapshot_reset(void *); +struct devstat *geom_stats_snapshot_next(void *); char *geom_getxml(void); @@ -126,23 +126,34 @@ struct gconf lg_config; }; -struct gident * geom_lookupid(struct gmesh *gmp, const void *id); -int geom_xml2tree(struct gmesh *gmp, char *p); -int geom_gettree(struct gmesh *gmp); -void geom_deletetree(struct gmesh *gmp); +struct gident * geom_lookupid(struct gmesh *, const void *); +int geom_xml2tree(struct gmesh *, char *); +int geom_gettree(struct gmesh *); +void geom_deletetree(struct gmesh *); /* geom_ctl.c */ struct gctl_req; #ifdef _STDIO_H_ /* limit #include pollution */ -void gctl_dump(struct gctl_req *req, FILE *f); +void gctl_dump(struct gctl_req *, FILE *); #endif -void gctl_free(struct gctl_req *req); +void gctl_free(struct gctl_req *); struct gctl_req *gctl_get_handle(void); -const char *gctl_issue(struct gctl_req *req); -void gctl_ro_param(struct gctl_req *req, const char *name, int len, const void* val); -void gctl_rw_param(struct gctl_req *req, const char *name, int len, void* val); +const char *gctl_issue(struct gctl_req *); +void gctl_ro_param(struct gctl_req *, const char *, int, const void *); +void gctl_rw_param(struct gctl_req *, const char *, int, void *); + +/* geom_util.c */ +int g_open(const char *, int); +int g_close(int); +off_t g_mediasize(int); +ssize_t g_sectorsize(int); +int g_flush(int); +int g_delete(int, off_t, off_t); +int g_get_ident(int, char *, size_t); +int g_get_name(const char *, char *, size_t); +int g_open_by_ident(const char *, int, char *, size_t); __END_DECLS ==== //depot/projects/wifi/lib/libipsec/pfkey_dump.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libipsec/pfkey_dump.c,v 1.15 2004/02/11 04:34:34 bms Exp $"); +__FBSDID("$FreeBSD: src/lib/libipsec/pfkey_dump.c,v 1.16 2007/05/09 19:37:00 gnn Exp $"); #include #include @@ -188,6 +188,9 @@ #ifdef SADB_X_EALG_AESCTR { SADB_X_EALG_AESCTR, "aes-ctr", }, #endif +#ifdef SADB_X_EALG_CAMELLIACBC + { SADB_X_EALG_CAMELLIACBC, "camellia-cbc", }, +#endif { -1, NULL, }, }; ==== //depot/projects/wifi/lib/libthr/thread/thr_init.c#10 (text+ko) ==== @@ -30,7 +30,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.45 2006/12/20 05:05:44 davidxu Exp $ + * $FreeBSD: src/lib/libthr/thread/thr_init.c,v 1.46 2007/05/09 08:39:33 davidxu Exp $ */ #include "namespace.h" @@ -66,7 +66,6 @@ int _thread_active_threads = 1; atfork_head _thr_atfork_list = TAILQ_HEAD_INITIALIZER(_thr_atfork_list); struct umutex _thr_atfork_lock = DEFAULT_UMUTEX; -int _thr_adaptive_spin = 0; struct pthread_prio _thr_priorities[3] = { {RTP_PRIO_MIN, RTP_PRIO_MAX, 0}, /* FIFO */ @@ -424,12 +423,6 @@ { size_t len; int mib[2]; - char *p; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun May 13 15:46:15 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1156316A406; Sun, 13 May 2007 15:46:15 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CDA0016A404 for ; Sun, 13 May 2007 15:46:14 +0000 (UTC) (envelope-from taleks@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id BCBF113C447 for ; Sun, 13 May 2007 15:46:14 +0000 (UTC) (envelope-from taleks@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4DFkE7R085391 for ; Sun, 13 May 2007 15:46:14 GMT (envelope-from taleks@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4DFkEKe085388 for perforce@freebsd.org; Sun, 13 May 2007 15:46:14 GMT (envelope-from taleks@FreeBSD.org) Date: Sun, 13 May 2007 15:46:14 GMT Message-Id: <200705131546.l4DFkEKe085388@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to taleks@FreeBSD.org using -f From: Alexey Tarasov To: Perforce Change Reviews Cc: Subject: PERFORCE change 119772 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, 13 May 2007 15:46:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=119772 Change 119772 by taleks@taleks_th on 2007/05/13 15:46:00 Cosmetic changes, made all compilable together, added simple makefile. Affected files ... .. //depot/projects/soc2007/taleks-pxe_http/Makefile#1 add .. //depot/projects/soc2007/taleks-pxe_http/pxe_arp.c#2 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_arp.h#2 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_core.c#7 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_core.h#7 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_icmp.c#5 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_icmp.h#4 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_ip.c#4 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_ip.h#3 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_isr.S#3 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_isr.h#2 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_mutex.c#3 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_mutex.h#3 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_sock.c#3 edit .. //depot/projects/soc2007/taleks-pxe_http/pxe_sock.h#3 edit Differences ... ==== //depot/projects/soc2007/taleks-pxe_http/pxe_arp.c#2 (text+ko) ==== @@ -5,37 +5,54 @@ #include "pxe_core.h" #include "pxe_mem.h" -static pxe_arp_entry arp_table[MAX_ARP_ENTRIES]; -static pxe_arp_pack_data packet_to_send; +static PXE_ARP_ENTRY arp_table[MAX_ARP_ENTRIES]; +static PXE_ARP_PACK_DATA packet_to_send; static int arp_usage = 0; +/* + * pxe_arp_init() - initialisation of used by this module structures + * in: + * none + * out: + * none + */ void pxe_arp_init() { - pxe_memset(&packet_to_send, 0, sizeof(pxe_arp_pack_data) ); + pxe_memset(&packet_to_send, 0, sizeof(PXE_ARP_PACK_DATA) ); /* now body.target_hwaddr filled with zero, which means broadcast MAC */ pxe_memset(arp_table, 0, sizeof(arp_table)); /* filling packet_to_send, it will not change ever */ - packet_to_send.hdr.hwtype = le2be16(ETH_TYPE); + packet_to_send.hdr.hwtype = le2be16(ETHER_TYPE); packet_to_send.hdr.ptype = le2be16(PXE_PTYPE_IP); packet_to_send.hdr.hsize = 6; /* Ethernet MAC size */ packet_to_send.hdr.psize = 4; /* ip4 size */ packet_to_send.hdr.operation = PXE_ARPOP_REQUEST; - + /* filling source related data, client ip & MAC */ pxe_memcpy(pxe_get_mymac(), packet_to_send.body.src_hwaddr, 6); - packet_to_send.body.src_paddr=pxe_get_myip32(); + packet_to_send.body.src_paddr = le2be32(pxe_get_myip32()); } +/* + * pxe_arp_protocol() - process received arp packet, this function is called in style + * of pxe_protocol_call function type, but last two parameters are unused + * in: + * pack - rceived packet data + * function - protocal function (will be always PXE_CORE_FRAG) + * data - always NULL + * out: + * always 0 - we are not interested in storing this packet in pxe_core queue + */ int -pxe_arp_protocol(pxe_packet *pack, uint8_t function, void *data) +pxe_arp_protocol(PXE_PACKET *pack, uint8_t function, void *data) { - const pxe_arp_pack_data *arp_reply = (const pxe_arp_pack_data *)pack->data; + const PXE_ARP_PACK_DATA *arp_reply = (const PXE_ARP_PACK_DATA *)pack->data; - if (arp_reply.hdr.operation != PXE_ARPOP_REPLY) /* we don't need answer for requests. May be. */ + if (arp_reply->hdr.operation != PXE_ARPOP_REPLY) /* we don't need answer for requests. May be. */ return 0; /* if arp_usage exceeds MAX_ARP_ENTRIES, occurs rewriting of earlier placed ARP entries. @@ -44,19 +61,27 @@ * is full. In fact, we don't need many entries. Only two: one for gateway, one for DNS-server * or for proxy server. Default arp_table size is 8. It seems more than enough. */ - pxe_memcpy(&arp_reply.body.src_hwaddr, &arp_table[arp_usage % MAX_ARP_ENTRIES].mac, 6); - arp_table[arp_usage % MAX_ARP_ENTRIES].ip4 = arp_reply.body. + pxe_memcpy(&arp_reply->body.src_hwaddr, &arp_table[arp_usage % MAX_ARP_ENTRIES].mac, 6); + arp_table[arp_usage % MAX_ARP_ENTRIES].ip4.ip = be2le32(arp_reply->body.src_paddr); ++arp_usage; return 0; /* inform pxe_get_packet() we don't need this packet more. */ } +/* + * pxe_arp_send_whois() - sends ARP request packet for given ip, received packets are + * handled in pxe_arp_protocol() + * in: + * ip - target ip, for which to find MAC + * out: + * none + */ void pxe_arp_send_whois(uint32_t ip) { - pxe_packet pack; + PXE_PACKET pack; - pack.data_size = sizeof(pxe_arp_pack_data); + pack.data_size = sizeof(PXE_ARP_PACK_DATA); pack.data = &packet_to_send; packet_to_send.body.target_paddr = le2be32(ip); @@ -66,19 +91,37 @@ } } +/* + * pxe_arp_table_search() - searches entry in ARP table for given ip + * in: + * ip - ip, for which to search MAC + * out: + * NULL - not found such entry in arp_table + * not NULL - pointer to MAC address + */ const MAC_ADDR * pxe_arp_table_search(uint32_t ip) { + int entry = 0; + + for (; entry < MAX_ARP_ENTRIES; ++entry) { - for (int entry = 0; entry < MAX_ARP_ENTRIES; ++entry) { - if (arp_table[entry].ip4.ip == ip) - return &arp_table[entry]; + return &arp_table[entry].mac; } return NULL; } +/* + * pxe_arp_ip4mac() - returns MAC for given ip if it's found in arp_table, + * otherwise - performs request sending + * in: + * ip - ip, for which to search MAC + * out: + * NULL - not found such entry in arp_table + * not NULL - pointer to MAC address + */ const MAC_ADDR * pxe_arp_ip4mac(uint32_t ip) { @@ -88,7 +131,7 @@ const MAC_ADDR *res = pxe_arp_table_search(ip); if (res != NULL) - return res; + return (res); pxe_arp_send_whois(ip); @@ -100,7 +143,7 @@ * arp_table updated */ if (res != NULL) { - return res; + return (res); } }; @@ -111,7 +154,7 @@ printf("."); #endif --trysLeft; - if (0 == trysLeft) { /* have not recieved anything, return nothing */ + if (trysLeft == 0) { /* have not recieved anything, return nothing */ printf("ARP sending timeout.\n"); return (NULL); @@ -124,4 +167,7 @@ sleep(1); --timeToDie; } -}+ + /* never getting here*/ + return (NULL); +} ==== //depot/projects/soc2007/taleks-pxe_http/pxe_arp.h#2 (text+ko) ==== @@ -12,49 +12,53 @@ #include "pxe_core.h" #include "pxe_ip.h" +/* max MAC<->ip4 bindings to store */ #define MAX_ARP_ENTRIES 4 +/* max try count to send/recieve ARP request/reply */ +#define PXE_MAX_ARP_TRY 5 +/* max timeout in seconds */ +#define PXE_TIME_TO_DIE 60 typedef struct pxe_arp_entry { - pxe_ipaddr ip4; + PXE_IPADDR ip4; MAC_ADDR mac; } PXE_ARP_ENTRY; -/* NULL if cannot find such entry in ARP table */ +/* initialisation routine */ +void pxe_arp_init(); +/* find MAC by provided ip */ const MAC_ADDR* pxe_arp_ip4mac(uint32_t ip); -int pxe_arp_protocol(pxe_packet *pack, uint8_t function, void *data); +/* protocol handler for received packets */ +int pxe_arp_protocol(PXE_PACKET *pack, uint8_t function, void *data); +/* ARP packet types */ #define PXE_ARPOP_REQUEST 1 #define PXE_ARPOP_REPLY 2 +/* protocol types */ #define PXE_PTYPE_IP 0x0800 /* IP4 protocol, used in ARP request */ /* NOTE: here will be realised ARP for Ethernet and IP4 */ -struct pxe_arp_packet { - uint16_t hwtype; /* hardware type */ +typedef struct pxe_arp_packet { + uint16_t hwtype; /* hardware type */ uint16_t ptype; /* protocol type */ uint8_t hsize; /* size of hardware address */ uint8_t psize; /* size of protocol adress */ uint16_t operation; -} PXE_ARP_PACKET; +} __packed PXE_ARP_PACKET; -struct pxe_arp_packet_eth4 { +typedef struct pxe_arp_packet_eth4 { uint8_t src_hwaddr[6]; /* source hardware address */ - uint8_t src_paddr[4]; /* source protocol address */ + uint32_t src_paddr; /* source protocol address */ uint8_t target_hwaddr[6]; /* target hardware address if known */ - uint8_t target_paddr[4]; /* target protocol address if known */ -} PXE_ARP_PACKET_ETH4 + uint32_t target_paddr; /* target protocol address if known */ +} __packed PXE_ARP_PACKET_ETH4; -struct pxe_arp_pack_data { - pxe_arp_packet hdr; - pxe_arp_packet_eth4 body; -} PXE_ARP_PACK_DATA +typedef struct pxe_arp_pack_data { + PXE_ARP_PACKET hdr; + PXE_ARP_PACKET_ETH4 body; +} __packed PXE_ARP_PACK_DATA; -/* max try count to send/recieve ARP request/reply */ -#define PXE_MAX_ARP_TRY 5 -/* max timeout in seconds */ -#define PXE_TIME_TO_DIE 60 - -void pxe_arp_init(); -#endif+#endif ==== //depot/projects/soc2007/taleks-pxe_http/pxe_core.c#7 (text+ko) ==== @@ -18,8 +18,8 @@ /* NOTE: to think about using of this buffers */ #define PXE_BUFFER_SIZE 0x2000 #define PXE_TFTP_BUFFER_SIZE 512 -static char scratch_buffer[PXE_BUFFER_SIZE]; -static char data_buffer[PXE_BUFFER_SIZE]; +static uint8_t scratch_buffer[PXE_BUFFER_SIZE]; +static uint8_t data_buffer[PXE_BUFFER_SIZE]; static pxenv_t *pxenv_p = NULL; /* PXENV+ */ static pxe_t *pxe_p = NULL; /* !PXE */ static BOOTPLAYER bootplayer; /* PXE Cached information. */ @@ -33,12 +33,12 @@ extern void __pxenventry(void); /* pxe core structures*/ -pxe_packet core_packets[PXE_MAX_PACKETS]; /* buffered packets */ +PXE_PACKET core_packets[PXE_MAX_PACKETS]; /* buffered packets */ pxe_protocol_call core_protocol[256]; /* protocol's callback fuctions */ -pxe_mutex core_mutex = {0, 0}; /* mutex used in packet allocation */ +PXE_MUTEX core_mutex = {0, 0}; /* mutex used in packet allocation */ /* NIC info */ -pxe_ipaddr nic_ip = {0}; +PXE_IPADDR nic_ip = {0}; MAC_ADDR nic_mac; /* may be init it also by zero? */ /* core packet statistics */ @@ -170,9 +170,9 @@ /* 3. additional start UNDI */ /* saving information about NIC */ - nic_ip.ip=bootplayer.yip; /* my ip */ + nic_ip.ip = be2le32(bootplayer.yip); /* my ip */ /* my MAC */ - pxe_memcpy(&nic_mac, bootplayer.CAddr, MAC_ADDR_LEN); + pxe_memcpy(&nic_mac, &bootplayer.CAddr, MAC_ADDR_LEN); return (1); } @@ -217,7 +217,6 @@ v86.ctl = V86_ADDR | V86_CALLF | V86_FLAGS; v86.addr = (VTOPSEG(__isr_install) << 16) | VTOPOFF(__isr_install); - v86.ebx = func; v86int(); v86.ctl = V86_FLAGS; #else @@ -251,8 +250,7 @@ bzero(&v86, sizeof(v86)); v86.ctl = V86_ADDR | V86_CALLF | V86_FLAGS; - v86.addr = (VTOPSEG(__isr_uninstall) << 16) | VTOPOFF(__isr_uninstall); - v86.ebx = func; + v86.addr = (VTOPSEG(__isr_remove) << 16) | VTOPOFF(__isr_remove); v86int(); v86.ctl = V86_FLAGS; @@ -313,15 +311,15 @@ } int -pxe_core_transmit(pxe_packet *pack) +pxe_core_transmit(PXE_PACKET *pack) { - /* NOTE:all provided data must be in base segment of PXE, + /* NOTE:all provided data must be in base memory, * if it's not here, it must be copied here (TO IMPLEMENT) */ t_PXENV_UNDI_TRANSMIT *undi_send = (t_PXENV_UNDI_TRANSMIT *)scratch_buffer; - bzero(undi_send, sizeof(*undi_info)); + bzero(undi_send, sizeof(*undi_send)); t_PXENV_UNDI_TBD tbd; tbd.ImmedLength = pack->data_size; /* packet length */ @@ -332,7 +330,7 @@ undi_send->Protocol = pack->protocol; undi_send->DestAddr.segment = VTOPSEG(pack->dest_mac); undi_send->DestAddr.offset = VTOPOFF(pack->dest_mac); - undi_send->TBD.segment = VTOPSEG(&tbd); /* SEGOFF16 to xmit block data*/ + undi_send->TBD.segment = VTOPSEG(&tbd); /* SEGOFF16 to xmit block data */ undi_send->TBD.offset = VTOPOFF(&tbd); /* NOTE: is it needed? we use only immediate block */ @@ -340,15 +338,15 @@ /* we've inited undi_info with zero, so two lines below are not needed */ /* tbd.DataBlk[0].TDRsvdByte = 0; /* reserved */ /* tbd.DataBlk[1].TDRsvdByte = 0; /* reserved */ - tbd.DataBlk[0].TDDataLen=tbd.ImmedLength; /* size of packet*/ - tbd.DataBlk[0].TDPtrType = 1; /* segment:offset type */ - tbd.DataBlk[0].TDDataPtr.segment = VTOPSEG(pack->data);; - tbd.DataBlk[0].TDDataPtr.offset = VTOPOFF(pack->data);; + tbd.DataBlock[0].TDDataLen=tbd.ImmedLength; /* size of packet*/ + tbd.DataBlock[0].TDPtrType = 1; /* segment:offset type */ + tbd.DataBlock[0].TDDataPtr.segment = VTOPSEG(pack->data);; + tbd.DataBlock[0].TDDataPtr.offset = VTOPOFF(pack->data);; - pxe_core_call(PXENV_UNDI_TRANSMIT_PACKET); + pxe_core_call(PXENV_UNDI_TRANSMIT); if (undi_send->Status != 0) { - printf("pxe_core_transmit(): failed %x\n", undi_info->Status); + printf("pxe_core_transmit(): failed %x\n", undi_send->Status); return (0); } @@ -362,7 +360,7 @@ int i = 0; for (; i < PXE_MAX_PACKETS; ++i) { - pxe_ip *iphdr=(pxe_ip *)(core_packets[i].data); + PXE_IP_HDR *iphdr=(PXE_IP_HDR *)(core_packets[i].data); if (iphdr == NULL) { /* dummy packet */ continue; @@ -399,7 +397,7 @@ bzero(undi_isr, sizeof(*undi_isr)); - undi_isr->FuncFlag=PXENV_UNDI_ISR_IN_START; + undi_isr->FuncFlag = PXENV_UNDI_ISR_IN_START; pxe_core_call(PXENV_UNDI_ISR); if (undi_isr->Status != 0) { /* pxe_core_call() failed */ @@ -470,7 +468,7 @@ } /* - * recieves one packet, if there is any waiting in receiving queue. + * recieves all packets, if there is any waiting in receiving queue. * in: * none * out: @@ -493,14 +491,14 @@ int drop_flag = 0; int processed_packets = 0; - pxe_packet *pack=NULL; /* allocated packet */ - pxe_packet dummy_pack; /* temporary struct, used to mimic + PXE_PACKET *pack=NULL; /* allocated packet */ + PXE_PACKET dummy_pack; /* temporary struct, used to mimic * real packet struct */ if (__pxe_isr_occured == 0) /* there are no packets for us to handle */ return (0); - __pxe_isr_occured = 0; + __pxe_isr_occured = 0; /* reset flag */ t_PXENV_UNDI_ISR *undi_isr = (t_PXENV_UNDI_ISR *)scratch_buffer; @@ -508,7 +506,7 @@ bzero(undi_isr, sizeof(*undi_isr)); /* starting packet receive cycle */ - /* NOTE: pxe_core_recv_packet() name is similar tp pxe_core_get_packet(), + /* NOTE: pxe_core_recv_packets() name is similar tp pxe_core_get_packet(), * may be renaming is needed. */ int func = PXENV_UNDI_ISR_IN_PROCESS; @@ -542,7 +540,7 @@ if (!drop_flag) { - pxe_ip *iphdr = (pxe_ip *)frame_data; + PXE_IP_HDR *iphdr = (PXE_IP_HDR *)frame_data; dummy_pack.protocol = protocol; dummy_pack.state = PXE_PACKET_STATE_USING; @@ -555,9 +553,9 @@ pxe_arp_protocol(&dummy_pack, PXE_CORE_FRAG, NULL); ++processed_packets; - /* aasume ARP packet always in opne fragment */ + /* aasume ARP packet always in one fragment */ - func = PXE_UNDI_ISR_IN_GET_NEXT; + func = PXENV_UNDI_ISR_IN_GET_NEXT; goto packet_start; } @@ -579,7 +577,10 @@ /* trying to get free packets by sending and dropping */ pack = pxe_core_alloc_packet(buffer_size); - /* failed to alloc packet, dropping packet */ + /* failed to alloc packet, dropping packet + * NOTE: may be good idea, simply abort current receive cycle, + * and wait if some protocol will free packet + */ if (pack == NULL) { ++packets_dropped; drop_flag = 1; @@ -598,7 +599,7 @@ while (received < buffer_size) { - if (!pxe_core_get_packet(PXENV_UNDI_ISR_GET_NEXT, undi_isr)) + if (!pxe_core_get_packet(PXENV_UNDI_ISR_IN_GET_NEXT, undi_isr)) break; frame_size = undi_isr->FrameLength; @@ -625,7 +626,7 @@ pack->user_data = NULL; ++packets_received; - pxe_ip *iphdr=(pxe_ip *)pack->data; + PXE_IP_HDR *iphdr=(PXE_IP_HDR *)pack->data; /* TODO: calc ip checksum */ pack->protocol = protocol; @@ -640,19 +641,19 @@ ++processed_packets; /* received one or more packets, but need check if there are any others */ - func = PXE_UNDI_ISR_IN_GET_NEXT; + func = PXENV_UNDI_ISR_IN_GET_NEXT; goto packet_start; /* never getting here */ - return (0); + return (0); } /* * recieves in packet data */ int -pxe_core_recieve(pxe_packet *pack, void *frame_data, size_t frame_size) +pxe_core_recieve(PXE_PACKET *pack, void *frame_data, size_t frame_size) { /* check to be sure */ @@ -671,7 +672,7 @@ /* * allocates packet, creates buffer for data if necessary */ -pxe_packet * +PXE_PACKET * pxe_core_alloc_packet(size_t packet_size) { int i = 1; /* packet index */ @@ -694,6 +695,7 @@ /* failed to allocate enough memory for packet */ if (data == NULL) { core_packets[i].data_size = 0; + pxe_mutex_free(&core_mutex, PXE_OWNER_CORE); return (NULL); } @@ -713,7 +715,7 @@ * drops choosed packet */ void -pxe_core_drop(pxe_packet *pack) +pxe_core_drop(PXE_PACKET *pack) { pxe_mutex_own(&core_mutex, PXE_OWNER_CORE); @@ -742,6 +744,6 @@ const MAC_ADDR* pxe_get_mymac() { - return &nic_mac; + return (const MAC_ADDR *)&nic_mac; } ==== //depot/projects/soc2007/taleks-pxe_http/pxe_core.h#7 (text+ko) ==== @@ -4,6 +4,7 @@ #include #include +#include "pxe.h" /* PXE structures and function codes #include "sys/boot/libi386/pxe.h" */ @@ -32,7 +33,7 @@ uint8_t protocol; /* protocol, used in packet */ uint8_t state; /* state of packet (PXE_PACKET_STATE_ ... ) */ - + void* data; /* pointer to buffer with packet data */ size_t data_size; /* size of packet data */ @@ -56,17 +57,18 @@ int pxe_core_shutdown(); /* sends packet to a network */ -int pxe_core_transmit(pxe_packet *pack); +int pxe_core_transmit(PXE_PACKET *pack); /* commits that packet will not be used */ -void pxe_core_commit(pxe_packet *pack); +void pxe_core_commit(PXE_PACKET *pack); /* allocates buffer for packet */ -pxe_packet *pxe_core_alloc_packet(size_t packet_size); +PXE_PACKET *pxe_core_alloc_packet(size_t packet_size); /* interrupt handler function, that used to get new packets */ void pxe_core_isr(); -/* recieves one packet if it's waiting */ + +/* recieves all packets if it's waiting in queue, and calls protocols if needed */ int pxe_core_recv_packets(); /* calls PXE/UNDI API, registers of processor must be filled in with @@ -81,10 +83,10 @@ void pxe_core_remove_isr(); /* stores data in packet */ -int pxe_core_recieve(pxe_packet *pack, void *data, size_t size); +int pxe_core_recieve(PXE_PACKET *pack, void *data, size_t size); /* drops allocated packet, updates drop count */ -void pxe_core_drop(pxe_packet *pack); +void pxe_core_drop(PXE_PACKET *pack); /* debug function that shows different information about usage */ void pxe_core_stats(); @@ -92,13 +94,14 @@ #define PXE_CORE_HANDLE 0x0 #define PXE_CORE_CHECK 0x1 #define PXE_CORE_FRAG 0x2 -typedef int (*pxe_protocol_call)(pxe_packet *pack, uint8_t function, void *data); +typedef int (*pxe_protocol_call)(PXE_PACKET *pack, uint8_t function, void *data); /* registers protocol */ void pxe_core_register(uint8_t ip_proto, pxe_protocol_call proc); /* returns NIC ip */ uint32_t pxe_get_myip32(); + /* returns NIC MAC */ const MAC_ADDR *pxe_get_mymac(); ==== //depot/projects/soc2007/taleks-pxe_http/pxe_icmp.c#5 (text+ko) ==== @@ -10,7 +10,7 @@ static pinging = 0; int -pxe_icmp_callback(pxe_packet *pack, uint8_t function, void *data) +pxe_icmp_callback(PXE_PACKET *pack, uint8_t function, void *data) { /* we don't store icmp packets, so they cannot steal memory @@ -27,18 +27,18 @@ */ /* icmp header*/ - pxe_ip *iphdr = pack->data; + PXE_IP_HDR *iphdr = (PXE_IP_HDR *)pack->data; size_t iphdr_len = (iphdr->ver_ihl & 0x0f) * 4; - size_t data_size = iphdr->length - iphdr_len - sizeof(pxe_ip); - pxe_icmp *icmphdr = pack->data + sizeof(pxe_ip) + iphdr_len; + size_t data_size = iphdr->length - iphdr_len - sizeof(PXE_IP_HDR); + PXE_ICMP_HDR *icmphdr = (PXE_ICMP_HDR *)(pack->data + sizeof(PXE_IP_HDR) + iphdr_len); /* TODO: verify checksum */ /* reply */ - pxe_packet *pack_out = NULL; - pxe_ip *reply_iphdr = NULL; - pxe_icmp *reply_icmphdr = NULL; - size_t reply_size = sizeof(pxe_ip) + sizeof(pxe_icmp) + data_size; + PXE_PACKET *pack_out = NULL; + PXE_IP_HDR *reply_iphdr = NULL; + PXE_ICMP_HDR *reply_icmphdr = NULL; + size_t reply_size = sizeof(PXE_IP_HDR) + sizeof(PXE_ICMP_HDR) + data_size; /* we are interested only in echo related packets*/ switch(icmphdr->code) { @@ -63,35 +63,35 @@ } /* all we need now is echo reply */ - pxe_packet* pack_out = pxe_core_alloc_packet(reply_size); + pack_out = pxe_core_alloc_packet(reply_size); - if (pack == NULL) { + if (pack_out == NULL) { /* TO THINK: failed to allocate packet, * may be it's better to use * statically allocated packet. */ - return 0; + return (0); } - reply_iphdr = (pxe_ip *)pack_out->data; - reply_icmphdr = (pxe_icmp *)(reply_iphdr + 1); + reply_iphdr = (PXE_IP_HDR *)pack_out->data; + reply_icmphdr = (PXE_ICMP_HDR *)(reply_iphdr + 1); reply_icmphdr->type = PXE_ICMP_ECHO_REPLY; /* copying same values */ reply_icmphdr->code = icmphdr->code; reply_icmphdr->seq_num = icmphdr->seq_num; - reply_icmphdr->packet_id = icmphdr->reply_icmphdr; + reply_icmphdr->packet_id = icmphdr->packet_id; reply_icmphdr->checksum = 0; reply_icmphdr->checksum = - ~(le2be16(pxe_ip_checksum(reply_icmphdr, sizeof(pxe_icmp)))); + ~(le2be16(pxe_ip_checksum(reply_icmphdr, sizeof(PXE_ICMP_HDR)))); pxe_ip_hdr(pack_out->data, iphdr->src_ip, 0x01, reply_size, 0); /* copying all data from request packet to reply packet, * starting after headers */ - pxe_memcpy(reply_icmphdr + 1, pack->data + iphdr_len + sizeof(pxe_icmp), + pxe_memcpy(reply_icmphdr + 1, pack->data + iphdr_len + sizeof(PXE_ICMP_HDR), data_size); pxe_core_transmit(pack_out); @@ -116,15 +116,15 @@ } int -pxe_ping(pxe_ipaddr *ip, int count) +pxe_ping(PXE_IPADDR *ip, int count) { int scount = 0; /* creating packet */ - size_t pack_size = sizeof(pxe_ip) + sizeof(pxe_icmp) + 32; - pxe_packet *pack = pxe_core_alloc_packet(pack_size); - pxe_ip *iphdr = NULL; - pxe_icmp *icmphdr = NULL; + size_t pack_size = sizeof(PXE_IP_HDR) + sizeof(PXE_ICMP_HDR) + 32; + PXE_PACKET *pack = pxe_core_alloc_packet(pack_size); + PXE_IP_HDR *iphdr = NULL; + PXE_ICMP_HDR *icmphdr = NULL; if (pack == NULL) { /* failed to alloc packet */ return (0); @@ -133,8 +133,8 @@ printf("\nping: %x, bytes=32", ip->ip); pinging = ip->ip; - iphdr = (pxe_ip *)pack->data; - icmphdr = (pxe_icmp *)(pack->data + sizeof(pxe_ip)); + iphdr = (PXE_IP_HDR *)pack->data; + icmphdr = (PXE_ICMP_HDR *)(pack->data + sizeof(PXE_IP_HDR)); /* base icmp header side*/ icmphdr->type = PXE_ICMP_ECHO_REQUEST; @@ -150,7 +150,7 @@ */ /* ip header side */ - pxe_ip_hdr(pack->data, ip->ip, 0x01, pack_size, 0); + pxe_create_ip_hdr(pack->data, ip->ip, 0x01, pack_size, 0); while (scount < count) { @@ -160,8 +160,8 @@ /* recalc for every packet */ icmphdr->checksum = 0; - reply_icmphdr->checksum = - ~(le2be16(pxe_ip_checksum(icmphdr, sizeof(pxe_icmp)))); + icmphdr->checksum = + ~(le2be16(pxe_ip_checksum(icmphdr, sizeof(PXE_ICMP_HDR)))); pxe_core_transmit(pack); @@ -173,4 +173,4 @@ pinging = 0; return (scount); -}+} ==== //depot/projects/soc2007/taleks-pxe_http/pxe_icmp.h#4 (text+ko) ==== @@ -10,13 +10,13 @@ */ /* ICMP header */ -typedef struct pxe_icmp { +typedef struct pxe_icmp_hdr { uint8_t type; /* type of ICMP packet */ uint8_t code; /* code, used to identify session */ uint16_t checksum; /* ICMP header checksum */ uint16_t packet_id; /* for echo */ uint16_t seq_num; /* for echo */ -} PXE_ICMP; +} __packed PXE_ICMP_HDR; /* pxe_ping - send icmp echo request packets to host * in: @@ -25,7 +25,7 @@ * out: * successfull recieved echo's count */ -int pxe_ping(pxe_ipaddr *ip, int count); +int pxe_ping(PXE_IPADDR *ip, int count); /* pxe_icmp_init - inits icmp protocol * in: ==== //depot/projects/soc2007/taleks-pxe_http/pxe_ip.c#4 (text+ko) ==== @@ -28,10 +28,10 @@ * it may be useful later, but now it's just unused. */ void -pxe_ip_hdr(void* data, uint32_t dst_ip, uint8_t protocol, +pxe_create_ip_hdr(void* data, uint32_t dst_ip, uint8_t protocol, uint16_t size, uint16_t opts_size) { - pxe_ip *iphdr = (pxe_ip *)data; + PXE_IP_HDR *iphdr = (PXE_IP_HDR *)data; iphdr->checksum = 0; iphdr->length = size; @@ -50,8 +50,8 @@ * 0x5 [header length = 20 bytes, no opts] */ iphdr->ver_ihl = 0x45; - iphdr->ver_ihl += (opts_size >> 2) + iphdr->ver_ihl += (opts_size >> 2); iphdr->checksum = - ~le2be16(pxe_ip_chksum(data, sizeof(pxe_ip) + opts_size)); + ~le2be16(pxe_ip_chksum(data, sizeof(PXE_IP_HDR) + opts_size)); } ==== //depot/projects/soc2007/taleks-pxe_http/pxe_ip.h#3 (text+ko) ==== @@ -5,12 +5,12 @@ #include /* - * IP related code + * IP related declarations * reference: RFC791 */ /* IPv4 header */ -typedef struct pxe_ip { +typedef struct pxe_ip_hdr { uint8_t ver_ihl; /* version & IHL (size / 4 octets)*/ uint8_t tos; /* type of service */ @@ -22,7 +22,7 @@ uint16_t checksum; /* header checksum */ uint32_t src_ip; /* source ip address */ uint32_t dst_ip; /* destination ip address */ -} PXE_ICMP; +} __packed PXE_IP_HDR; /* IPv4 address */ typedef struct pxe_ipaddr { @@ -30,14 +30,14 @@ uint32_t ip; uint8_t octet[4]; }; -} PXE_IPADDR; +} __packed PXE_IPADDR; /* calculates checksum */ uint16_t pxe_ip_checksum(const void *data, size_t size); /* fills ip header data */ -void pxe_ip_hdr(void *data, uint32_t dst_ip, uint8_t protocol, uint16_t size, +void pxe_create_ip_hdr(void *data, uint32_t dst_ip, uint8_t protocol, uint16_t size, uint16_t opts_size); #endif // PXE_IP_H_INCLUDED ==== //depot/projects/soc2007/taleks-pxe_http/pxe_isr.S#3 (text+ko) ==== @@ -137,7 +137,7 @@ pushf # push flags /* - * here is calling of chained interrupt handler. Don't think it' srelly needed now + * here is calling of chained interrupt handler. Don't think it's really needed now ** * pushw %es * movw chained_irq_off+2, %ax @@ -303,7 +303,7 @@ mask_int.1: movw %bx, %cx andw $0x07, %cx - movw $0x1, %bl + movb $0x1, %bl shlb %cl, %bl andb original_mask, %bl # get the original bit for this irq ==== //depot/projects/soc2007/taleks-pxe_http/pxe_isr.h#2 (text+ko) ==== @@ -9,4 +9,6 @@ extern uint16_t __pxe_entry_off; /* PXE! API entry offset */ extern uint16_t __pxe_entry_seg; /* PXE! API entry segment */ -#endif+ extern void __isr_install(); + extern void __isr_remove(); +#endif ==== //depot/projects/soc2007/taleks-pxe_http/pxe_mutex.c#3 (text+ko) ==== @@ -4,7 +4,7 @@ * dummy implementation. Not atomic -> really dummy */ int -pxe_mutex_own(pxe_mutex *mutex, uint32_t owner) +pxe_mutex_own(PXE_MUTEX *mutex, uint32_t owner) { if (mutex->owned == PXE_MUTEX_OWNED) { @@ -22,7 +22,7 @@ } int -pxe_mutex_free(pxe_mutex *mutex, uint32_t owner) +pxe_mutex_free(PXE_MUTEX *mutex, uint32_t owner) { if (mutex->owned == PXE_MUTEX_FREE) @@ -37,13 +37,13 @@ } int -pxe_mutex_wait(pxe_mutex *mutex, uint32_t owner) +pxe_mutex_wait(PXE_MUTEX *mutex, uint32_t owner) { if (mutex->owner == owner) return (1); - /* hope for simebody will free mutex */ + /* hope for somebody will free mutex */ while ((mutex->owned == PXE_MUTEX_OWNED)) {} return (1); ==== //depot/projects/soc2007/taleks-pxe_http/pxe_mutex.h#3 (text+ko) ==== @@ -6,7 +6,7 @@ #include "pxe_mutex.h" /* - * synchronization primitives. + * synchronization primitives. NOT USED in real mode (all synchronous) */ typedef struct pxe_mutex { @@ -20,8 +20,8 @@ #define PXE_MUTEX_OWNED 0x01 #define PXE_MUTEX_FREE 0x00 -int pxe_mutex_own(pxe_mutex *mutex, uint32_t owner); -int pxe_mutex_free(pxe_mutex *mutex, uint32_t owner); -int pxe_mutex_wait(pxe_mutex *mutex, uint32_t owner); +int pxe_mutex_own(PXE_MUTEX *mutex, uint32_t owner); +int pxe_mutex_free(PXE_MUTEX *mutex, uint32_t owner); +int pxe_mutex_wait(PXE_MUTEX *mutex, uint32_t owner); #endif // PXE_MUTEX_H_INCLUDED ==== //depot/projects/soc2007/taleks-pxe_http/pxe_sock.c#3 (text+ko) ==== @@ -3,7 +3,7 @@ #include "pxe_tcp.h" -pxe_socket pxe_sockets[PXE_DEFAULT_SOCKETS]; +PXE_SOCKET pxe_sockets[PXE_DEFAULT_SOCKETS]; int pxe_sockets_init() @@ -64,7 +64,7 @@ int pxe_recv(int socket, void *buf, size_t buflen) { - pxe_socket* sock = &pxe_sockets[socket]; + PXE_SOCKET *sock = &pxe_sockets[socket]; if (sock->sendbuffer.leftbuf < buflen) { } ==== //depot/projects/soc2007/taleks-pxe_http/pxe_sock.h#3 (text+ko) ==== @@ -25,17 +25,17 @@ } PXE_BUFFER; typedef struct pxe_socket { - pxe_buffer send_buffer; - pxe_buffer recv_buffer; + PXE_BUFFER send_buffer; + PXE_BUFFER recv_buffer; uint32_t sent; uint32_t recv; uint8_t state; - pxe_ipaddr local_ip; + PXE_IPADDR local_ip; uint16_t local_port; - pxe_ipaddr remote_ip; + PXE_IPADDR remote_ip; uint16_t remote_port; uint32_t last_time_sent; From owner-p4-projects@FreeBSD.ORG Sun May 13 17:37:34 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 021A116A405; Sun, 13 May 2007 17:37:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8941816A402 for ; Sun, 13 May 2007 17:37:33 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 78D4113C45D for ; Sun, 13 May 2007 17:37:33 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4DHbX50014982 for ; Sun, 13 May 2007 17:37:33 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4DHbXcQ014979 for perforce@freebsd.org; Sun, 13 May 2007 17:37:33 GMT (envelope-from mjacob@freebsd.org) Date: Sun, 13 May 2007 17:37:33 GMT Message-Id: <200705131737.l4DHbXcQ014979@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 119775 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, 13 May 2007 17:37:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=119775 Change 119775 by mjacob@mjexp-obrien on 2007/05/13 17:37:20 IFC Affected files ... .. //depot/projects/mjexp/bin/mv/mv.1#2 integrate .. //depot/projects/mjexp/contrib/amd/amq/amq.8#2 integrate .. //depot/projects/mjexp/etc/defaults/periodic.conf#3 integrate .. //depot/projects/mjexp/etc/periodic/daily/480.status-ntpd#1 branch .. //depot/projects/mjexp/lib/libc/net/ether_addr.c#2 integrate .. //depot/projects/mjexp/libexec/rtld-elf/rtld.1#3 integrate .. //depot/projects/mjexp/sbin/dumpfs/dumpfs.8#2 integrate .. //depot/projects/mjexp/share/man/man4/altq.4#7 integrate .. //depot/projects/mjexp/share/man/man4/axe.4#2 integrate .. //depot/projects/mjexp/share/man/man4/md.4#3 integrate .. //depot/projects/mjexp/share/man/man4/snd_atiixp.4#3 integrate .. //depot/projects/mjexp/share/man/man4/snd_via8233.4#3 integrate .. //depot/projects/mjexp/share/man/man5/periodic.conf.5#2 integrate .. //depot/projects/mjexp/share/man/man9/VFS_SYNC.9#2 integrate .. //depot/projects/mjexp/share/man/man9/VOP_FSYNC.9#2 integrate .. //depot/projects/mjexp/sys/conf/Makefile.amd64#2 integrate .. //depot/projects/mjexp/sys/conf/Makefile.arm#2 integrate .. //depot/projects/mjexp/sys/conf/Makefile.i386#2 integrate .. //depot/projects/mjexp/sys/conf/Makefile.ia64#2 integrate .. //depot/projects/mjexp/sys/conf/Makefile.pc98#2 integrate .. //depot/projects/mjexp/sys/conf/Makefile.powerpc#2 integrate .. //depot/projects/mjexp/sys/conf/Makefile.sparc64#2 integrate .. //depot/projects/mjexp/sys/conf/Makefile.sun4v#2 integrate .. //depot/projects/mjexp/sys/dev/usb/if_axe.c#5 integrate .. //depot/projects/mjexp/sys/dev/usb/if_cue.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/if_cuereg.h#2 integrate .. //depot/projects/mjexp/sys/dev/usb/if_kue.c#3 integrate .. //depot/projects/mjexp/sys/dev/usb/if_kuereg.h#2 integrate .. //depot/projects/mjexp/sys/dev/usb/if_rue.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/if_ruereg.h#2 integrate .. //depot/projects/mjexp/sys/dev/usb/if_udav.c#3 integrate .. //depot/projects/mjexp/sys/dev/usb/uhid.c#2 integrate .. //depot/projects/mjexp/sys/dev/usb/ukbd.c#5 integrate .. //depot/projects/mjexp/sys/dev/usb/ums.c#3 integrate .. //depot/projects/mjexp/sys/dev/usb/usb.c#3 integrate .. //depot/projects/mjexp/sys/dev/usb/usb_mem.c#2 integrate .. //depot/projects/mjexp/sys/kern/kern_mib.c#3 integrate .. //depot/projects/mjexp/sys/net/ethernet.h#6 integrate .. //depot/projects/mjexp/sys/pc98/conf/GENERIC#7 integrate .. //depot/projects/mjexp/sys/sys/param.h#16 integrate .. //depot/projects/mjexp/usr.bin/ldd/ldd.1#2 integrate .. //depot/projects/mjexp/usr.bin/tip/tip/acu.c#2 integrate .. //depot/projects/mjexp/usr.sbin/boot0cfg/boot0cfg.8#2 integrate .. //depot/projects/mjexp/usr.sbin/config/Makefile#2 integrate .. //depot/projects/mjexp/usr.sbin/config/config.8#3 integrate .. //depot/projects/mjexp/usr.sbin/config/config.h#3 integrate .. //depot/projects/mjexp/usr.sbin/config/config.y#3 integrate .. //depot/projects/mjexp/usr.sbin/config/configvers.h#3 integrate .. //depot/projects/mjexp/usr.sbin/config/kernconf.tmpl#1 branch .. //depot/projects/mjexp/usr.sbin/config/lang.l#2 integrate .. //depot/projects/mjexp/usr.sbin/config/main.c#3 integrate .. //depot/projects/mjexp/usr.sbin/iostat/iostat.c#3 integrate .. //depot/projects/mjexp/usr.sbin/pccard/pccardc/pccardc.8#2 integrate Differences ... ==== //depot/projects/mjexp/bin/mv/mv.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mv.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/mv/mv.1,v 1.28 2005/01/16 16:41:58 ru Exp $ +.\" $FreeBSD: src/bin/mv/mv.1,v 1.29 2007/05/12 22:18:27 pav Exp $ .\" .Dd July 9, 2002 .Dt MV 1 @@ -113,9 +113,9 @@ to be verbose, showing files after they are moved. .El .Pp -It is an error for either the +It is an error for the .Ar source -operand or the destination path to specify a directory unless both do. +operand to specify a directory if the target exists and is not a directory. .Pp If the destination path does not have a mode which permits writing, .Nm ==== //depot/projects/mjexp/contrib/amd/amq/amq.8#2 (text+ko) ==== @@ -39,7 +39,7 @@ .\" %W% (Berkeley) %G% .\" .\" $Id: amq.8,v 1.3.2.8 2004/01/06 03:15:16 ezk Exp $ -.\" $FreeBSD: src/contrib/amd/amq/amq.8,v 1.12 2005/06/16 20:21:02 ru Exp $ +.\" $FreeBSD: src/contrib/amd/amq/amq.8,v 1.13 2007/05/12 10:25:31 pav Exp $ .\" .Dd March 16, 1991 .Dt AMQ 8 @@ -133,7 +133,7 @@ Ask the automounter to use the logging options specified in .Ar log_options from now on. -.It Fl D Ar log_options +.It Fl D Ar debug_options Ask the automounter to use the debugging options specified in .Ar debug_options from now on. ==== //depot/projects/mjexp/etc/defaults/periodic.conf#3 (text+ko) ==== @@ -13,7 +13,7 @@ # For a more detailed explanation of all the periodic.conf variables, please # refer to the periodic.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/periodic.conf,v 1.42 2007/04/06 02:33:06 pjd Exp $ +# $FreeBSD: src/etc/defaults/periodic.conf,v 1.43 2007/05/13 09:33:35 maxim Exp $ # # What files override these defaults ? @@ -130,6 +130,9 @@ daily_status_named_enable="YES" daily_status_named_usedns="YES" # DNS lookups are ok +# 480.status-ntpd +daily_status_ntpd_enable="NO" # Check NTP status + # 500.queuerun daily_queuerun_enable="YES" # Run mail queue daily_submit_queuerun="YES" # Also submit queue ==== //depot/projects/mjexp/lib/libc/net/ether_addr.c#2 (text+ko) ==== @@ -1,6 +1,6 @@ /* - * Copyright (c) 1995 - * Bill Paul . All rights reserved. + * Copyright (c) 1995 Bill Paul . + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -37,103 +37,90 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/ether_addr.c,v 1.15 2002/04/08 07:51:10 ru Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/ether_addr.c,v 1.16 2007/05/13 12:04:06 rwatson Exp $"); -#include -#include #include -#include -#include #include #include + #include + #ifdef YP #include #include #include #endif +#include +#include +#include +#include + #ifndef _PATH_ETHERS -#define _PATH_ETHERS "/etc/ethers" +#define _PATH_ETHERS "/etc/ethers" #endif /* - * Parse a string of text containing an ethernet address and hostname - * and separate it into its component parts. + * Parse a string of text containing an ethernet address and hostname and + * separate it into its component parts. */ int -ether_line(l, e, hostname) - const char *l; - struct ether_addr *e; - char *hostname; +ether_line(const char *l, struct ether_addr *e, char *hostname) { int i, o[6]; - i = sscanf(l, "%x:%x:%x:%x:%x:%x %s", &o[0], &o[1], &o[2], - &o[3], &o[4], &o[5], - hostname); + i = sscanf(l, "%x:%x:%x:%x:%x:%x %s", &o[0], &o[1], &o[2], &o[3], + &o[4], &o[5], hostname); if (i != 7) return (i); - for (i=0; i<6; i++) e->octet[i] = o[i]; return (0); } /* - * Convert an ASCII representation of an ethernet address to - * binary form. + * Convert an ASCII representation of an ethernet address to binary form. */ -struct -ether_addr *ether_aton(a) - const char *a; +struct ether_addr * +ether_aton(const char *a) { int i; static struct ether_addr o; unsigned int o0, o1, o2, o3, o4, o5; i = sscanf(a, "%x:%x:%x:%x:%x:%x", &o0, &o1, &o2, &o3, &o4, &o5); - if (i != 6) return (NULL); - o.octet[0]=o0; o.octet[1]=o1; o.octet[2]=o2; o.octet[3]=o3; o.octet[4]=o4; o.octet[5]=o5; - return ((struct ether_addr *)&o); } /* - * Convert a binary representation of an ethernet address to - * an ASCII string. + * Convert a binary representation of an ethernet address to an ASCII string. */ -char -*ether_ntoa(n) - const struct ether_addr *n; +char * +ether_ntoa(const struct ether_addr *n) { int i; static char a[18]; - i = sprintf(a, "%02x:%02x:%02x:%02x:%02x:%02x", - n->octet[0], n->octet[1], n->octet[2], - n->octet[3], n->octet[4], n->octet[5]); + i = sprintf(a, "%02x:%02x:%02x:%02x:%02x:%02x", n->octet[0], + n->octet[1], n->octet[2], n->octet[3], n->octet[4], n->octet[5]); if (i < 17) return (NULL); return ((char *)&a); } /* - * Map an ethernet address to a hostname. Use either /etc/ethers or - * NIS/YP. + * Map an ethernet address to a hostname. Use either /etc/ethers or NIS/YP. */ int -ether_ntohost(hostname, e) - char *hostname; - const struct ether_addr *e; +ether_ntohost(char *hostname, const struct ether_addr *e) { FILE *fp; char buf[BUFSIZ + 2]; @@ -145,9 +132,9 @@ char *ether_a; char *yp_domain; #endif + if ((fp = fopen(_PATH_ETHERS, "r")) == NULL) return (1); - while (fgets(buf,BUFSIZ,fp)) { if (buf[0] == '#') continue; @@ -157,7 +144,7 @@ continue; ether_a = ether_ntoa(e); if (yp_match(yp_domain, "ethers.byaddr", ether_a, - strlen(ether_a), &result, &resultlen)) { + strlen(ether_a), &result, &resultlen)) { continue; } strncpy(buf, result, resultlen); @@ -167,8 +154,8 @@ #endif if (!ether_line(buf, &local_ether, local_host)) { if (!bcmp((char *)&local_ether.octet[0], - (char *)&e->octet[0], 6)) { - /* We have a match */ + (char *)&e->octet[0], 6)) { + /* We have a match. */ strcpy(hostname, local_host); fclose(fp); return(0); @@ -180,13 +167,10 @@ } /* - * Map a hostname to an ethernet address using /etc/ethers or - * NIS/YP. + * Map a hostname to an ethernet address using /etc/ethers or NIS/YP. */ int -ether_hostton(hostname, e) - const char *hostname; - struct ether_addr *e; +ether_hostton(const char *hostname, struct ether_addr *e) { FILE *fp; char buf[BUFSIZ + 2]; @@ -197,9 +181,9 @@ int resultlen; char *yp_domain; #endif + if ((fp = fopen(_PATH_ETHERS, "r")) == NULL) return (1); - while (fgets(buf,BUFSIZ,fp)) { if (buf[0] == '#') continue; @@ -208,7 +192,7 @@ if (yp_get_default_domain(&yp_domain)) continue; if (yp_match(yp_domain, "ethers.byname", hostname, - strlen(hostname), &result, &resultlen)) { + strlen(hostname), &result, &resultlen)) { continue; } strncpy(buf, result, resultlen); @@ -218,9 +202,9 @@ #endif if (!ether_line(buf, &local_ether, local_host)) { if (!strcmp(hostname, local_host)) { - /* We have a match */ + /* We have a match. */ bcopy((char *)&local_ether.octet[0], - (char *)&e->octet[0], 6); + (char *)&e->octet[0], 6); fclose(fp); return(0); } ==== //depot/projects/mjexp/libexec/rtld-elf/rtld.1#3 (text+ko) ==== @@ -26,7 +26,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/libexec/rtld-elf/rtld.1,v 1.43 2007/01/23 22:38:39 jhb Exp $ +.\" $FreeBSD: src/libexec/rtld-elf/rtld.1,v 1.45 2007/05/12 12:26:25 pav Exp $ .\" .Dd March 27, 2006 .Dt RTLD 1 @@ -158,6 +158,12 @@ option and allows .Xr ldd 1 to be operated as a filter more conveniently. +If the dependency name starts with string +.Pa lib , +.Ev LD_TRACE_LOADED_OBJECTS_FMT1 +is used, otherwise +.Ev LD_TRACE_LOADED_OBJECTS_FMT2 +is used. The following conversions can be used: .Bl -tag -width 4n .It Li %a @@ -169,8 +175,6 @@ .Ev LD_TRACE_LOADED_OBJECTS_PROGNAME .It Li %o The library name. -.It Li %m -The library's major version number. .It Li %p The full pathname as determined by .Nm rtld Ns 's ==== //depot/projects/mjexp/sbin/dumpfs/dumpfs.8#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)dumpfs.8 8.1 (Berkeley) 6/5/93 -.\" $FreeBSD: src/sbin/dumpfs/dumpfs.8,v 1.15 2005/02/10 09:19:28 ru Exp $ +.\" $FreeBSD: src/sbin/dumpfs/dumpfs.8,v 1.16 2007/05/12 22:35:22 pav Exp $ .\" .Dd January 19, 2003 .Dt DUMPFS 8 @@ -53,9 +53,10 @@ .Pp If .Fl m -is specified, the file system is marshalled in terms of a +is specified, a .Xr newfs 8 -command to generate the file system. +command is printed that can be used to generate a new file system +with equivalent settings. .Sh SEE ALSO .Xr disktab 5 , .Xr fs 5 , ==== //depot/projects/mjexp/share/man/man4/altq.4#7 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/altq.4,v 1.29 2007/05/09 05:18:04 brueffer Exp $ +.\" $FreeBSD: src/share/man/man4/altq.4,v 1.30 2007/05/12 05:59:15 brueffer Exp $ .\" -.Dd May 9, 2007 +.Dd May 12, 2007 .Dt ALTQ 4 .Os .Sh NAME @@ -119,6 +119,7 @@ .Xr ath 4 , .Xr aue 4 , .Xr awi 4 , +.Xt axe 4 , .Xr bce 4 , .Xr bfe 4 , .Xr bge 4 , ==== //depot/projects/mjexp/share/man/man4/axe.4#2 (text+ko) ==== @@ -28,9 +28,9 @@ .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF .\" THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/axe.4,v 1.12 2005/10/07 02:32:15 trhodes Exp $ +.\" $FreeBSD: src/share/man/man4/axe.4,v 1.13 2007/05/12 05:59:15 brueffer Exp $ .\" -.Dd July 16, 2005 +.Dd May 12, 2007 .Dt AXE 4 .Os .Sh NAME @@ -154,6 +154,7 @@ The driver failed to allocate an mbuf for the receiver ring. .El .Sh SEE ALSO +.Xr altq 4 , .Xr arp 4 , .Xr miibus 4 , .Xr netintro 4 , ==== //depot/projects/mjexp/share/man/man4/md.4#3 (text+ko) ==== @@ -5,7 +5,7 @@ .\" this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp .\" ---------------------------------------------------------------------------- .\" -.\" $FreeBSD: src/share/man/man4/md.4,v 1.12 2006/11/24 18:53:45 imp Exp $ +.\" $FreeBSD: src/share/man/man4/md.4,v 1.13 2007/05/12 15:33:18 pav Exp $ .\" .Dd November 24, 2006 .Dt MD 4 @@ -50,7 +50,14 @@ This allows for mounting ISO images without the tedious detour over actual physical media. .It Cm swap -Backing store is allocated from swap space. +Backing store is allocated from buffer memory. +Pages get pushed out to the swap when the system is under memory +pressure, otherwise they stay in the operating memory. +Using +.Cm swap +backing is generally preferable over +.Cm malloc +backing. .El .Pp For more information, please see ==== //depot/projects/mjexp/share/man/man4/snd_atiixp.4#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/snd_atiixp.4,v 1.4 2006/11/29 17:07:02 joel Exp $ +.\" $FreeBSD: src/share/man/man4/snd_atiixp.4,v 1.5 2007/05/12 06:33:52 brueffer Exp $ .\" .Dd November 29, 2006 .Dt SND_ATIIXP 4 @@ -66,6 +66,7 @@ Polling is disabled by default. Do not enable it unless you are facing weird interrupt problems or if the device cannot generate interrupts at all. +.El .Sh HARDWARE The .Nm ==== //depot/projects/mjexp/share/man/man4/snd_via8233.4#3 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man4/snd_via8233.4,v 1.6 2006/11/29 17:07:02 joel Exp $ +.\" $FreeBSD: src/share/man/man4/snd_via8233.4,v 1.7 2007/05/12 06:41:41 brueffer Exp $ .\" .Dd November 29, 2006 .Dt SND_VIA8233 4 @@ -66,6 +66,7 @@ Polling is disabled by default. Do not enable it unless you are facing weird interrupt problems or if the device cannot generate interrupts at all. +.El .Sh HARDWARE The .Nm ==== //depot/projects/mjexp/share/man/man5/periodic.conf.5#2 (text+ko) ==== @@ -23,9 +23,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man5/periodic.conf.5,v 1.64 2006/09/04 10:20:53 trhodes Exp $ +.\" $FreeBSD: src/share/man/man5/periodic.conf.5,v 1.65 2007/05/13 09:33:35 maxim Exp $ .\" -.Dd September 3, 2006 +.Dd May 12, 2007 .Dt PERIODIC.CONF 5 .Os .Sh NAME @@ -592,6 +592,11 @@ Set to .Dq Li YES if you want to enable reverse DNS lookups. +.It Va daily_status_ntpd +.Pq Vt bool +Set to +.Dq Li YES +if you want to enable NTP status check. .It Va daily_queuerun_enable .Pq Vt bool Set to ==== //depot/projects/mjexp/share/man/man9/VFS_SYNC.9#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/VFS_SYNC.9,v 1.15 2005/06/15 13:31:23 ru Exp $ +.\" $FreeBSD: src/share/man/man9/VFS_SYNC.9,v 1.16 2007/05/12 13:10:55 pav Exp $ .\" .Dd January 7, 2005 .Os @@ -39,7 +39,7 @@ .In sys/mount.h .In sys/vnode.h .Ft int -.Fn VFS_SYNC "struct mount *mp" "int waitfor" "struct ucred *cred" "struct thread *td" +.Fn VFS_SYNC "struct mount *mp" "int waitfor" "struct thread *td" .Sh DESCRIPTION The .Fn VFS_SYNC @@ -61,8 +61,6 @@ .It Dv MNT_LAZY push data not written by file system syncer .El -.It Fa cred -The caller's credentials. .It Fa td The calling thread. .El ==== //depot/projects/mjexp/share/man/man9/VOP_FSYNC.9#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" $FreeBSD: src/share/man/man9/VOP_FSYNC.9,v 1.15 2005/06/28 20:15:18 hmp Exp $ +.\" $FreeBSD: src/share/man/man9/VOP_FSYNC.9,v 1.16 2007/05/12 13:10:55 pav Exp $ .\" .Dd July 24, 1996 .Os @@ -38,7 +38,7 @@ .In sys/param.h .In sys/vnode.h .Ft int -.Fn VOP_FSYNC "struct vnode *vp" "struct ucred *cred" "int waitfor" "struct thread *td" +.Fn VOP_FSYNC "struct vnode *vp" "int waitfor" "struct thread *td" .Sh DESCRIPTION This call flushes any dirty file system buffers for the file. It is used to implement the @@ -51,8 +51,6 @@ .Bl -tag -width waitfor .It Fa vp The vnode of the file. -.It Fa cred -The caller's credentials. .It Fa waitfor Whether the function should wait for I/O to complete. Possible values are: @@ -84,7 +82,7 @@ .Sh PSEUDOCODE .Bd -literal int -vop_fsync(struct vnode *vp, struct ucred *cred, int waitfor, struct thread *td) +vop_fsync(struct vnode *vp, int waitfor, struct thread *td) { struct buf *bp; struct buf *nbp; ==== //depot/projects/mjexp/sys/conf/Makefile.amd64#2 (text+ko) ==== @@ -2,7 +2,7 @@ # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 # from FreeBSD: src/sys/conf/Makefile.i386,v 1.255 2002/02/20 23:35:49 -# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.22 2005/11/28 17:51:30 imp Exp $ +# $FreeBSD: src/sys/conf/Makefile.amd64,v 1.23 2007/05/13 02:36:40 wkoszek Exp $ # # Makefile for FreeBSD # @@ -18,7 +18,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600004 +%VERSREQ= 600006 STD8X16FONT?= iso ==== //depot/projects/mjexp/sys/conf/Makefile.arm#2 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.arm -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.arm,v 1.31 2006/07/24 22:09:47 cognet Exp $ +# $FreeBSD: src/sys/conf/Makefile.arm,v 1.32 2007/05/13 02:36:40 wkoszek Exp $ # # Makefile for FreeBSD # @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600004 +%VERSREQ= 600006 # Temporary stuff while we're still embryonic NO_MODULES= ==== //depot/projects/mjexp/sys/conf/Makefile.i386#2 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.i386,v 1.271 2006/01/29 03:32:19 nyan Exp $ +# $FreeBSD: src/sys/conf/Makefile.i386,v 1.272 2007/05/13 02:36:40 wkoszek Exp $ # # Makefile for FreeBSD # @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600004 +%VERSREQ= 600006 STD8X16FONT?= iso ==== //depot/projects/mjexp/sys/conf/Makefile.ia64#2 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.ia64 -- with config changes. # Copyright 1990 W. Jolitz # from: src/sys/conf/Makefile.alpha,v 1.76 -# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.67 2005/11/28 17:51:31 imp Exp $ +# $FreeBSD: src/sys/conf/Makefile.ia64,v 1.68 2007/05/13 02:36:40 wkoszek Exp $ # # Makefile for FreeBSD # @@ -19,7 +19,7 @@ GCC3= you bet # Which version of config(8) is required. -%VERSREQ= 600004 +%VERSREQ= 600006 STD8X16FONT?= iso ==== //depot/projects/mjexp/sys/conf/Makefile.pc98#2 (text+ko) ==== @@ -3,7 +3,7 @@ # Makefile.i386 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.173 2006/01/29 03:32:19 nyan Exp $ +# $FreeBSD: src/sys/conf/Makefile.pc98,v 1.174 2007/05/13 02:36:41 wkoszek Exp $ # # Makefile for FreeBSD # @@ -19,7 +19,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600004 +%VERSREQ= 600006 .if !defined(S) .if exists(./@/.) ==== //depot/projects/mjexp/sys/conf/Makefile.powerpc#2 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.powerpc -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.283 2005/11/28 17:51:31 imp Exp $ +# $FreeBSD: src/sys/conf/Makefile.powerpc,v 1.284 2007/05/13 02:36:41 wkoszek Exp $ # # Makefile for FreeBSD # @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600004 +%VERSREQ= 600006 STD8X16FONT?= iso ==== //depot/projects/mjexp/sys/conf/Makefile.sparc64#2 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.sparc64 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.38 2005/11/28 17:51:31 imp Exp $ +# $FreeBSD: src/sys/conf/Makefile.sparc64,v 1.39 2007/05/13 02:36:41 wkoszek Exp $ # # Makefile for FreeBSD # @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600004 +%VERSREQ= 600006 STD8X16FONT?= iso ==== //depot/projects/mjexp/sys/conf/Makefile.sun4v#2 (text+ko) ==== @@ -1,7 +1,7 @@ # Makefile.sparc64 -- with config changes. # Copyright 1990 W. Jolitz # from: @(#)Makefile.i386 7.1 5/10/91 -# $FreeBSD: src/sys/conf/Makefile.sun4v,v 1.1 2006/10/05 06:14:24 kmacy Exp $ +# $FreeBSD: src/sys/conf/Makefile.sun4v,v 1.2 2007/05/13 02:36:41 wkoszek Exp $ # # Makefile for FreeBSD # @@ -17,7 +17,7 @@ # # Which version of config(8) is required. -%VERSREQ= 600004 +%VERSREQ= 600006 STD8X16FONT?= iso ==== //depot/projects/mjexp/sys/dev/usb/if_axe.c#5 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_axe.c,v 1.43 2007/05/01 11:17:29 brueffer Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_axe.c,v 1.44 2007/05/12 05:56:10 brueffer Exp $"); /* * ASIX Electronics AX88172 USB 2.0 ethernet driver. Used in the @@ -501,7 +501,9 @@ ifp->if_start = axe_start; ifp->if_watchdog = axe_watchdog; ifp->if_init = axe_init; - ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; + IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); + ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN; + IFQ_SET_READY(&ifp->if_snd); sc->axe_qdat.ifp = ifp; sc->axe_qdat.if_rxstart = axe_rxstart; @@ -750,7 +752,7 @@ if (!sc->axe_link && mii->mii_media_status & IFM_ACTIVE && IFM_SUBTYPE(mii->mii_media_active) != IFM_NONE) { sc->axe_link++; - if (ifp->if_snd.ifq_head != NULL) + if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) axe_start(ifp); } @@ -815,14 +817,14 @@ return; } - IF_DEQUEUE(&ifp->if_snd, m_head); + IFQ_DRV_DEQUEUE(&ifp->if_snd, m_head); if (m_head == NULL) { AXE_UNLOCK(sc); return; } if (axe_encap(sc, m_head, 0)) { - IF_PREPEND(&ifp->if_snd, m_head); + IFQ_DRV_PREPEND(&ifp->if_snd, m_head); ifp->if_drv_flags |= IFF_DRV_OACTIVE; AXE_UNLOCK(sc); return; @@ -1045,7 +1047,7 @@ AXE_UNLOCK(sc); - if (ifp->if_snd.ifq_head != NULL) + if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) axe_start(ifp); return; ==== //depot/projects/mjexp/sys/dev/usb/if_cue.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_cue.c,v 1.63 2006/09/07 00:06:41 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_cue.c,v 1.64 2007/05/12 05:53:52 brueffer Exp $"); /* * CATC USB-EL1210A USB to ethernet driver. Used in the CATC Netmate @@ -70,9 +70,6 @@ #include #include -#if __FreeBSD_version < 500000 -#include -#endif #include #include @@ -357,11 +354,7 @@ /* now program new ones */ IF_ADDR_LOCK(ifp); -#if __FreeBSD_version >= 500000 TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) -#else - LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) -#endif { if (ifma->ifma_addr->sa_family != AF_LINK) continue; @@ -375,11 +368,7 @@ * so we can receive broadcast frames. */ if (ifp->if_flags & IFF_BROADCAST) { -#if __FreeBSD_version >= 500000 h = cue_mchash(ifp->if_broadcastaddr); -#else - h = cue_mchash(etherbroadcastaddr); -#endif sc->cue_mctab[h >> 3] |= 1 << (h & 0x7); } @@ -487,10 +476,8 @@ } } -#if __FreeBSD_version >= 500000 mtx_init(&sc->cue_mtx, device_get_nameunit(self), MTX_NETWORK_LOCK, MTX_DEF | MTX_RECURSE); -#endif CUE_LOCK(sc); #ifdef notdef @@ -506,9 +493,7 @@ if (ifp == NULL) { printf("cue%d: can not if_alloc()\n", sc->cue_unit); CUE_UNLOCK(sc); -#if __FreeBSD_version >= 500000 mtx_destroy(&sc->cue_mtx); -#endif USB_ATTACH_ERROR_RETURN; } ifp->if_softc = sc; @@ -529,11 +514,7 @@ /* * Call MI attach routine. */ -#if __FreeBSD_version >= 500000 ether_ifattach(ifp, eaddr); -#else - ether_ifattach(ifp, ETHER_BPF_SUPPORTED); -#endif callout_handle_init(&sc->cue_stat_ch); usb_register_netisr(); sc->cue_dying = 0; @@ -554,12 +535,8 @@ sc->cue_dying = 1; untimeout(cue_tick, sc, sc->cue_stat_ch); -#if __FreeBSD_version >= 500000 ether_ifdetach(ifp); if_free(ifp); -#else - ether_ifdetach(ifp, ETHER_BPF_SUPPORTED); -#endif if (sc->cue_ep[CUE_ENDPT_TX] != NULL) usbd_abort_pipe(sc->cue_ep[CUE_ENDPT_TX]); @@ -569,9 +546,7 @@ usbd_abort_pipe(sc->cue_ep[CUE_ENDPT_INTR]); CUE_UNLOCK(sc); -#if __FreeBSD_version >= 500000 mtx_destroy(&sc->cue_mtx); -#endif return(0); } ==== //depot/projects/mjexp/sys/dev/usb/if_cuereg.h#2 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/if_cuereg.h,v 1.18 2005/06/10 16:49:15 brooks Exp $ + * $FreeBSD: src/sys/dev/usb/if_cuereg.h,v 1.19 2007/05/12 05:53:52 brueffer Exp $ */ /* @@ -154,9 +154,7 @@ u_int16_t cue_rxfilt; struct ue_cdata cue_cdata; struct callout_handle cue_stat_ch; -#if __FreeBSD_version >= 500000 struct mtx cue_mtx; -#endif char cue_dying; struct timeval cue_rx_notice; struct usb_qdat cue_qdat; ==== //depot/projects/mjexp/sys/dev/usb/if_kue.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_kue.c,v 1.71 2006/10/07 18:03:39 flz Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_kue.c,v 1.73 2007/05/12 05:56:58 brueffer Exp $"); /* * Kawasaki LSI KL5KUSB101B USB to ethernet adapter driver. @@ -85,9 +85,6 @@ #include #include -#if __FreeBSD_version < 500000 -#include -#endif #include #include @@ -329,11 +326,7 @@ sc->kue_rxfilt &= ~KUE_RXFILT_ALLMULTI; IF_ADDR_LOCK(ifp); -#if __FreeBSD_version >= 500000 TAILQ_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) -#else - LIST_FOREACH(ifma, &ifp->if_multiaddrs, ifma_link) -#endif { if (ifma->ifma_addr->sa_family != AF_LINK) continue; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun May 13 17:43:42 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3DD6816A406; Sun, 13 May 2007 17:43:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C7FFA16A403 for ; Sun, 13 May 2007 17:43:41 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B94DB13C469 for ; Sun, 13 May 2007 17:43:41 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4DHhfUV016281 for ; Sun, 13 May 2007 17:43:41 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4DHhfWJ016275 for perforce@freebsd.org; Sun, 13 May 2007 17:43:41 GMT (envelope-from mjacob@freebsd.org) Date: Sun, 13 May 2007 17:43:41 GMT Message-Id: <200705131743.l4DHhfWJ016275@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 119776 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, 13 May 2007 17:43:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=119776 Change 119776 by mjacob@mjexp on 2007/05/13 17:43:07 Temp workaround config_intrhook_establish running the hook right away. Affected files ... .. //depot/projects/mjexp/sys/dev/isp/isp_freebsd.c#26 edit Differences ... ==== //depot/projects/mjexp/sys/dev/isp/isp_freebsd.c#26 (text+ko) ==== @@ -146,12 +146,15 @@ isp->isp_osinfo.ehook.ich_func = isp_intr_enable; isp->isp_osinfo.ehook.ich_arg = isp; + ISP_UNLOCK(isp); if (config_intrhook_establish(&isp->isp_osinfo.ehook) != 0) { + ISP_LOCK(isp); cam_sim_free(sim, TRUE); isp_prt(isp, ISP_LOGERR, "could not establish interrupt enable hook"); return; } + ISP_LOCK(isp); if (xpt_bus_register(sim, primary) != CAM_SUCCESS) { cam_sim_free(sim, TRUE); From owner-p4-projects@FreeBSD.ORG Sun May 13 19:58:36 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F44316A40B; Sun, 13 May 2007 19:58:36 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 130FE16A404 for ; Sun, 13 May 2007 19:58:36 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0345113C4C5 for ; Sun, 13 May 2007 19:58:36 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4DJwZOA053097 for ; Sun, 13 May 2007 19:58:35 GMT (envelope-from bms@incunabulum.net) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4DJwZcn053088 for perforce@freebsd.org; Sun, 13 May 2007 19:58:35 GMT (envelope-from bms@incunabulum.net) Date: Sun, 13 May 2007 19:58:35 GMT Message-Id: <200705131958.l4DJwZcn053088@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bms@incunabulum.net using -f From: Bruce M Simpson To: Perforce Change Reviews Cc: Subject: PERFORCE change 119786 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, 13 May 2007 19:58:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=119786 Change 119786 by bms@bms_anglepoise on 2007/05/13 19:58:21 misc changes to siba-pci bridge code Affected files ... .. //depot/projects/mips2/src/sys/mips/mips32/sentry5/siba_cc.c#6 edit .. //depot/projects/mips2/src/sys/mips/mips32/sentry5/siba_pcib.c#4 edit .. //depot/projects/mips2/src/sys/mips/mips32/sentry5/siba_pcibvar.h#2 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips32/sentry5/siba_cc.c#6 (text+ko) ==== @@ -33,6 +33,8 @@ * GPIO lives here. * The hardware watchdog lives here. * Clock control registers live here. + * You don't need to read them to determine the clock speed on the 5365, + * which is always 200MHz and thus may be hardcoded (for now). * Flash config registers live here. There may or may not be system flash. * The external interface bus lives here (conditionally). * There is a JTAG interface here which may be used to attach probes to ==== //depot/projects/mips2/src/sys/mips/mips32/sentry5/siba_pcib.c#4 (text+ko) ==== @@ -63,12 +63,33 @@ #define MIPS_MEM_RID 0x20 #endif +#define SIBA_PCI_SLOTMAX 16 + +#define siba_pcib_read_4(sc, reg) \ + bus_space_write_4((sc)->sc_bt, (sc)->sc_bh, (reg)) + +#define siba_pcib_write_4(sc, reg, val) \ + bus_space_write_4((sc)->sc_bt, (sc)->sc_bh, (reg), (val)) + +#define SIBA_PCIB_CFG 0x0c000000 /* bottom pci window (64MB) */ + +#define SIBA_PCIB_SBTOPCI0 0x0100 +#define SIBA_PCIB_SBTOPCI1 0x0104 +#define SIBA_PCIB_SBTOPCI2 0x0108 + +#define SIBA_PCIB_SBTOPCICFG0 0x00000002 +#define SIBA_PCIB_SBTOPCICFG1 0x00000003 +#define SIBA_PCIB_SBTOPCICFG0_MASK 0xfc000000 +#define SIBA_PCIB_SBTOPCICFG1_MASK 0xfc000000 +#define SIBA_PCIB_SBTOPCICFG2_MASK 0xc0000000 + /* * TODO: interrupt routing. * TODO: implement configuration space access. * TODO: map pci i/o windows. * TODO: fully implement bus allocation. * TODO: implement resource managers. + * TODO: code cleanup. */ static int siba_pcib_activate_resource(device_t, device_t, int, @@ -79,6 +100,8 @@ static int siba_pcib_attach(device_t); static int siba_pcib_deactivate_resource(device_t, device_t, int, int, struct resource *); +static bus_addr_t + siba_pcib_map_csr(device_t, u_int, u_int, u_int, u_int); static int siba_pcib_maxslots(device_t); static int siba_pcib_probe(device_t); static u_int32_t @@ -100,6 +123,8 @@ siba_pcib_probe(device_t dev) { + /* TODO: support earlier cores. */ + /* TODO: Check if PCI host mode is enabled in the SPROM. */ if (siba_get_vendor(dev) == SIBA_VID_BROADCOM && siba_get_device(dev) == SIBA_DEVID_PCI) { device_set_desc(dev, "SiBa-to-PCI host bridge"); @@ -112,8 +137,7 @@ static int siba_pcib_attach(device_t dev) { - //struct siba_pcib_softc *sc = device_get_softc(dev); - struct resource *mem; + struct siba_pcib_softc *sc = device_get_softc(dev); int rid; /* @@ -121,13 +145,16 @@ * determined for us. */ rid = MIPS_MEM_RID; - mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, + sc->sc_mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); - if (mem == NULL) { + if (sc->sc_mem == NULL) { device_printf(dev, "unable to allocate memory\n"); return (ENXIO); } + sc->sc_bt = rman_get_bustag(sc->sc_mem); + sc->sc_bh = rman_get_bushandle(sc->sc_mem); + device_add_child(dev, "pci", -1); return (bus_generic_attach(dev)); } @@ -267,7 +294,8 @@ siba_pcib_maxslots(device_t dev) { - //return (PCI_SLOTMAX); + //return (SIBA_PCI_SLOTMAX); + // For now, only probe the first function including the bridge. return (1); } @@ -275,10 +303,31 @@ siba_pcib_read_config(device_t dev, u_int bus, u_int slot, u_int func, u_int reg, int bytes) { + bus_addr_t csrbase; + uint32_t val; + + /* + * XXX: TODO de-mipsify; we should map windows for the space + * the bridge uses and do bus_space_read in those as nexus will + * translate accesses into KSEG1 for us. + */ + csrbase = siba_pcib_map_csr(dev, bus, slot, func, reg); + val = *(volatile uint32_t *)MIPS_PHYS_TO_KSEG1(csrbase); + + switch (bytes) { + case 1: + val &= 0xff; + break; + case 2: + val &= 0xffff; + break; + case 4: + break; + default: + return (ENXIO); + } - /* read from pci configuration space */ - device_printf(dev, "%s: not yet implemented\n", __func__); - return (-1); + return (val); } static void @@ -298,6 +347,43 @@ return (-1); } +/* + * Map CSR registers of a device on the PCI bus into an available window. + * XXX This should really use bus_space_map. + * XXX I need to map these windows before I can use them. + */ +static bus_addr_t +siba_pcib_map_csr(device_t dev, u_int bus, u_int slot, u_int func, u_int reg) +{ + struct siba_pcib_softc *sc = device_get_softc(dev); + bus_addr_t csrbase, csrmap; + + printf("%s: entry", __func__); + (void)sc; + + if (bus == 0) { + csrbase = SIBA_PCIB_SBTOPCICFG0 | + ((1 << (slot + 16)) & SIBA_PCIB_SBTOPCICFG1_MASK); + // XXX exception here + //siba_pcib_write_4(sc, SIBA_PCIB_SBTOPCI0, csrbase); + + csrmap = SIBA_PCIB_CFG | + ((1 << (slot + 16)) & ~SIBA_PCIB_SBTOPCICFG1_MASK) | + (func << 8) | (reg & ~3); + } else { + // XXX exception here + //siba_pcib_write_4(sc, SIBA_PCIB_SBTOPCI0, + // SIBA_PCIB_SBTOPCICFG1); + csrmap = SIBA_PCIB_CFG | (bus << 16) | (slot << 11) | + (func << 8) | (reg & ~3); + } + + printf("%s: %d/%d/%d reg %d mapped at %08x\n", __func__, bus, slot, func, reg, + csrmap); + + return (csrmap); +} + static device_method_t siba_pcib_methods[] = { /* Device interface */ DEVMETHOD(device_attach, siba_pcib_attach), ==== //depot/projects/mips2/src/sys/mips/mips32/sentry5/siba_pcibvar.h#2 (text+ko) ==== @@ -34,9 +34,10 @@ u_int sc_bus; /* PCI bus number */ struct resource *sc_mem; /* siba memory window */ struct resource *sc_csr; /* config space */ -#if 0 + bus_space_tag_t sc_bt; bus_space_handle_t sc_bh; +#if 0 bus_addr_t sc_maddr; bus_size_t sc_msize; From owner-p4-projects@FreeBSD.ORG Sun May 13 20:00:41 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2119216A407; Sun, 13 May 2007 20:00:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BB0A416A404 for ; Sun, 13 May 2007 20:00:40 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id AC6F313C458 for ; Sun, 13 May 2007 20:00:40 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4DK0ejj053302 for ; Sun, 13 May 2007 20:00:40 GMT (envelope-from bms@incunabulum.net) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4DK0eMg053299 for perforce@freebsd.org; Sun, 13 May 2007 20:00:40 GMT (envelope-from bms@incunabulum.net) Date: Sun, 13 May 2007 20:00:40 GMT Message-Id: <200705132000.l4DK0eMg053299@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bms@incunabulum.net using -f From: Bruce M Simpson To: Perforce Change Reviews Cc: Subject: PERFORCE change 119787 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, 13 May 2007 20:00:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=119787 Change 119787 by bms@bms_anglepoise on 2007/05/13 19:59:39 copy code to MI location; we will use this for if_bfe and uart siba_mips is MD code so it stays under sys/mips/ Affected files ... .. //depot/projects/mips2/src/sys/dev/siba/siba.c#1 branch .. //depot/projects/mips2/src/sys/dev/siba/siba_cc.c#1 branch .. //depot/projects/mips2/src/sys/dev/siba/siba_ids.h#1 branch .. //depot/projects/mips2/src/sys/dev/siba/siba_pcib.c#1 branch .. //depot/projects/mips2/src/sys/dev/siba/siba_pcibvar.h#1 branch .. //depot/projects/mips2/src/sys/dev/siba/siba_sdram.c#1 branch .. //depot/projects/mips2/src/sys/dev/siba/sibareg.h#1 branch .. //depot/projects/mips2/src/sys/dev/siba/sibavar.h#1 branch Differences ... From owner-p4-projects@FreeBSD.ORG Sun May 13 20:02:44 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A54916A406; Sun, 13 May 2007 20:02:44 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3A6A516A404 for ; Sun, 13 May 2007 20:02:44 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2B60013C45D for ; Sun, 13 May 2007 20:02:44 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4DK2i80053974 for ; Sun, 13 May 2007 20:02:44 GMT (envelope-from bms@incunabulum.net) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4DK2hvn053971 for perforce@freebsd.org; Sun, 13 May 2007 20:02:43 GMT (envelope-from bms@incunabulum.net) Date: Sun, 13 May 2007 20:02:43 GMT Message-Id: <200705132002.l4DK2hvn053971@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bms@incunabulum.net using -f From: Bruce M Simpson To: Perforce Change Reviews Cc: Subject: PERFORCE change 119788 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, 13 May 2007 20:02:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=119788 Change 119788 by bms@bms_anglepoise on 2007/05/13 20:02:07 add copyright; fixup paths and include sentinels Affected files ... .. //depot/projects/mips2/src/sys/dev/siba/siba_ids.h#2 edit Differences ... ==== //depot/projects/mips2/src/sys/dev/siba/siba_ids.h#2 (text+ko) ==== @@ -1,8 +1,31 @@ -/* - * copyright goes here +/*- + * Copyright (c) 2007 Bruce M. Simpson. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 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. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ -#ifndef _SENTRY5_SIBA_IDS_H_ -#define _SENTRY5_SIBA_IDS_H_ + +#ifndef _SIBA_SIBA_IDS_H_ +#define _SIBA_SIBA_IDS_H_ /* * Constants and structures for SiBa bus enumeration. @@ -43,4 +66,4 @@ */ #define SIBA_REV_ANY 0xff -#endif /*_SENTRY5_SIBA_IDS_H_ */ +#endif /*_SIBA_SIBA_IDS_H_ */ From owner-p4-projects@FreeBSD.ORG Sun May 13 20:06:50 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A7A7416A406; Sun, 13 May 2007 20:06:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4214F16A402 for ; Sun, 13 May 2007 20:06:50 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 32CFA13C44C for ; Sun, 13 May 2007 20:06:50 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4DK6o3j055757 for ; Sun, 13 May 2007 20:06:50 GMT (envelope-from bms@incunabulum.net) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4DK6nRP055754 for perforce@freebsd.org; Sun, 13 May 2007 20:06:49 GMT (envelope-from bms@incunabulum.net) Date: Sun, 13 May 2007 20:06:49 GMT Message-Id: <200705132006.l4DK6nRP055754@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bms@incunabulum.net using -f From: Bruce M Simpson To: Perforce Change Reviews Cc: Subject: PERFORCE change 119789 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, 13 May 2007 20:06:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=119789 Change 119789 by bms@bms_anglepoise on 2007/05/13 20:06:23 rototile paths and sentinels; de-linuxify defines Affected files ... .. //depot/projects/mips2/src/sys/dev/siba/siba.c#2 edit .. //depot/projects/mips2/src/sys/dev/siba/siba_cc.c#2 edit .. //depot/projects/mips2/src/sys/dev/siba/siba_pcib.c#2 edit .. //depot/projects/mips2/src/sys/dev/siba/siba_pcibvar.h#2 edit .. //depot/projects/mips2/src/sys/dev/siba/siba_sdram.c#2 edit .. //depot/projects/mips2/src/sys/dev/siba/sibareg.h#2 edit .. //depot/projects/mips2/src/sys/dev/siba/sibavar.h#2 edit Differences ... ==== //depot/projects/mips2/src/sys/dev/siba/siba.c#2 (text+ko) ==== @@ -37,14 +37,13 @@ #include -#include -#include -#include +#include +#include +#include /* + * TODO: De-mipsify this code. * TODO: cpu clock calculation. -> move to siba_cc instance - * TODO: De-mipsify this code. - * TODO: Move siba to a machine independent location. * TODO: Hardwire IRQs for attached cores on siba at probe time. * TODO: Support detach. * TODO: Power management. ==== //depot/projects/mips2/src/sys/dev/siba/siba_cc.c#2 (text+ko) ==== @@ -54,9 +54,9 @@ #include -#include -#include -#include +#include +#include +#include static int siba_cc_attach(device_t); static int siba_cc_probe(device_t); ==== //depot/projects/mips2/src/sys/dev/siba/siba_pcib.c#2 (text+ko) ==== @@ -54,10 +54,10 @@ #include "pcib_if.h" -#include -#include -#include -#include +#include +#include +#include +#include #ifndef MIPS_MEM_RID #define MIPS_MEM_RID 0x20 ==== //depot/projects/mips2/src/sys/dev/siba/siba_pcibvar.h#2 (text+ko) ==== ==== //depot/projects/mips2/src/sys/dev/siba/siba_sdram.c#2 (text+ko) ==== @@ -43,9 +43,9 @@ #include -#include -#include -#include +#include +#include +#include static int siba_sdram_attach(device_t); static int siba_sdram_probe(device_t); ==== //depot/projects/mips2/src/sys/dev/siba/sibareg.h#2 (text+ko) ==== @@ -25,15 +25,12 @@ */ /* - * TODO: clockspeed routines + * TODO: sprom * TODO: implement dma translation bits (if needed for system bus) - * TODO: de-linuxify - * TODO: update paths - * TODO: sprom */ -#ifndef _SIBAREG_H_ -#define _SIBAREG_H_ +#ifndef _SIBA_SIBAREG_H_ +#define _SIBA_SIBAREG_H_ #define SIBA_CORE_LEN 0x00001000 /* Size of cfg per core */ #define SIBA_CFG_END 0x00010000 /* Upper bound of cfg space */ @@ -45,6 +42,7 @@ /* * Offsets of ChipCommon core registers. + * XXX: move to siba_cc */ #define SIBA_CC_UART0 0x00000300 /* offset of UART0 */ #define SIBA_CC_UART1 0x00000400 /* offset of UART1 */ @@ -58,34 +56,16 @@ #define SIBA_CC_NRCORESMASK 0x0F000000 #define SIBA_CC_NRCORESSHIFT 24 -#define SSB_IDHIGH_RCLO 0x0000000F /* Revision Code (low part) */ -#define SSB_IDHIGH_CC 0x00008FF0 /* Core Code */ -#define SSB_IDHIGH_CC_SHIFT 4 -#define SSB_IDHIGH_RCHI 0x00007000 /* Revision Code (high part) */ -#define SSB_IDHIGH_RCHI_SHIFT 8 -#define SSB_IDHIGH_VC 0xFFFF0000 /* Vendor Code */ -#define SSB_IDHIGH_VC_SHIFT 16 +#define SIBA_IDHIGH_RCLO 0x0000000F /* Revision Code (low part) */ +#define SIBA_IDHIGH_CC 0x00008FF0 /* Core Code */ +#define SIBA_IDHIGH_CC_SHIFT 4 +#define SIBA_IDHIGH_RCHI 0x00007000 /* Revision Code (high part) */ +#define SIBA_IDHIGH_RCHI_SHIFT 8 +#define SIBA_IDHIGH_VC 0xFFFF0000 /* Vendor Code */ +#define SIBA_IDHIGH_VC_SHIFT 16 #define SIBA_CCID_BCM4710 0x4710 #define SIBA_CCID_BCM4704 0x4704 #define SIBA_CCID_SENTRY5 0x5365 - -#if 0 -/* XXX very important to port this */ -extern u32 ssb_clockspeed(struct ssb_bus *bus); -int ssb_device_is_enabled(struct ssb_device *dev); -void ssb_device_enable(struct ssb_device *dev, u32 core_specific_flags); -void ssb_device_disable(struct ssb_device *dev, u32 core_specific_flags); -#endif - -#if 0 -/* Translation (routing) bits that need to be ORed to DMA - * addresses before they are given to a device. */ -extern u32 ssb_dma_translation(struct ssb_device *dev); -#define SSB_DMA_TRANSLATION_MASK 0xC0000000 -#define SSB_DMA_TRANSLATION_SHIFT 30 -extern int ssb_dma_set_mask(struct ssb_device *ssb_dev, u64 mask); -#endif - -#endif /* _SIBAREG_H_ */ +#endif /* _SIBA_SIBAREG_H_ */ ==== //depot/projects/mips2/src/sys/dev/siba/sibavar.h#2 (text+ko) ==== @@ -24,8 +24,8 @@ * SUCH DAMAGE. */ -#ifndef _SIBAVAR_H_ -#define _SIBAVAR_H_ +#ifndef _SIBA_SIBAVAR_H_ +#define _SIBA_SIBAVAR_H_ #include @@ -41,7 +41,6 @@ uint8_t sc_ncores; }; - struct siba_devinfo { struct resource_list sdi_rl; /*devhandle_t sdi_devhandle; XXX*/ @@ -86,4 +85,4 @@ #undef SIBA_ACCESSOR -#endif /* _SIBAVAR_H_ */ +#endif /* _SIBA_SIBAVAR_H_ */ From owner-p4-projects@FreeBSD.ORG Sun May 13 20:08:53 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B5F1316A404; Sun, 13 May 2007 20:08:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5218416A400 for ; Sun, 13 May 2007 20:08:53 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4311D13C46A for ; Sun, 13 May 2007 20:08:53 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4DK8rYZ056020 for ; Sun, 13 May 2007 20:08:53 GMT (envelope-from bms@incunabulum.net) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4DK8rxr056016 for perforce@freebsd.org; Sun, 13 May 2007 20:08:53 GMT (envelope-from bms@incunabulum.net) Date: Sun, 13 May 2007 20:08:53 GMT Message-Id: <200705132008.l4DK8rxr056016@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bms@incunabulum.net using -f From: Bruce M Simpson To: Perforce Change Reviews Cc: Subject: PERFORCE change 119790 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, 13 May 2007 20:08:54 -0000 http://perforce.freebsd.org/chv.cgi?CH=119790 Change 119790 by bms@bms_anglepoise on 2007/05/13 20:08:36 nuke old files; update files Affected files ... .. //depot/projects/mips2/src/sys/mips/mips32/sentry5/files.sentry5#8 edit .. //depot/projects/mips2/src/sys/mips/mips32/sentry5/siba.c#9 delete .. //depot/projects/mips2/src/sys/mips/mips32/sentry5/siba_ids.h#2 delete .. //depot/projects/mips2/src/sys/mips/mips32/sentry5/siba_pcib.c#5 delete .. //depot/projects/mips2/src/sys/mips/mips32/sentry5/siba_pcibvar.h#3 delete .. //depot/projects/mips2/src/sys/mips/mips32/sentry5/sibareg.h#2 delete .. //depot/projects/mips2/src/sys/mips/mips32/sentry5/sibavar.h#3 delete Differences ... ==== //depot/projects/mips2/src/sys/mips/mips32/sentry5/files.sentry5#8 (text+ko) ==== @@ -1,18 +1,15 @@ # $FreeBSD$ -#mips/mips32/sentry5/s5_machdep.c standard - # TODO: Add attachment elsehwere in the tree # for USB 1.1 OHCI, Ethernet and IPSEC cores # which are believed to be devices we have drivers for # which just need to be tweaked for attachment to an SSB system bus. -mips/mips32/sentry5/siba.c optional siba -mips/mips32/sentry5/siba_cc.c optional siba +dev/siba/siba.c optional siba +dev/siba/siba_cc.c optional siba +dev/siba/siba_pcib.c optional siba pci -# PCI host bridge -mips/mips32/sentry5/siba_pcib.c optional pci +#mips/mips32/sentry5/s5_machdep.c standard -# neither of these are actually need yet. -mips/mips32/sentry5/siba_mips.c optional siba -mips/mips32/sentry5/siba_sdram.c optional siba +# notyet +#mips/mips32/sentry5/siba_mips.c optional siba From owner-p4-projects@FreeBSD.ORG Sun May 13 20:10:56 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B6F816A405; Sun, 13 May 2007 20:10:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 60F6E16A403 for ; Sun, 13 May 2007 20:10:56 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 39C9D13C44B for ; Sun, 13 May 2007 20:10:56 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4DKAuPq056219 for ; Sun, 13 May 2007 20:10:56 GMT (envelope-from bms@incunabulum.net) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4DKAtZo056215 for perforce@freebsd.org; Sun, 13 May 2007 20:10:55 GMT (envelope-from bms@incunabulum.net) Date: Sun, 13 May 2007 20:10:55 GMT Message-Id: <200705132010.l4DKAtZo056215@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bms@incunabulum.net using -f From: Bruce M Simpson To: Perforce Change Reviews Cc: Subject: PERFORCE change 119791 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, 13 May 2007 20:10:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=119791 Change 119791 by bms@bms_anglepoise on 2007/05/13 20:10:14 nuke files which are MD, not MI Affected files ... .. //depot/projects/mips2/src/sys/dev/siba/siba_cc.c#3 delete .. //depot/projects/mips2/src/sys/dev/siba/siba_sdram.c#3 delete Differences ... From owner-p4-projects@FreeBSD.ORG Sun May 13 20:10:57 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 46E0D16A517; Sun, 13 May 2007 20:10:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id ABF1F16A47B for ; Sun, 13 May 2007 20:10:56 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8E1FC13C457 for ; Sun, 13 May 2007 20:10:56 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4DKAuvT056239 for ; Sun, 13 May 2007 20:10:56 GMT (envelope-from bms@incunabulum.net) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4DKAu7F056222 for perforce@freebsd.org; Sun, 13 May 2007 20:10:56 GMT (envelope-from bms@incunabulum.net) Date: Sun, 13 May 2007 20:10:56 GMT Message-Id: <200705132010.l4DKAu7F056222@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bms@incunabulum.net using -f From: Bruce M Simpson To: Perforce Change Reviews Cc: Subject: PERFORCE change 119792 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, 13 May 2007 20:10:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=119792 Change 119792 by bms@bms_anglepoise on 2007/05/13 20:10:33 point MD code at MI paths for stuff it needs Affected files ... .. //depot/projects/mips2/src/sys/mips/mips32/sentry5/siba_cc.c#7 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips32/sentry5/siba_cc.c#7 (text+ko) ==== @@ -26,6 +26,7 @@ /* * Child driver for ChipCommon core. + * This is not MI code at the moment. * Two 16C550 compatible UARTs live here. On the WGT634U, uart1 is the * system console, and uart0 is not pinned out. * Because their presence is conditional, they should probably @@ -54,9 +55,9 @@ #include -#include -#include -#include +#include +#include +#include static int siba_cc_attach(device_t); static int siba_cc_probe(device_t); From owner-p4-projects@FreeBSD.ORG Sun May 13 20:11:58 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7513416A404; Sun, 13 May 2007 20:11:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3ABF716A402 for ; Sun, 13 May 2007 20:11:58 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2BD6713C459 for ; Sun, 13 May 2007 20:11:58 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4DKBwg3056898 for ; Sun, 13 May 2007 20:11:58 GMT (envelope-from bms@incunabulum.net) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4DKBv5s056892 for perforce@freebsd.org; Sun, 13 May 2007 20:11:57 GMT (envelope-from bms@incunabulum.net) Date: Sun, 13 May 2007 20:11:57 GMT Message-Id: <200705132011.l4DKBv5s056892@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bms@incunabulum.net using -f From: Bruce M Simpson To: Perforce Change Reviews Cc: Subject: PERFORCE change 119793 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, 13 May 2007 20:11:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=119793 Change 119793 by bms@bms_anglepoise on 2007/05/13 20:11:52 catch up with MI paths Affected files ... .. //depot/projects/mips2/src/sys/mips/mips32/sentry5/siba_mips.c#4 edit .. //depot/projects/mips2/src/sys/mips/mips32/sentry5/siba_sdram.c#4 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips32/sentry5/siba_mips.c#4 (text+ko) ==== @@ -43,9 +43,9 @@ #include -#include -#include -#include +#include +#include +#include static int siba_mips_attach(device_t); static int siba_mips_probe(device_t); ==== //depot/projects/mips2/src/sys/mips/mips32/sentry5/siba_sdram.c#4 (text+ko) ==== @@ -43,9 +43,9 @@ #include -#include -#include -#include +#include +#include +#include static int siba_sdram_attach(device_t); static int siba_sdram_probe(device_t); From owner-p4-projects@FreeBSD.ORG Sun May 13 20:58:57 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8B9E216A404; Sun, 13 May 2007 20:58:57 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 477A316A402 for ; Sun, 13 May 2007 20:58:57 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 375F913C457 for ; Sun, 13 May 2007 20:58:57 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4DKwv8d072665 for ; Sun, 13 May 2007 20:58:57 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4DKwvpk072662 for perforce@freebsd.org; Sun, 13 May 2007 20:58:57 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 13 May 2007 20:58:57 GMT Message-Id: <200705132058.l4DKwvpk072662@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 119795 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, 13 May 2007 20:58:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=119795 Change 119795 by hselasky@hselasky_mini_itx on 2007/05/13 20:58:10 Teardown the USB transfers a little bit earlier in the USB network drivers. Some fixes to if_zyd regarding unlocked forwarding of data to the ieee80211 layer. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/if_aue.c#25 edit .. //depot/projects/usb/src/sys/dev/usb/if_axe.c#24 edit .. //depot/projects/usb/src/sys/dev/usb/if_cdce.c#17 edit .. //depot/projects/usb/src/sys/dev/usb/if_cue.c#20 edit .. //depot/projects/usb/src/sys/dev/usb/if_kue.c#22 edit .. //depot/projects/usb/src/sys/dev/usb/if_rue.c#21 edit .. //depot/projects/usb/src/sys/dev/usb/if_rum.c#4 edit .. //depot/projects/usb/src/sys/dev/usb/if_udav.c#21 edit .. //depot/projects/usb/src/sys/dev/usb/if_ural.c#27 edit .. //depot/projects/usb/src/sys/dev/usb/if_zyd.c#11 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/if_aue.c#25 (text+ko) ==== @@ -960,6 +960,9 @@ mtx_unlock(&(sc->sc_mtx)); + /* stop all USB transfers first */ + usbd_transfer_unsetup(sc->sc_xfer, AUE_ENDPT_MAX); + /* get rid of any late children */ bus_generic_detach(dev); @@ -968,8 +971,6 @@ if_free(ifp); } - usbd_transfer_unsetup(sc->sc_xfer, AUE_ENDPT_MAX); - usbd_config_td_unsetup(&(sc->sc_config_td)); __callout_drain(&(sc->sc_watchdog)); ==== //depot/projects/usb/src/sys/dev/usb/if_axe.c#24 (text+ko) ==== @@ -947,6 +947,9 @@ mtx_unlock(&(sc->sc_mtx)); + /* stop all USB transfers first */ + usbd_transfer_unsetup(sc->sc_xfer, AXE_ENDPT_MAX); + /* get rid of any late children */ bus_generic_detach(dev); @@ -955,8 +958,6 @@ if_free(ifp); } - usbd_transfer_unsetup(sc->sc_xfer, AXE_ENDPT_MAX); - usbd_config_td_unsetup(&(sc->sc_config_td)); __callout_drain(&(sc->sc_watchdog)); ==== //depot/projects/usb/src/sys/dev/usb/if_cdce.c#17 (text+ko) ==== @@ -414,6 +414,9 @@ mtx_unlock(&(sc->sc_mtx)); + /* stop all USB transfers first */ + usbd_transfer_unsetup(sc->sc_xfer, CDCE_ENDPT_MAX); + /* get rid of any late children */ bus_generic_detach(dev); @@ -423,8 +426,6 @@ ifmedia_removeall(&(sc->sc_ifmedia)); } - usbd_transfer_unsetup(sc->sc_xfer, CDCE_ENDPT_MAX); - mtx_destroy(&(sc->sc_mtx)); return (0); ==== //depot/projects/usb/src/sys/dev/usb/if_cue.c#20 (text+ko) ==== @@ -599,6 +599,9 @@ mtx_unlock(&(sc->sc_mtx)); + /* stop all USB transfers first */ + usbd_transfer_unsetup(sc->sc_xfer, CUE_ENDPT_MAX); + /* get rid of any late children */ bus_generic_detach(dev); @@ -607,8 +610,6 @@ if_free(ifp); } - usbd_transfer_unsetup(sc->sc_xfer, CUE_ENDPT_MAX); - usbd_config_td_unsetup(&(sc->sc_config_td)); __callout_drain(&(sc->sc_watchdog)); ==== //depot/projects/usb/src/sys/dev/usb/if_kue.c#22 (text+ko) ==== @@ -635,6 +635,9 @@ mtx_unlock(&(sc->sc_mtx)); + /* stop all USB transfers first */ + usbd_transfer_unsetup(sc->sc_xfer, KUE_ENDPT_MAX); + /* get rid of any late children */ bus_generic_detach(dev); @@ -643,8 +646,6 @@ if_free(ifp); } - usbd_transfer_unsetup(sc->sc_xfer, KUE_ENDPT_MAX); - usbd_config_td_unsetup(&(sc->sc_config_td)); __callout_drain(&(sc->sc_watchdog)); ==== //depot/projects/usb/src/sys/dev/usb/if_rue.c#21 (text+ko) ==== @@ -853,6 +853,9 @@ mtx_unlock(&(sc->sc_mtx)); + /* stop all USB transfers first */ + usbd_transfer_unsetup(sc->sc_xfer, RUE_ENDPT_MAX); + /* get rid of any late children */ bus_generic_detach(dev); @@ -861,8 +864,6 @@ if_free(ifp); } - usbd_transfer_unsetup(sc->sc_xfer, RUE_ENDPT_MAX); - usbd_config_td_unsetup(&(sc->sc_config_td)); __callout_drain(&(sc->sc_watchdog)); ==== //depot/projects/usb/src/sys/dev/usb/if_rum.c#4 (text+ko) ==== @@ -518,9 +518,7 @@ mtx_unlock(&(sc->sc_mtx)); - /* XXX make sure that all USB callbacks have exited - * before tearing down the network stack: - */ + /* stop all USB transfers first */ usbd_transfer_unsetup(sc->sc_xfer, RUM_N_TRANSFER); /* get rid of any late children */ ==== //depot/projects/usb/src/sys/dev/usb/if_udav.c#21 (text+ko) ==== @@ -465,6 +465,9 @@ mtx_unlock(&(sc->sc_mtx)); + /* stop all USB transfers first */ + usbd_transfer_unsetup(sc->sc_xfer, UDAV_ENDPT_MAX); + /* get rid of any late children */ bus_generic_detach(dev); @@ -473,8 +476,6 @@ if_free(ifp); } - usbd_transfer_unsetup(sc->sc_xfer, UDAV_ENDPT_MAX); - usbd_config_td_unsetup(&(sc->sc_config_td)); __callout_drain(&(sc->sc_watchdog)); ==== //depot/projects/usb/src/sys/dev/usb/if_ural.c#27 (text+ko) ==== @@ -573,9 +573,7 @@ mtx_unlock(&(sc->sc_mtx)); - /* XXX make sure that all USB callbacks have exited - * before tearing down the network stack: - */ + /* stop all USB transfers first */ usbd_transfer_unsetup(sc->sc_xfer, URAL_N_TRANSFER); /* get rid of any late children */ ==== //depot/projects/usb/src/sys/dev/usb/if_zyd.c#11 (text+ko) ==== @@ -78,6 +78,12 @@ #define DPRINTF(...) #endif +struct mq { /* mini-queue */ + struct mbuf *ifq_head; + struct mbuf *ifq_tail; + uint16_t ifq_len; +}; + static device_probe_t zyd_probe; static device_attach_t zyd_attach; static device_detach_t zyd_detach; @@ -120,7 +126,7 @@ static void zyd_cfg_write32_batch(struct zyd_softc *sc, const struct zyd_adpairs32 *data, uint32_t count); static void zyd_cfg_rfwrite(struct zyd_softc *sc, uint32_t value, uint8_t bits); static void zyd_cfg_stateoutput(struct zyd_softc *sc) __used; -static void zyd_rxframeproc(struct usbd_xfer *xfer, uint16_t offset, uint16_t len); +static void zyd_rxframeproc(struct usbd_xfer *xfer, struct mq *mq, uint16_t offset, uint16_t len); static uint8_t zyd_cfg_uploadfirmware(struct zyd_softc *sc); static void zyd_cfg_lock_phy(struct zyd_softc *sc); static void zyd_cfg_unlock_phy(struct zyd_softc *sc); @@ -954,7 +960,8 @@ * inside a single USB transfer. */ static void -zyd_rxframeproc(struct usbd_xfer *xfer, uint16_t offset, uint16_t len) +zyd_rxframeproc(struct usbd_xfer *xfer, struct mq *mq, + uint16_t offset, uint16_t len) { struct zyd_softc *sc = xfer->priv_sc; struct ieee80211com *ic = &(sc->sc_ic); @@ -1029,11 +1036,11 @@ ni = ieee80211_find_rxnode(ic, (void *)(m->m_data)); - /* send the frame to the 802.11 layer */ - ieee80211_input(ic, m, ni, desc.signalstrength, 0); + /* XXX our small hacks XXX */ + ni->ni_rssi = desc.signalstrength; + m->m_pkthdr.rcvif = (void *)ni; - /* node is no longer needed */ - ieee80211_free_node(ni); + _IF_ENQUEUE(mq, m); DPRINTF(sc, 14, "rx done\n"); @@ -1078,7 +1085,10 @@ struct zyd_softc *sc = xfer->priv_sc; struct ieee80211com *ic = &(sc->sc_ic); struct ifnet *ifp = ic->ic_ifp; + struct ieee80211_node *ni; struct zyd_rxleninfoapp info; + struct mq mq = { NULL, NULL, 0 }; + struct mbuf *m; USBD_CHECK_STATUS(xfer); @@ -1133,17 +1143,45 @@ goto tr_setup; } - zyd_rxframeproc(xfer, ZYD_PLCP_HDR_SIZE, + zyd_rxframeproc(xfer, &mq, ZYD_PLCP_HDR_SIZE, xfer->actlen - ZYD_PLCP_HDR_SIZE); } tr_setup: if (sc->sc_flags & ZYD_FLAG_BULK_READ_STALL) { usbd_transfer_start(sc->sc_xfer[ZYD_TR_BULK_CS_RD]); - return; + } else { + usbd_start_hardware(xfer); } - usbd_start_hardware(xfer); + /* At the end of a USB callback it is always safe + * to unlock the private mutex of a device! That + * is why we do the "ieee80211_input" here, and not + * some lines up! + */ + if (mq.ifq_head) { + + mtx_unlock(&(sc->sc_mtx)); + + while (1) { + + _IF_DEQUEUE(&(mq), m); + + if (m == NULL) break; + + /* XXX undo our small hacks XXX */ + ni = (void *)(m->m_pkthdr.rcvif); + m->m_pkthdr.rcvif = ifp; + + /* send the frame to the 802.11 layer */ + ieee80211_input(ic, m, ni, ni->ni_rssi, 0); + + /* node is no longer needed */ + ieee80211_free_node(ni); + } + + mtx_lock(&(sc->sc_mtx)); + } return; } @@ -2157,6 +2195,9 @@ mtx_unlock(&(sc->sc_mtx)); + /* stop all USB transfers first */ + usbd_transfer_unsetup(sc->sc_xfer, ZYD_TR_MAX); + /* get rid of any late children */ bus_generic_detach(dev); @@ -2166,8 +2207,6 @@ if_free(ifp); } - usbd_transfer_unsetup(sc->sc_xfer, ZYD_TR_MAX); - usbd_config_td_unsetup(&(sc->sc_config_td)); __callout_drain(&(sc->sc_watchdog)); From owner-p4-projects@FreeBSD.ORG Sun May 13 21:19:23 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 23EF016A404; Sun, 13 May 2007 21:19:23 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D742B16A400 for ; Sun, 13 May 2007 21:19:22 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C831313C4B7 for ; Sun, 13 May 2007 21:19:22 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4DLJMi7077391 for ; Sun, 13 May 2007 21:19:22 GMT (envelope-from bms@incunabulum.net) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4DLJMB8077388 for perforce@freebsd.org; Sun, 13 May 2007 21:19:22 GMT (envelope-from bms@incunabulum.net) Date: Sun, 13 May 2007 21:19:22 GMT Message-Id: <200705132119.l4DLJMB8077388@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bms@incunabulum.net using -f From: Bruce M Simpson To: Perforce Change Reviews Cc: Subject: PERFORCE change 119796 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, 13 May 2007 21:19:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=119796 Change 119796 by bms@bms_anglepoise on 2007/05/13 21:18:28 catch up with recent changes Affected files ... .. //depot/projects/mips2/src/sys/dev/siba/siba.c#3 edit .. //depot/projects/mips2/src/sys/mips/mips32/sentry5/files.sentry5#9 edit Differences ... ==== //depot/projects/mips2/src/sys/dev/siba/siba.c#3 (text+ko) ==== @@ -485,10 +485,10 @@ idlo = siba_read_4(sc, idx, SIBA_CORE_IDLO); idhi = siba_read_4(sc, idx, SIBA_CORE_IDHI); - vendorid = (idhi & SSB_IDHIGH_VC) >> SSB_IDHIGH_VC_SHIFT; + vendorid = (idhi & SIBA_IDHIGH_VC) >> SIBA_IDHIGH_VC_SHIFT; devid = ((idhi & 0x8ff0) >> 4); - rev = (idhi & SSB_IDHIGH_RCLO); - rev |= (idhi & SSB_IDHIGH_RCHI) >> SSB_IDHIGH_RCHI_SHIFT; + rev = (idhi & SIBA_IDHIGH_RCLO); + rev |= (idhi & SIBA_IDHIGH_RCHI) >> SIBA_IDHIGH_RCHI_SHIFT; sdi->sdi_vid = vendorid; sdi->sdi_devid = devid; ==== //depot/projects/mips2/src/sys/mips/mips32/sentry5/files.sentry5#9 (text+ko) ==== @@ -6,10 +6,9 @@ # which just need to be tweaked for attachment to an SSB system bus. dev/siba/siba.c optional siba -dev/siba/siba_cc.c optional siba dev/siba/siba_pcib.c optional siba pci +mips/mips32/sentry5/siba_cc.c optional siba #mips/mips32/sentry5/s5_machdep.c standard - # notyet #mips/mips32/sentry5/siba_mips.c optional siba From owner-p4-projects@FreeBSD.ORG Sun May 13 21:20:30 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0294F16A402; Sun, 13 May 2007 21:20:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BC9D616A404 for ; Sun, 13 May 2007 21:20:29 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id ACDC813C448 for ; Sun, 13 May 2007 21:20:29 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4DLKO2Q077484 for ; Sun, 13 May 2007 21:20:24 GMT (envelope-from bms@incunabulum.net) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4DLKOKf077481 for perforce@freebsd.org; Sun, 13 May 2007 21:20:24 GMT (envelope-from bms@incunabulum.net) Date: Sun, 13 May 2007 21:20:24 GMT Message-Id: <200705132120.l4DLKOKf077481@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bms@incunabulum.net using -f From: Bruce M Simpson To: Perforce Change Reviews Cc: Subject: PERFORCE change 119797 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, 13 May 2007 21:20:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=119797 Change 119797 by bms@bms_anglepoise on 2007/05/13 21:19:41 Tweak bfe(4) so that it may attach to a SiBA system bus. Bring in the new bfe driver attachment in SENTRY5 config. Note, this is not ready for prime time yet; mips nexus needs to be taught how to allocate dma maps, as the bfe core can only DMA into a 1GB bus address range. This is a SiBa limitation. Affected files ... .. //depot/projects/mips2/src/sys/conf/files#6 edit .. //depot/projects/mips2/src/sys/dev/bfe/if_bfe.c#4 edit .. //depot/projects/mips2/src/sys/dev/bfe/if_bfe_pci.c#1 add .. //depot/projects/mips2/src/sys/dev/bfe/if_bfe_siba.c#1 add .. //depot/projects/mips2/src/sys/dev/bfe/if_bfereg.h#3 edit .. //depot/projects/mips2/src/sys/mips/conf/SENTRY5#6 edit Differences ... ==== //depot/projects/mips2/src/sys/conf/files#6 (text+ko) ==== @@ -488,6 +488,8 @@ dev/awi/if_awi_pccard.c optional awi pccard dev/bce/if_bce.c optional bce dev/bfe/if_bfe.c optional bfe +dev/bfe/if_bfe_pci.c optional bfe pci +dev/bfe/if_bfe_siba.c optional bfe siba dev/bge/if_bge.c optional bge dev/bktr/bktr_audio.c optional bktr pci dev/bktr/bktr_card.c optional bktr pci ==== //depot/projects/mips2/src/sys/dev/bfe/if_bfe.c#4 (text+ko) ==== @@ -67,30 +67,9 @@ #include -MODULE_DEPEND(bfe, pci, 1, 1, 1); -MODULE_DEPEND(bfe, ether, 1, 1, 1); -MODULE_DEPEND(bfe, miibus, 1, 1, 1); - /* "device miibus" required. See GENERIC if you get errors here. */ #include "miibus_if.h" -#define BFE_DEVDESC_MAX 64 /* Maximum device description length */ - -static struct bfe_type bfe_devs[] = { - { BCOM_VENDORID, BCOM_DEVICEID_BCM4401, - "Broadcom BCM4401 Fast Ethernet" }, - { BCOM_VENDORID, BCOM_DEVICEID_BCM4401B0, - "Broadcom BCM4401-B0 Fast Ethernet" }, - { BCOM_VENDORID, BCOM_DEVICEID_BCM4713, - "Broadcom BCM4713 Fast Ethernet" }, - { 0, 0, NULL } -}; - -static int bfe_probe (device_t); -static int bfe_attach (device_t); -static int bfe_detach (device_t); -static int bfe_suspend (device_t); -static int bfe_resume (device_t); static void bfe_release_resources (struct bfe_softc *); static void bfe_intr (void *); static void bfe_start (struct ifnet *); @@ -100,7 +79,6 @@ static void bfe_init_locked (void *); static void bfe_stop (struct bfe_softc *); static void bfe_watchdog (struct ifnet *); -static void bfe_shutdown (device_t); static void bfe_tick (void *); static void bfe_txeof (struct bfe_softc *); static void bfe_rxeof (struct bfe_softc *); @@ -112,9 +90,6 @@ static void bfe_pci_setup (struct bfe_softc *, u_int32_t); static int bfe_ifmedia_upd (struct ifnet *); static void bfe_ifmedia_sts (struct ifnet *, struct ifmediareq *); -static int bfe_miibus_readreg (device_t, int, int); -static int bfe_miibus_writereg (device_t, int, int, int); -static void bfe_miibus_statchg (device_t); static int bfe_wait_bit (struct bfe_softc *, u_int32_t, u_int32_t, u_long, const int); static void bfe_get_config (struct bfe_softc *sc); @@ -134,67 +109,9 @@ static void bfe_dma_map (void *, bus_dma_segment_t *, int, int); static void bfe_cam_write (struct bfe_softc *, u_char *, int); -static device_method_t bfe_methods[] = { - /* Device interface */ - DEVMETHOD(device_probe, bfe_probe), - DEVMETHOD(device_attach, bfe_attach), - DEVMETHOD(device_detach, bfe_detach), - DEVMETHOD(device_shutdown, bfe_shutdown), - DEVMETHOD(device_suspend, bfe_suspend), - DEVMETHOD(device_resume, bfe_resume), - - /* bus interface */ - DEVMETHOD(bus_print_child, bus_generic_print_child), - DEVMETHOD(bus_driver_added, bus_generic_driver_added), - - /* MII interface */ - DEVMETHOD(miibus_readreg, bfe_miibus_readreg), - DEVMETHOD(miibus_writereg, bfe_miibus_writereg), - DEVMETHOD(miibus_statchg, bfe_miibus_statchg), +devclass_t bfe_devclass; - { 0, 0 } -}; - -static driver_t bfe_driver = { - "bfe", - bfe_methods, - sizeof(struct bfe_softc) -}; - -static devclass_t bfe_devclass; - -DRIVER_MODULE(bfe, pci, bfe_driver, bfe_devclass, 0, 0); -DRIVER_MODULE(miibus, bfe, miibus_driver, miibus_devclass, 0, 0); - -/* - * Probe for a Broadcom 4401 chip. - */ static int -bfe_probe(device_t dev) -{ - struct bfe_type *t; - struct bfe_softc *sc; - - t = bfe_devs; - - sc = device_get_softc(dev); - bzero(sc, sizeof(struct bfe_softc)); - sc->bfe_unit = device_get_unit(dev); - sc->bfe_dev = dev; - - while(t->bfe_name != NULL) { - if ((pci_get_vendor(dev) == t->bfe_vid) && - (pci_get_device(dev) == t->bfe_did)) { - device_set_desc_copy(dev, t->bfe_name); - return (BUS_PROBE_DEFAULT); - } - t++; - } - - return (ENXIO); -} - -static int bfe_dma_alloc(device_t dev) { struct bfe_softc *sc; @@ -327,7 +244,7 @@ return (0); } -static int +int bfe_attach(device_t dev) { struct ifnet *ifp = NULL; @@ -345,9 +262,13 @@ /* * Map control/status registers. */ - pci_enable_busmaster(dev); + if (sc->bfe_bus_type == BFE_BUS_PCI) { + pci_enable_busmaster(dev); + rid = BFE_PCI_MEMLO; + } else if (sc->bfe_bus_type == BFE_BUS_SIBA) { + rid = 0x20; /* XXX MIPS hardcoded */ + } - rid = BFE_PCI_MEMLO; sc->bfe_res = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); if (sc->bfe_res == NULL) { @@ -437,7 +358,7 @@ return (error); } -static int +int bfe_detach(device_t dev) { struct bfe_softc *sc; @@ -472,7 +393,7 @@ * Stop all chip I/O so that the kernel's probe routines don't * get confused by errant DMAs when rebooting. */ -static void +void bfe_shutdown(device_t dev) { struct bfe_softc *sc; @@ -485,7 +406,7 @@ return; } -static int +int bfe_suspend(device_t dev) { struct bfe_softc *sc; @@ -498,7 +419,7 @@ return (0); } -static int +int bfe_resume(device_t dev) { struct bfe_softc *sc; @@ -519,7 +440,7 @@ return (0); } -static int +int bfe_miibus_readreg(device_t dev, int phy, int reg) { struct bfe_softc *sc; @@ -533,7 +454,7 @@ return (ret); } -static int +int bfe_miibus_writereg(device_t dev, int phy, int reg, int val) { struct bfe_softc *sc; @@ -546,7 +467,7 @@ return (0); } -static void +void bfe_miibus_statchg(device_t dev) { return; @@ -664,9 +585,12 @@ sc->bfe_enaddr[4] = eeprom[83]; sc->bfe_enaddr[5] = eeprom[82]; - sc->bfe_phyaddr = eeprom[90] & 0x1f; + if (sc->bfe_bus_type == BFE_BUS_PCI) { + sc->bfe_phyaddr = eeprom[90] & 0x1f; + } else if (sc->bfe_bus_type == BFE_BUS_SIBA) { + sc->bfe_phyaddr = 0x30; /* XXX */ + } sc->bfe_mdc_port = (eeprom[90] >> 14) & 0x1; - sc->bfe_core_unit = 0; sc->bfe_dma_offset = BFE_PCI_DMA; } @@ -744,7 +668,8 @@ BFE_LOCK_ASSERT(sc); /* Set the interrupt vector for the enet core */ - bfe_pci_setup(sc, BFE_INTVEC_ENET0); + if (sc->bfe_bus_type == BFE_BUS_PCI) + bfe_pci_setup(sc, BFE_INTVEC_ENET0); /* is core up? */ val = CSR_READ_4(sc, BFE_SBTMSLOW) & @@ -1645,3 +1570,7 @@ ifp->if_drv_flags &= ~(IFF_DRV_RUNNING | IFF_DRV_OACTIVE); } + +MODULE_DEPEND(bfe, ether, 1, 1, 1); +MODULE_DEPEND(bfe, miibus, 1, 1, 1); +DRIVER_MODULE(miibus, bfe, miibus_driver, miibus_devclass, 0, 0); ==== //depot/projects/mips2/src/sys/dev/bfe/if_bfereg.h#3 (text+ko) ==== @@ -453,6 +453,9 @@ #define BFE_INC(x, y) (x) = ((x) == ((y)-1)) ? 0 : (x)+1 +#define BFE_BUS_PCI (0) /* device lives on a PCI bus */ +#define BFE_BUS_SIBA (1) /* device lives on a SiBa bus */ + struct bfe_data { struct mbuf *bfe_mbuf; bus_dmamap_t bfe_map; @@ -523,6 +526,7 @@ u_int8_t bfe_unit; /* interface number */ u_int8_t bfe_core_unit; u_int8_t bfe_up; + u_int8_t bfe_bus_type; u_char bfe_enaddr[6]; int bfe_if_flags; char *bfe_vpd_prodname; @@ -536,4 +540,16 @@ char *bfe_name; }; +int bfe_attach(device_t); +int bfe_detach(device_t); +int bfe_suspend(device_t); +int bfe_resume(device_t); +void bfe_shutdown(device_t); + +int bfe_miibus_readreg(device_t, int, int); +int bfe_miibus_writereg(device_t, int, int, int); +void bfe_miibus_statchg(device_t); + +extern devclass_t bfe_devclass; + #endif /* _BFE_H */ ==== //depot/projects/mips2/src/sys/mips/conf/SENTRY5#6 (text+ko) ==== @@ -1,6 +1,6 @@ # # $FreeBSD$ -# $P4: //depot/projects/mips2/src/sys/mips/conf/SENTRY5#5 $ +# $P4: //depot/projects/mips2/src/sys/mips/conf/SENTRY5#6 $ # # The Broadcom Sentry5 series of processors and boards is very commonly # used in COTS hardware including the Netgear WGT634U. @@ -69,14 +69,13 @@ device siba # Sonics SiliconBackplane device pci # siba_pcib -# XXX notyet; need to be auto probed children of siba. +device bfe # XXX will build both pci and siba +device miibus # attachments + +# XXX notyet; need to be auto probed children of siba_cc. #device uart #device uart_ns8250 -# XXX notyet; bfe needs to attach via siba *and* pci. -#device bfe -#device miibus - device genclock device loop device ether From owner-p4-projects@FreeBSD.ORG Sun May 13 23:05:28 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4B77016A40A; Sun, 13 May 2007 23:05:28 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 050EB16A408 for ; Sun, 13 May 2007 23:05:28 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E97F913C455 for ; Sun, 13 May 2007 23:05:27 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4DN5Rgj097452 for ; Sun, 13 May 2007 23:05:27 GMT (envelope-from ivoras@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4DN5R6m097449 for perforce@freebsd.org; Sun, 13 May 2007 23:05:27 GMT (envelope-from ivoras@FreeBSD.org) Date: Sun, 13 May 2007 23:05:27 GMT Message-Id: <200705132305.l4DN5R6m097449@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ivoras@FreeBSD.org using -f From: Ivan Voras To: Perforce Change Reviews Cc: Subject: PERFORCE change 119803 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, 13 May 2007 23:05:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=119803 Change 119803 by ivoras@ivoras_finstall on 2007/05/13 23:04:27 Generalize signal binding Affected files ... .. //depot/projects/soc2007/ivoras_finstall/installer/finstall.py#2 edit Differences ... ==== //depot/projects/soc2007/ivoras_finstall/installer/finstall.py#2 (text+ko) ==== @@ -1,21 +1,41 @@ +from types import MethodType import gtk, gtk.gdk, gtk.glade + class MainWin: def __init__(self): self.xml = gtk.glade.XML("glade/mainwin.glade") self.window = self.xml.get_widget("mainwin") - #self.xml.signal_autoconnect({"on_button_next_clicked" : self.on_button_next_clicked }) - self.xml.signal_autoconnect(self) + self.xml.signal_autoconnect(self._get_event_handlers()) self["img_logo"].set_from_file("img/logo.jpg") - self._center_window(self.window) + # img_logo stretches the window vertically, so calling window.set_position() has no affect + self._center_window(self.window) + def __getitem__(self,key): + """Make convenient shortcut to window widgets.""" return self.xml.get_widget(key) + def _center_window(self, window): + """Centers window on screen """ ws = window.get_size() window.move((gtk.gdk.screen_width() - ws[0]) / 2, (gtk.gdk.screen_height() - ws[1]) / 2) + + def _get_event_handlers(self): + """Returns a dictionary of form {'on_method' : self.on_method} for all + methods of self begining with "on_". This is useful for binding signal + handlers.""" + dict = {} + for name in dir(self): + if not name.startswith("on_"): + continue + attr = getattr(self, name) + if isinstance(attr, MethodType): + dict[name] = attr + return dict + def on_button_next_clicked(self, obj): print "clicked!", obj gtk.main_quit() From owner-p4-projects@FreeBSD.ORG Sun May 13 23:59:35 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2400916A408; Sun, 13 May 2007 23:59:35 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E4A8B16A402 for ; Sun, 13 May 2007 23:59:34 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C255D13C46A for ; Sun, 13 May 2007 23:59:34 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4DNxYYe005665 for ; Sun, 13 May 2007 23:59:34 GMT (envelope-from bms@incunabulum.net) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4DNxYht005648 for perforce@freebsd.org; Sun, 13 May 2007 23:59:34 GMT (envelope-from bms@incunabulum.net) Date: Sun, 13 May 2007 23:59:34 GMT Message-Id: <200705132359.l4DNxYht005648@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bms@incunabulum.net using -f From: Bruce M Simpson To: Perforce Change Reviews Cc: Subject: PERFORCE change 119804 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, 13 May 2007 23:59:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=119804 Change 119804 by bms@bms_anglepoise on 2007/05/13 23:59:26 make error messages more verbose Affected files ... .. //depot/projects/mips2/src/sys/dev/bfe/if_bfe.c#5 edit Differences ... ==== //depot/projects/mips2/src/sys/dev/bfe/if_bfe.c#5 (text+ko) ==== @@ -135,6 +135,11 @@ NULL, NULL, /* lockfunc, lockarg */ &sc->bfe_parent_tag); + if (error) { + device_printf(dev, "could not allocate %s dma tag\n", "parent"); + return (ENOMEM); + } + /* tag for TX ring */ error = bus_dma_tag_create(sc->bfe_parent_tag, 4096, 0, @@ -149,7 +154,7 @@ &sc->bfe_tx_tag); if (error) { - device_printf(dev, "could not allocate dma tag\n"); + device_printf(dev, "could not allocate %s dma tag\n", "tx"); return (ENOMEM); } @@ -167,7 +172,7 @@ &sc->bfe_rx_tag); if (error) { - device_printf(dev, "could not allocate dma tag\n"); + device_printf(dev, "could not allocate %s dma tag\n", "rx"); return (ENOMEM); } @@ -185,7 +190,7 @@ &sc->bfe_tag); if (error) { - device_printf(dev, "could not allocate dma tag\n"); + device_printf(dev, "could not allocate %s dma tag\n", "mbuf"); return (ENOMEM); } From owner-p4-projects@FreeBSD.ORG Mon May 14 00:00:37 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0BE8016A40A; Mon, 14 May 2007 00:00:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DDF6F16A405 for ; Mon, 14 May 2007 00:00:36 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B5AC513C448 for ; Mon, 14 May 2007 00:00:36 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4E00a2u005802 for ; Mon, 14 May 2007 00:00:36 GMT (envelope-from bms@incunabulum.net) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4E00aGm005799 for perforce@freebsd.org; Mon, 14 May 2007 00:00:36 GMT (envelope-from bms@incunabulum.net) Date: Mon, 14 May 2007 00:00:36 GMT Message-Id: <200705140000.l4E00aGm005799@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bms@incunabulum.net using -f From: Bruce M Simpson To: Perforce Change Reviews Cc: Subject: PERFORCE change 119805 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: Mon, 14 May 2007 00:00:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=119805 Change 119805 by bms@bms_anglepoise on 2007/05/13 23:59:40 pass activation to parent nexus correctly Affected files ... .. //depot/projects/mips2/src/sys/dev/siba/siba.c#4 edit Differences ... ==== //depot/projects/mips2/src/sys/dev/siba/siba.c#4 (text+ko) ==== @@ -467,7 +467,8 @@ struct resource *r) { - return (rman_activate_resource(r)); + return (BUS_ACTIVATE_RESOURCE(device_get_parent(bus), child, type, + rid, r)); } static struct siba_devinfo * From owner-p4-projects@FreeBSD.ORG Mon May 14 00:00:38 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B364316A511; Mon, 14 May 2007 00:00:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 32E1316A482 for ; Mon, 14 May 2007 00:00:37 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1532313C44C for ; Mon, 14 May 2007 00:00:37 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4E00aS9005809 for ; Mon, 14 May 2007 00:00:36 GMT (envelope-from bms@incunabulum.net) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4E00aoN005805 for perforce@freebsd.org; Mon, 14 May 2007 00:00:36 GMT (envelope-from bms@incunabulum.net) Date: Mon, 14 May 2007 00:00:36 GMT Message-Id: <200705140000.l4E00aoN005805@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bms@incunabulum.net using -f From: Bruce M Simpson To: Perforce Change Reviews Cc: Subject: PERFORCE change 119806 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: Mon, 14 May 2007 00:00:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=119806 Change 119806 by bms@bms_anglepoise on 2007/05/13 23:59:56 add commented out bus_debug Affected files ... .. //depot/projects/mips2/src/sys/mips/conf/SENTRY5#7 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/conf/SENTRY5#7 (text+ko) ==== @@ -1,6 +1,6 @@ # # $FreeBSD$ -# $P4: //depot/projects/mips2/src/sys/mips/conf/SENTRY5#6 $ +# $P4: //depot/projects/mips2/src/sys/mips/conf/SENTRY5#7 $ # # The Broadcom Sentry5 series of processors and boards is very commonly # used in COTS hardware including the Netgear WGT634U. @@ -66,6 +66,9 @@ options INVARIANTS options INVARIANT_SUPPORT +#options BUS_DEBUG +#makeoptions BUS_DEBUG + device siba # Sonics SiliconBackplane device pci # siba_pcib From owner-p4-projects@FreeBSD.ORG Mon May 14 00:02:41 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AC18616A406; Mon, 14 May 2007 00:02:40 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7D47616A400 for ; Mon, 14 May 2007 00:02:40 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 51D6D13C43E for ; Mon, 14 May 2007 00:02:40 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4E02e6H006552 for ; Mon, 14 May 2007 00:02:40 GMT (envelope-from bms@incunabulum.net) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4E02eoZ006549 for perforce@freebsd.org; Mon, 14 May 2007 00:02:40 GMT (envelope-from bms@incunabulum.net) Date: Mon, 14 May 2007 00:02:40 GMT Message-Id: <200705140002.l4E02eoZ006549@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bms@incunabulum.net using -f From: Bruce M Simpson To: Perforce Change Reviews Cc: Subject: PERFORCE change 119807 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: Mon, 14 May 2007 00:02:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=119807 Change 119807 by bms@bms_anglepoise on 2007/05/14 00:02:36 bringin config tag stuff from CuWiN/NetBSD fork courtesy of dyoung; note that pci configuration enumeration still doesn't work right. the child pcib wasn't getting its resources activated and thus mapped into KSEG1; fixed. however, the configuration space still looks odd. It looks like the PCI configuration space reads needs to be byte-swapped; the MIPS is running in little endian mode, but the data appears to be big endian. must come back to this. in the meantime, it looks like it's starting to pick things up. Affected files ... .. //depot/projects/mips2/src/sys/dev/siba/siba_pcib.c#3 edit Differences ... ==== //depot/projects/mips2/src/sys/dev/siba/siba_pcib.c#3 (text+ko) ==== @@ -38,6 +38,7 @@ #include #include #include +#include #include #include @@ -63,30 +64,29 @@ #define MIPS_MEM_RID 0x20 #endif -#define SIBA_PCI_SLOTMAX 16 +#define SBPCI_SLOTMAX 15 -#define siba_pcib_read_4(sc, reg) \ +#define SBPCI_READ_4(sc, reg) \ bus_space_write_4((sc)->sc_bt, (sc)->sc_bh, (reg)) -#define siba_pcib_write_4(sc, reg, val) \ +#define SBPCI_WRITE_4(sc, reg, val) \ bus_space_write_4((sc)->sc_bt, (sc)->sc_bh, (reg), (val)) -#define SIBA_PCIB_CFG 0x0c000000 /* bottom pci window (64MB) */ +/* + * PCI Configuration space window (64MB). + * contained in SBTOPCI1 window. + */ +#define SBPCI_CFGBASE 0x0C000000 +#define SBPCI_CFGSIZE 0x01000000 -#define SIBA_PCIB_SBTOPCI0 0x0100 -#define SIBA_PCIB_SBTOPCI1 0x0104 -#define SIBA_PCIB_SBTOPCI2 0x0108 +#define SBPCI_SBTOPCI0 0x100 +#define SBPCI_SBTOPCI1 0x104 +#define SBPCI_SBTOPCI2 0x108 -#define SIBA_PCIB_SBTOPCICFG0 0x00000002 -#define SIBA_PCIB_SBTOPCICFG1 0x00000003 -#define SIBA_PCIB_SBTOPCICFG0_MASK 0xfc000000 -#define SIBA_PCIB_SBTOPCICFG1_MASK 0xfc000000 -#define SIBA_PCIB_SBTOPCICFG2_MASK 0xc0000000 - /* + * TODO: implement type 1 config space access (ie beyond bus 0) + * we may need to tweak the windows to do this * TODO: interrupt routing. - * TODO: implement configuration space access. - * TODO: map pci i/o windows. * TODO: fully implement bus allocation. * TODO: implement resource managers. * TODO: code cleanup. @@ -100,8 +100,6 @@ static int siba_pcib_attach(device_t); static int siba_pcib_deactivate_resource(device_t, device_t, int, int, struct resource *); -static bus_addr_t - siba_pcib_map_csr(device_t, u_int, u_int, u_int, u_int); static int siba_pcib_maxslots(device_t); static int siba_pcib_probe(device_t); static u_int32_t @@ -134,6 +132,8 @@ return (ENXIO); } +//extern int rman_debug; + static int siba_pcib_attach(device_t dev) { @@ -144,7 +144,8 @@ * Allocate the resources which the parent bus has already * determined for us. */ - rid = MIPS_MEM_RID; + rid = MIPS_MEM_RID; /* XXX */ + //rman_debug = 1; sc->sc_mem = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &rid, RF_ACTIVE); if (sc->sc_mem == NULL) { @@ -155,6 +156,43 @@ sc->sc_bt = rman_get_bustag(sc->sc_mem); sc->sc_bh = rman_get_bushandle(sc->sc_mem); + device_printf(dev, "bridge registers addr 0x%08x vaddr %p\n", + sc->sc_bh, rman_get_virtual(sc->sc_mem)); + + SBPCI_WRITE_4(sc, 0x0000, 0x05); + SBPCI_WRITE_4(sc, 0x0000, 0x0D); + DELAY(150); + SBPCI_WRITE_4(sc, 0x0000, 0x0F); + SBPCI_WRITE_4(sc, 0x0010, 0x01); + DELAY(1); + + bus_space_handle_t sc_cfg_hand; + int error; + + /* + * XXX this doesn't actually do anything on mips; however... should + * we not be mapping to KSEG1? we need to wire down the range. + */ + error = bus_space_map(sc->sc_bt, SBPCI_CFGBASE, SBPCI_CFGSIZE, + 0, &sc_cfg_hand); + if (error) { + device_printf(dev, "cannot map PCI configuration space\n"); + return (ENXIO); + } + device_printf(dev, "mapped pci config space at 0x%08x\n", sc_cfg_hand); + + /* + * Setup configuration, io, and dma space windows. + * XXX we need to be able to do type 1 too. + * we probably don't need to be able to do i/o cycles. + */ + SBPCI_WRITE_4(sc, SBPCI_SBTOPCI0, 1); /* I/O read/write window */ + SBPCI_WRITE_4(sc, SBPCI_SBTOPCI1, 2); /* type 0 configuration only */ + SBPCI_WRITE_4(sc, SBPCI_SBTOPCI2, 1 << 30); /* memory only */ + DELAY(500); + + /* XXX resource managers */ + device_add_child(dev, "pci", -1); return (bus_generic_attach(dev)); } @@ -215,7 +253,7 @@ { #if 1 - device_printf(bus, "%s: not yet implemented\n", __func__); + //device_printf(bus, "%s: not yet implemented\n", __func__); return (NULL); #else bus_space_tag_t tag; @@ -294,38 +332,52 @@ siba_pcib_maxslots(device_t dev) { - //return (SIBA_PCI_SLOTMAX); - // For now, only probe the first function including the bridge. - return (1); + return (SBPCI_SLOTMAX); } +/* + * This needs hacking and fixery. It is currently broke and hangs. + * Debugging it will be tricky; there seems to be no way to enable + * a target abort which would cause a nice target abort. + * Look at linux again? + */ static u_int32_t -siba_pcib_read_config(device_t dev, u_int bus, u_int slot, - u_int func, u_int reg, int bytes) +siba_pcib_read_config(device_t dev, u_int bus, u_int slot, u_int func, + u_int reg, int bytes) { - bus_addr_t csrbase; + struct siba_pcib_softc *sc = device_get_softc(dev); + bus_addr_t cfgaddr; + uint32_t cfgtag; uint32_t val; + /* XXX anything higher than slot 2 currently seems to hang the bus. + * not sure why this is; look at linux again + */ + if (bus != 0 || slot > 2) { + printf("%s: bad b/s/f %d/%d/%d\n", __func__, bus, slot, func); + return 0xffffffff; // XXX + } + + device_printf(dev, "requested %d bytes from b/s/f %d/%d/%d reg %d\n", + bytes, bus, slot, func, reg); + /* - * XXX: TODO de-mipsify; we should map windows for the space - * the bridge uses and do bus_space_read in those as nexus will - * translate accesses into KSEG1 for us. + * The configuration tag on the broadcom is weird. */ - csrbase = siba_pcib_map_csr(dev, bus, slot, func, reg); - val = *(volatile uint32_t *)MIPS_PHYS_TO_KSEG1(csrbase); + SBPCI_WRITE_4(sc, SBPCI_SBTOPCI1, 2); /* XXX again??? */ + cfgtag = ((1 << slot) << 16) | (func << 8); + cfgaddr = SBPCI_CFGBASE | cfgtag | (reg & ~3); + + /* cfg space i/o is always 32 bits on this bridge */ + printf("reading 4 bytes from %08x\n", cfgaddr); + val = *(volatile uint32_t *)MIPS_PHYS_TO_KSEG1(cfgaddr); /* XXX MIPS */ + + // this is just...odd. it doesn't look right. + + //val = bswap32(val); /* XXX ? */ - switch (bytes) { - case 1: - val &= 0xff; - break; - case 2: - val &= 0xffff; - break; - case 4: - break; - default: - return (ENXIO); - } + /* swizzle and return what was asked for */ + val &= 0xffffffff >> ((4 - bytes) * 8); return (val); } @@ -336,54 +388,17 @@ { /* write to pci configuration space */ - device_printf(dev, "%s: not yet implemented\n", __func__); + //device_printf(dev, "%s: not yet implemented\n", __func__); } static int siba_pcib_route_interrupt(device_t bridge, device_t device, int pin) { - device_printf(bridge, "%s: not yet implemented\n", __func__); + //device_printf(bridge, "%s: not yet implemented\n", __func__); return (-1); } -/* - * Map CSR registers of a device on the PCI bus into an available window. - * XXX This should really use bus_space_map. - * XXX I need to map these windows before I can use them. - */ -static bus_addr_t -siba_pcib_map_csr(device_t dev, u_int bus, u_int slot, u_int func, u_int reg) -{ - struct siba_pcib_softc *sc = device_get_softc(dev); - bus_addr_t csrbase, csrmap; - - printf("%s: entry", __func__); - (void)sc; - - if (bus == 0) { - csrbase = SIBA_PCIB_SBTOPCICFG0 | - ((1 << (slot + 16)) & SIBA_PCIB_SBTOPCICFG1_MASK); - // XXX exception here - //siba_pcib_write_4(sc, SIBA_PCIB_SBTOPCI0, csrbase); - - csrmap = SIBA_PCIB_CFG | - ((1 << (slot + 16)) & ~SIBA_PCIB_SBTOPCICFG1_MASK) | - (func << 8) | (reg & ~3); - } else { - // XXX exception here - //siba_pcib_write_4(sc, SIBA_PCIB_SBTOPCI0, - // SIBA_PCIB_SBTOPCICFG1); - csrmap = SIBA_PCIB_CFG | (bus << 16) | (slot << 11) | - (func << 8) | (reg & ~3); - } - - printf("%s: %d/%d/%d reg %d mapped at %08x\n", __func__, bus, slot, func, reg, - csrmap); - - return (csrmap); -} - static device_method_t siba_pcib_methods[] = { /* Device interface */ DEVMETHOD(device_attach, siba_pcib_attach), From owner-p4-projects@FreeBSD.ORG Mon May 14 00:14:57 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D816916A406; Mon, 14 May 2007 00:14:56 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6E33016A404 for ; Mon, 14 May 2007 00:14:56 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5E29C13C457 for ; Mon, 14 May 2007 00:14:56 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4E0EuAu009727 for ; Mon, 14 May 2007 00:14:56 GMT (envelope-from ivoras@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4E0EuuA009722 for perforce@freebsd.org; Mon, 14 May 2007 00:14:56 GMT (envelope-from ivoras@FreeBSD.org) Date: Mon, 14 May 2007 00:14:56 GMT Message-Id: <200705140014.l4E0EuuA009722@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ivoras@FreeBSD.org using -f From: Ivan Voras To: Perforce Change Reviews Cc: Subject: PERFORCE change 119808 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: Mon, 14 May 2007 00:14:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=119808 Change 119808 by ivoras@ivoras_finstall on 2007/05/14 00:14:39 A nicer skeleton, also including support for external text files. Affected files ... .. //depot/projects/soc2007/ivoras_finstall/installer/finstall.py#3 edit .. //depot/projects/soc2007/ivoras_finstall/installer/glade/mainwin.glade#2 edit .. //depot/projects/soc2007/ivoras_finstall/installer/text/intro.txt#1 add Differences ... ==== //depot/projects/soc2007/ivoras_finstall/installer/finstall.py#3 (text+ko) ==== @@ -10,6 +10,8 @@ self["img_logo"].set_from_file("img/logo.jpg") # img_logo stretches the window vertically, so calling window.set_position() has no affect self._center_window(self.window) + self["label2"].set_text(self._load_label("intro.txt")) + self["label2"].set_use_markup(True) def __getitem__(self,key): @@ -36,10 +38,16 @@ dict[name] = attr return dict + def _load_label(self, file_name): + return file("text/%s" % file_name).read().replace("\n", " ").replace("
", "\n").replace("\n ", "\n") + def on_button_next_clicked(self, obj): print "clicked!", obj gtk.main_quit() + def on_mainwin_delete_event(self, obj, data): + gtk.main_quit() + w = MainWin() gtk.main() ==== //depot/projects/soc2007/ivoras_finstall/installer/glade/mainwin.glade#2 (text+ko) ==== @@ -6,9 +6,11 @@ True 1 FreeBSD Installer + False GTK_WIN_POS_CENTER 750 450 + True @@ -29,12 +31,118 @@ True + 530 True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 3 - + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + 50 + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + <span size="xx-large"><b>Welcome to the FreeBSD installer</b></span> + True + True + + + False + + + + + 520 + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + 0 + This installer application will guide you through FreeBSD's install and setup process. FreeBSD is a popular open source operating system, the result of volundeer work of hundreds of individuals... + + True + True + + + False + 4 + 1 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 0 + Choose installation type: + + + False + 2 + + + + + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + Novice + True + True + + + False + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + Standard + True + True + radiobutton1 + + + False + 1 + + + + + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + 6 + Expert + True + True + radiobutton1 + + + False + 2 + + + + + 3 + + + + + 3 + From owner-p4-projects@FreeBSD.ORG Mon May 14 01:34:43 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A0FE016A404; Mon, 14 May 2007 01:34:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5CF8616A402 for ; Mon, 14 May 2007 01:34:43 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4A36F13C4B0 for ; Mon, 14 May 2007 01:34:43 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4E1YhFF032290 for ; Mon, 14 May 2007 01:34:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4E1YcjN032277 for perforce@freebsd.org; Mon, 14 May 2007 01:34:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 14 May 2007 01:34:38 GMT Message-Id: <200705140134.l4E1YcjN032277@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 119811 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: Mon, 14 May 2007 01:34:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=119811 Change 119811 by rwatson@rwatson_noisy on 2007/05/14 01:34:10 Integrate zcopybpf branch. Affected files ... .. //depot/projects/zcopybpf/src/sys/amd64/acpica/madt.c#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/intr_machdep.c#4 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/io_apic.c#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/local_apic.c#4 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/mp_machdep.c#4 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/mptable.c#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/mptable_pci.c#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/msi.c#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/nexus.c#4 integrate .. //depot/projects/zcopybpf/src/sys/amd64/conf/GENERIC#4 integrate .. //depot/projects/zcopybpf/src/sys/amd64/conf/NOTES#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/apicvar.h#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/intr_machdep.h#4 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/vmparam.h#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/isa/atpic.c#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/linux32/linux32_machdep.c#5 integrate .. //depot/projects/zcopybpf/src/sys/amd64/pci/pci_bus.c#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/include/vmparam.h#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/xscale/ixp425/avila_machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/boot/common/loader.8#3 integrate .. //depot/projects/zcopybpf/src/sys/compat/freebsd32/freebsd32_misc.c#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/linprocfs/linprocfs.c#6 integrate .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#3 integrate .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#3 integrate .. //depot/projects/zcopybpf/src/sys/conf/Makefile.amd64#2 integrate .. //depot/projects/zcopybpf/src/sys/conf/Makefile.arm#2 integrate .. //depot/projects/zcopybpf/src/sys/conf/Makefile.i386#2 integrate .. //depot/projects/zcopybpf/src/sys/conf/Makefile.ia64#2 integrate .. //depot/projects/zcopybpf/src/sys/conf/Makefile.pc98#2 integrate .. //depot/projects/zcopybpf/src/sys/conf/Makefile.powerpc#2 integrate .. //depot/projects/zcopybpf/src/sys/conf/Makefile.sparc64#2 integrate .. //depot/projects/zcopybpf/src/sys/conf/Makefile.sun4v#2 integrate .. //depot/projects/zcopybpf/src/sys/conf/NOTES#7 integrate .. //depot/projects/zcopybpf/src/sys/conf/files#8 integrate .. //depot/projects/zcopybpf/src/sys/conf/kern.pre.mk#2 integrate .. //depot/projects/zcopybpf/src/sys/conf/options#6 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/gfs.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#3 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#4 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#3 integrate .. //depot/projects/zcopybpf/src/sys/crypto/camellia/camellia-api.c#1 branch .. //depot/projects/zcopybpf/src/sys/crypto/camellia/camellia.c#1 branch .. //depot/projects/zcopybpf/src/sys/crypto/camellia/camellia.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_pcib_acpi.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_pcib_pci.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/ata-disk.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/atapi-cam.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/bce/if_bce.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/bce/if_bcefw.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/bce/if_bcereg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/bge/if_bgereg.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/ciss/ciss.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/ciss/cissvar.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/LICENSE#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/README#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_80003es2lan.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_80003es2lan.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82540.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82541.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82541.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82542.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82543.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82543.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82571.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82571.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82575.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82575.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_api.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_api.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_defines.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_hw.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_ich8lan.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_ich8lan.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_mac.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_mac.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_manage.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_manage.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_nvm.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_nvm.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_osdep.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_phy.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_phy.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_regs.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/em/if_em.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/if_em.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/if_em_hw.c#2 delete .. //depot/projects/zcopybpf/src/sys/dev/em/if_em_hw.h#2 delete .. //depot/projects/zcopybpf/src/sys/dev/em/if_em_osdep.h#2 delete .. //depot/projects/zcopybpf/src/sys/dev/firewire/firewire.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/firewire/firewirereg.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/firewire/fwdev.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/firewire/fwohci.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/firewire/fwohcireg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/firewire/if_fwip.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/firewire/sbp.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/firewire/sbp_targ.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/gem/if_gem.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/gem/if_gem_pci.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/gem/if_gemvar.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/hme/if_hme.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/hptiop/hptiop.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/hptiop/hptiop.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/ipmi/ipmi_smbios.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/isp/isp.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/isp/isp_freebsd.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/isp/isp_freebsd.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/isp/isp_pci.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/isp/isp_sbus.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/isp/isp_tpublic.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/mfi/mfi.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/mfi/mfi_disk.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mfi/mfi_ioctl.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mfi/mfi_pci.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mfi/mfivar.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mii/brgphy.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/mii/mii.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mpt/mpt.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mpt/mpt.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/mpt/mpt_cam.c#7 integrate .. //depot/projects/zcopybpf/src/sys/dev/mpt/mpt_cam.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/mpt/mpt_pci.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/mpt/mpt_raid.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mxge/eth_z8e.dat.gz.uu#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/mxge/ethp_z8e.dat.gz.uu#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/mxge/if_mxge.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/mxge/mxge_mcp.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/nve/if_nve.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/pci/pci.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/pci/pci_if.m#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/pci/pci_pci.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/pci/pci_private.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/pci/pcib_if.m#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/pci/pcib_private.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/pci/pcivar.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sk/if_sk.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/emu10kx.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/hda/hdac.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/hda/hdac_private.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/ich.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/buffer.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/sound.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/stge/if_stge.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/stge/if_stgereg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/twa/tw_cl.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/twa/tw_cl_externs.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/twa/tw_cl_fwif.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/twa/tw_cl_fwimg.c#2 delete .. //depot/projects/zcopybpf/src/sys/dev/twa/tw_cl_init.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/twa/tw_cl_intr.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/twa/tw_cl_io.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/twa/tw_cl_ioctl.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/twa/tw_cl_misc.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/twa/tw_cl_share.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/twa/tw_osl.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/twa/tw_osl_cam.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/twa/tw_osl_externs.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/twa/tw_osl_freebsd.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/twa/tw_osl_includes.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/twa/tw_osl_inline.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/twa/tw_osl_ioctl.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/twa/tw_osl_share.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/twa/tw_osl_types.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/uart/uart_kbd_sun.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_axe.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_axereg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_cue.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_cuereg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_kue.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_kuereg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_rue.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_ruereg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_rum.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/usb/if_rumreg.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/usb/if_rumvar.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/usb/if_udav.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_ural.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_uralvar.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/rt2573_ucode.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/usb/ubsa.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/uftdi.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/uhid.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/ukbd.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/ums.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/usb.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/usb_mem.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/usb_subr.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/usbdevs#6 integrate .. //depot/projects/zcopybpf/src/sys/fs/procfs/procfs_ioctl.c#3 integrate .. //depot/projects/zcopybpf/src/sys/geom/eli/g_eli_ctl.c#3 integrate .. //depot/projects/zcopybpf/src/sys/geom/geom.h#2 integrate .. //depot/projects/zcopybpf/src/sys/geom/geom_dev.c#4 integrate .. //depot/projects/zcopybpf/src/sys/geom/geom_disk.c#3 integrate .. //depot/projects/zcopybpf/src/sys/geom/geom_disk.h#2 integrate .. //depot/projects/zcopybpf/src/sys/geom/geom_io.c#3 integrate .. //depot/projects/zcopybpf/src/sys/geom/geom_slice.c#2 integrate .. //depot/projects/zcopybpf/src/sys/geom/geom_subr.c#2 integrate .. //depot/projects/zcopybpf/src/sys/geom/part/g_part.c#3 integrate .. //depot/projects/zcopybpf/src/sys/geom/part/g_part.h#2 integrate .. //depot/projects/zcopybpf/src/sys/geom/part/g_part_apm.c#2 integrate .. //depot/projects/zcopybpf/src/sys/geom/part/g_part_gpt.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/acpica/madt.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/conf/GENERIC#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/conf/NOTES#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/conf/PAE#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/intr_machdep.c#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/io_apic.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/local_apic.c#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/mp_machdep.c#5 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/mptable.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/mptable_pci.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/msi.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/nexus.c#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/apicvar.h#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/intr_machdep.h#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/vmparam.h#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/isa/atpic.c#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/linux/linux_machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/pci/pci_bus.c#2 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/machdep.c#2 integrate .. //depot/projects/zcopybpf/src/sys/ia64/include/vmparam.h#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/Make.tags.inc#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_condvar.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_descrip.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_intr.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_mib.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_mutex.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_rwlock.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_sx.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_synch.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_timeout.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/sys_generic.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_debug.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_sockbuf.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_socket.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_syscalls.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_usrreq.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_syscalls.c#4 integrate .. //depot/projects/zcopybpf/src/sys/modules/Makefile#6 integrate .. //depot/projects/zcopybpf/src/sys/modules/crypto/Makefile#3 integrate .. //depot/projects/zcopybpf/src/sys/modules/em/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/modules/hptiop/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/modules/rum/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/modules/twa/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/net/ethernet.h#3 integrate .. //depot/projects/zcopybpf/src/sys/net/ieee8023ad_lacp.c#3 integrate .. //depot/projects/zcopybpf/src/sys/net/ieee8023ad_lacp.h#3 integrate .. //depot/projects/zcopybpf/src/sys/net/if.h#2 integrate .. //depot/projects/zcopybpf/src/sys/net/if_lagg.c#2 integrate .. //depot/projects/zcopybpf/src/sys/net/if_lagg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/net/pfkeyv2.h#2 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_amrr.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netatalk/ddp_usrreq.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/ng_mppc.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/ng_socket.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/if_ether.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/in.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/in_cksum.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/in_gif.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/in_pcb.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/in_pcb.h#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/in_rmx.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip.h#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_divert.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_dummynet.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_ecn.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_encap.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_fw.h#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_fw2.c#5 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_icmp.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_id.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_input.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_ipsec.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_mroute.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_options.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_options.h#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_output.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/libalias/alias_proxy.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet/raw_ip.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp.h#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_asconf.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_asconf.h#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_auth.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_auth.h#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_bsd_addr.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_bsd_addr.h#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_constants.h#5 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_crc32.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_crc32.h#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_header.h#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_indata.c#6 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_indata.h#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_input.c#6 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_input.h#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_lock_bsd.h#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_os.h#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_os_bsd.h#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_output.c#6 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_output.h#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_pcb.c#6 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_pcb.h#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_peeloff.c#5 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_peeloff.h#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_structs.h#6 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_sysctl.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_sysctl.h#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_timer.c#5 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_timer.h#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_uio.h#6 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_usrreq.c#6 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_var.h#6 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctputil.c#6 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctputil.h#6 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_debug.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_fsm.h#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_input.c#6 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_output.c#6 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_reass.c#1 branch .. //depot/projects/zcopybpf/src/sys/netinet/tcp_sack.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_subr.c#6 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_syncache.c#6 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_timer.c#5 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_timewait.c#1 branch .. //depot/projects/zcopybpf/src/sys/netinet/tcp_usrreq.c#5 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_var.h#6 integrate .. //depot/projects/zcopybpf/src/sys/netinet/udp_usrreq.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/esp_camellia.c#1 branch .. //depot/projects/zcopybpf/src/sys/netinet6/esp_camellia.h#1 branch .. //depot/projects/zcopybpf/src/sys/netinet6/esp_core.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/in6_pcb.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/in6_pcb.h#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/in6_proto.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/in6_src.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/nd6.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/nd6_nbr.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/raw_ip6.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/sctp6_usrreq.c#5 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/sctp6_var.h#3 integrate .. //depot/projects/zcopybpf/src/sys/netipsec/xform_esp.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netipx/ipx.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netipx/ipx.h#2 integrate .. //depot/projects/zcopybpf/src/sys/netipx/ipx_cksum.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netipx/ipx_if.h#2 integrate .. //depot/projects/zcopybpf/src/sys/netipx/ipx_input.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netipx/ipx_outputfl.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netipx/ipx_pcb.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netipx/ipx_pcb.h#2 integrate .. //depot/projects/zcopybpf/src/sys/netipx/ipx_usrreq.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netipx/ipx_var.h#2 integrate .. //depot/projects/zcopybpf/src/sys/netipx/spx_debug.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netipx/spx_debug.h#2 integrate .. //depot/projects/zcopybpf/src/sys/opencrypto/cryptodev.c#3 integrate .. //depot/projects/zcopybpf/src/sys/opencrypto/cryptodev.h#3 integrate .. //depot/projects/zcopybpf/src/sys/opencrypto/cryptosoft.c#3 integrate .. //depot/projects/zcopybpf/src/sys/opencrypto/xform.c#2 integrate .. //depot/projects/zcopybpf/src/sys/opencrypto/xform.h#2 integrate .. //depot/projects/zcopybpf/src/sys/pc98/conf/GENERIC#4 integrate .. //depot/projects/zcopybpf/src/sys/pci/if_tl.c#3 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/include/vmparam.h#2 integrate .. //depot/projects/zcopybpf/src/sys/security/audit/audit_ioctl.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/include/profile.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/include/vmparam.h#3 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/sparc64/machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/sparc64/upa.c#4 integrate .. //depot/projects/zcopybpf/src/sys/sun4v/include/profile.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sun4v/include/vmparam.h#3 integrate .. //depot/projects/zcopybpf/src/sys/sys/callout.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/disk.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/filedesc.h#3 integrate .. //depot/projects/zcopybpf/src/sys/sys/interrupt.h#4 integrate .. //depot/projects/zcopybpf/src/sys/sys/param.h#6 integrate .. //depot/projects/zcopybpf/src/sys/sys/rwlock.h#4 integrate .. //depot/projects/zcopybpf/src/sys/sys/socketvar.h#4 integrate .. //depot/projects/zcopybpf/src/sys/sys/sx.h#3 integrate .. //depot/projects/zcopybpf/src/sys/ufs/ffs/ffs_softdep.c#5 integrate .. //depot/projects/zcopybpf/src/sys/vm/uma_int.h#2 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_page.c#3 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_page.h#3 integrate .. //depot/projects/zcopybpf/src/usr.sbin/netstat/inet.c#3 integrate Differences ... ==== //depot/projects/zcopybpf/src/sys/amd64/acpica/madt.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.23 2007/03/22 18:16:38 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.24 2007/05/08 22:01:02 jhb Exp $"); #include #include @@ -53,21 +53,18 @@ #include #include -#define NIOAPICS 32 /* Max number of I/O APICs */ -#define NLAPICS 32 /* Max number of local APICs */ - typedef void madt_entry_handler(ACPI_SUBTABLE_HEADER *entry, void *arg); /* These two arrays are indexed by APIC IDs. */ struct ioapic_info { void *io_apic; UINT32 io_vector; -} ioapics[NIOAPICS]; +} ioapics[MAX_APIC_ID + 1]; struct lapic_info { u_int la_enabled:1; u_int la_acpi_id:8; -} lapics[NLAPICS]; +} lapics[MAX_APIC_ID + 1]; static int madt_found_sci_override; static ACPI_TABLE_MADT *madt; @@ -393,7 +390,7 @@ } /* Third, we register all the I/O APIC's. */ - for (i = 0; i < NIOAPICS; i++) + for (i = 0; i <= MAX_APIC_ID; i++) if (ioapics[i].io_apic != NULL) ioapic_register(ioapics[i].io_apic); @@ -450,7 +447,7 @@ "enabled" : "disabled"); if (!(proc->LapicFlags & ACPI_MADT_ENABLED)) break; - if (proc->Id >= NLAPICS) + if (proc->Id > MAX_APIC_ID) panic("%s: CPU ID %u too high", __func__, proc->Id); la = &lapics[proc->Id]; KASSERT(la->la_enabled == 0, @@ -479,7 +476,7 @@ "MADT: Found IO APIC ID %u, Interrupt %u at %p\n", apic->Id, apic->GlobalIrqBase, (void *)(uintptr_t)apic->Address); - if (apic->Id >= NIOAPICS) + if (apic->Id > MAX_APIC_ID) panic("%s: I/O APIC ID %u too high", __func__, apic->Id); if (ioapics[apic->Id].io_apic != NULL) @@ -545,7 +542,7 @@ { int i; - for (i = 0; i < NLAPICS; i++) { + for (i = 0; i <= MAX_APIC_ID; i++) { if (!lapics[i].la_enabled) continue; if (lapics[i].la_acpi_id != acpi_id) @@ -566,7 +563,7 @@ int i, best; best = -1; - for (i = 0; i < NIOAPICS; i++) { + for (i = 0; i <= MAX_APIC_ID; i++) { if (ioapics[i].io_apic == NULL || ioapics[i].io_vector > intr) continue; ==== //depot/projects/zcopybpf/src/sys/amd64/amd64/intr_machdep.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.30 2007/03/06 17:16:46 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.32 2007/05/08 21:29:12 jhb Exp $ */ /* @@ -43,13 +43,14 @@ #include #include #include -#include #include #include +#include #include #include #include #include +#include #include #include #include @@ -71,9 +72,16 @@ static int intrcnt_index; static struct intsrc *interrupt_sources[NUM_IO_INTS]; -static struct mtx intr_table_lock; +static struct sx intr_table_lock; +static struct mtx intrcnt_lock; static STAILQ_HEAD(, pic) pics; +#ifdef INTR_FILTER +static void intr_eoi_src(void *arg); +static void intr_disab_eoi_src(void *arg); +static void intr_event_stray(void *cookie); +#endif + #ifdef SMP static int assign_cpu; @@ -109,14 +117,14 @@ { int error; - mtx_lock_spin(&intr_table_lock); + sx_xlock(&intr_table_lock); if (intr_pic_registered(pic)) error = EBUSY; else { STAILQ_INSERT_TAIL(&pics, pic, pics); error = 0; } - mtx_unlock_spin(&intr_table_lock); + sx_xunlock(&intr_table_lock); return (error); } @@ -134,20 +142,26 @@ vector = isrc->is_pic->pic_vector(isrc); if (interrupt_sources[vector] != NULL) return (EEXIST); +#ifdef INTR_FILTER error = intr_event_create(&isrc->is_event, isrc, 0, + (mask_fn)isrc->is_pic->pic_enable_source, + intr_eoi_src, intr_disab_eoi_src, "irq%d:", vector); +#else + error = intr_event_create(&isrc->is_event, isrc, 0, (mask_fn)isrc->is_pic->pic_enable_source, "irq%d:", vector); +#endif if (error) return (error); - mtx_lock_spin(&intr_table_lock); + sx_xlock(&intr_table_lock); if (interrupt_sources[vector] != NULL) { - mtx_unlock_spin(&intr_table_lock); + sx_xunlock(&intr_table_lock); intr_event_destroy(isrc->is_event); return (EEXIST); } intrcnt_register(isrc); interrupt_sources[vector] = isrc; - isrc->is_enabled = 0; - mtx_unlock_spin(&intr_table_lock); + isrc->is_handlers = 0; + sx_xunlock(&intr_table_lock); return (0); } @@ -171,19 +185,18 @@ error = intr_event_add_handler(isrc->is_event, name, filter, handler, arg, intr_priority(flags), flags, cookiep); if (error == 0) { + sx_xlock(&intr_table_lock); intrcnt_updatename(isrc); - mtx_lock_spin(&intr_table_lock); - if (!isrc->is_enabled) { - isrc->is_enabled = 1; + isrc->is_handlers++; + if (isrc->is_handlers == 1) { #ifdef SMP if (assign_cpu) intr_assign_next_cpu(isrc); #endif - mtx_unlock_spin(&intr_table_lock); isrc->is_pic->pic_enable_intr(isrc); - } else - mtx_unlock_spin(&intr_table_lock); - isrc->is_pic->pic_enable_source(isrc); + isrc->is_pic->pic_enable_source(isrc); + } + sx_xunlock(&intr_table_lock); } return (error); } @@ -196,8 +209,16 @@ isrc = intr_handler_source(cookie); error = intr_event_remove_handler(cookie); - if (error == 0) + if (error == 0) { + sx_xlock(&intr_table_lock); + isrc->is_handlers--; + if (isrc->is_handlers == 0) { + isrc->is_pic->pic_disable_source(isrc, PIC_NO_EOI); + isrc->is_pic->pic_disable_intr(isrc); + } intrcnt_updatename(isrc); + sx_xunlock(&intr_table_lock); + } return (error); } @@ -212,11 +233,82 @@ return (isrc->is_pic->pic_config_intr(isrc, trig, pol)); } +#ifdef INTR_FILTER void intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame) { struct thread *td; struct intr_event *ie; + int vector; + + td = curthread; + + /* + * We count software interrupts when we process them. The + * code here follows previous practice, but there's an + * argument for counting hardware interrupts when they're + * processed too. + */ + (*isrc->is_count)++; + PCPU_LAZY_INC(cnt.v_intr); + + ie = isrc->is_event; + + /* + * XXX: We assume that IRQ 0 is only used for the ISA timer + * device (clk). + */ + vector = isrc->is_pic->pic_vector(isrc); + if (vector == 0) + clkintr_pending = 1; + + if (intr_event_handle(ie, frame) != 0) + intr_event_stray(isrc); +} + +static void +intr_event_stray(void *cookie) +{ + struct intsrc *isrc; + + isrc = cookie; + /* + * For stray interrupts, mask and EOI the source, bump the + * stray count, and log the condition. + */ + isrc->is_pic->pic_disable_source(isrc, PIC_EOI); + (*isrc->is_straycount)++; + if (*isrc->is_straycount < MAX_STRAY_LOG) + log(LOG_ERR, "stray irq%d\n", isrc->is_pic->pic_vector(isrc)); + else if (*isrc->is_straycount == MAX_STRAY_LOG) + log(LOG_CRIT, + "too many stray irq %d's: not logging anymore\n", + isrc->is_pic->pic_vector(isrc)); +} + +static void +intr_eoi_src(void *arg) +{ + struct intsrc *isrc; + + isrc = arg; + isrc->is_pic->pic_eoi_source(isrc); +} + +static void +intr_disab_eoi_src(void *arg) +{ + struct intsrc *isrc; + + isrc = arg; + isrc->is_pic->pic_disable_source(isrc, PIC_EOI); +} +#else +void +intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame) +{ + struct thread *td; + struct intr_event *ie; struct intr_handler *ih; int error, vector, thread; @@ -298,6 +390,7 @@ } td->td_intr_nesting_level--; } +#endif void intr_resume(void) @@ -307,12 +400,12 @@ #ifndef DEV_ATPIC atpic_reset(); #endif - mtx_lock_spin(&intr_table_lock); + sx_xlock(&intr_table_lock); STAILQ_FOREACH(pic, &pics, pics) { if (pic->pic_resume != NULL) pic->pic_resume(pic); } - mtx_unlock_spin(&intr_table_lock); + sx_xunlock(&intr_table_lock); } void @@ -320,12 +413,12 @@ { struct pic *pic; - mtx_lock_spin(&intr_table_lock); + sx_xlock(&intr_table_lock); STAILQ_FOREACH(pic, &pics, pics) { if (pic->pic_suspend != NULL) pic->pic_suspend(pic); } - mtx_unlock_spin(&intr_table_lock); + sx_xunlock(&intr_table_lock); } static void @@ -348,8 +441,8 @@ { char straystr[MAXCOMLEN + 1]; - /* mtx_assert(&intr_table_lock, MA_OWNED); */ KASSERT(is->is_event != NULL, ("%s: isrc with no event", __func__)); + mtx_lock_spin(&intrcnt_lock); is->is_index = intrcnt_index; intrcnt_index += 2; snprintf(straystr, MAXCOMLEN + 1, "stray irq%d", @@ -358,17 +451,18 @@ is->is_count = &intrcnt[is->is_index]; intrcnt_setname(straystr, is->is_index + 1); is->is_straycount = &intrcnt[is->is_index + 1]; + mtx_unlock_spin(&intrcnt_lock); } void intrcnt_add(const char *name, u_long **countp) { - mtx_lock_spin(&intr_table_lock); + mtx_lock_spin(&intrcnt_lock); *countp = &intrcnt[intrcnt_index]; intrcnt_setname(name, intrcnt_index); intrcnt_index++; - mtx_unlock_spin(&intr_table_lock); + mtx_unlock_spin(&intrcnt_lock); } static void @@ -378,7 +472,8 @@ intrcnt_setname("???", 0); intrcnt_index = 1; STAILQ_INIT(&pics); - mtx_init(&intr_table_lock, "intr table", NULL, MTX_SPIN); + sx_init(&intr_table_lock, "intr sources"); + mtx_init(&intrcnt_lock, "intrcnt", NULL, MTX_SPIN); } SYSINIT(intr_init, SI_SUB_INTR, SI_ORDER_FIRST, intr_init, NULL) @@ -486,14 +581,14 @@ return; /* Round-robin assign a CPU to each enabled source. */ - mtx_lock_spin(&intr_table_lock); + sx_xlock(&intr_table_lock); assign_cpu = 1; for (i = 0; i < NUM_IO_INTS; i++) { isrc = interrupt_sources[i]; - if (isrc != NULL && isrc->is_enabled) + if (isrc != NULL && isrc->is_handlers > 0) intr_assign_next_cpu(isrc); } - mtx_unlock_spin(&intr_table_lock); + sx_xunlock(&intr_table_lock); } SYSINIT(intr_shuffle_irqs, SI_SUB_SMP, SI_ORDER_SECOND, intr_shuffle_irqs, NULL) #endif ==== //depot/projects/zcopybpf/src/sys/amd64/amd64/io_apic.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.29 2007/03/20 21:53:30 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.30 2007/05/08 21:29:12 jhb Exp $"); #include "opt_isa.h" @@ -114,6 +114,7 @@ static void ioapic_disable_source(struct intsrc *isrc, int eoi); static void ioapic_eoi_source(struct intsrc *isrc); static void ioapic_enable_intr(struct intsrc *isrc); +static void ioapic_disable_intr(struct intsrc *isrc); static int ioapic_vector(struct intsrc *isrc); static int ioapic_source_pending(struct intsrc *isrc); static int ioapic_config_intr(struct intsrc *isrc, enum intr_trigger trig, @@ -125,8 +126,8 @@ static STAILQ_HEAD(,ioapic) ioapic_list = STAILQ_HEAD_INITIALIZER(ioapic_list); struct pic ioapic_template = { ioapic_enable_source, ioapic_disable_source, ioapic_eoi_source, ioapic_enable_intr, - ioapic_vector, ioapic_source_pending, - NULL, ioapic_resume, + ioapic_disable_intr, ioapic_vector, + ioapic_source_pending, NULL, ioapic_resume, ioapic_config_intr, ioapic_assign_cpu }; static int next_ioapic_base; @@ -359,6 +360,23 @@ } } +static void +ioapic_disable_intr(struct intsrc *isrc) +{ + struct ioapic_intsrc *intpin = (struct ioapic_intsrc *)isrc; + u_int vector; + + if (intpin->io_vector != 0) { + /* Mask this interrupt pin and free its APIC vector. */ + vector = intpin->io_vector; + apic_disable_vector(vector); + intpin->io_masked = 1; + intpin->io_vector = 0; + ioapic_program_intpin(intpin); + apic_free_vector(vector, intpin->io_irq); + } +} + static int ioapic_vector(struct intsrc *isrc) { ==== //depot/projects/zcopybpf/src/sys/amd64/amd64/local_apic.c#4 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.38 2007/04/25 19:58:41 ariff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.40 2007/05/08 22:01:02 jhb Exp $"); #include "opt_hwpmc_hooks.h" @@ -65,13 +65,6 @@ #include #endif -/* - * We can handle up to 60 APICs via our logical cluster IDs, but currently - * the physical IDs on Intel processors up to the Pentium 4 are limited to - * 16. - */ -#define MAX_APICID 16 - /* Sanity checks on IDT vectors. */ CTASSERT(APIC_IO_INTS + APIC_NUM_IOINTS == APIC_TIMER_INT); CTASSERT(APIC_TIMER_INT < APIC_LOCAL_INTS); @@ -114,7 +107,7 @@ u_long la_hard_ticks; u_long la_stat_ticks; u_long la_prof_ticks; -} static lapics[MAX_APICID]; +} static lapics[MAX_APIC_ID + 1]; /* XXX: should thermal be an NMI? */ @@ -147,6 +140,8 @@ APIC_TDCR_32, APIC_TDCR_64, APIC_TDCR_128 }; +extern inthand_t IDTVEC(rsvd); + volatile lapic_t *lapic; vm_paddr_t lapic_paddr; static u_long lapic_timer_divisor, lapic_timer_period, lapic_timer_hz; @@ -238,7 +233,7 @@ { int i; - if (apic_id >= MAX_APICID) { + if (apic_id > MAX_APIC_ID) { printf("APIC: Ignoring local APIC with ID %d\n", apic_id); if (boot_cpu) panic("Can't ignore BSP"); @@ -837,6 +832,16 @@ setidt(vector, ioint_handlers[vector / 32], SDT_SYSIGT, SEL_KPL, 0); } +void +apic_disable_vector(u_int vector) +{ + + KASSERT(vector != IDT_SYSCALL, ("Attempt to overwrite syscall entry")); + KASSERT(ioint_handlers[vector / 32] != NULL, + ("No ISR handler for vector %u", vector)); + setidt(vector, &IDTVEC(rsvd), SDT_SYSIGT, SEL_KPL, 0); +} + /* Release an APIC vector when it's no longer in use. */ void apic_free_vector(u_int vector, u_int irq) ==== //depot/projects/zcopybpf/src/sys/amd64/amd64/mp_machdep.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.283 2007/03/06 17:16:46 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.284 2007/05/08 22:01:02 jhb Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -151,7 +151,7 @@ int cpu_present:1; int cpu_bsp:1; int cpu_disabled:1; -} static cpu_info[MAXCPU]; +} static cpu_info[MAX_APIC_ID + 1]; int cpu_apic_ids[MAXCPU]; /* Holds pending bitmap based IPIs per CPU */ @@ -159,6 +159,7 @@ static u_int boot_address; +static void assign_cpu_ids(void); static void set_interrupt_apic_ids(void); static int start_all_aps(void); static int start_ap(int apic_id); @@ -204,7 +205,7 @@ } group = &mp_groups[0]; groups = 1; - for (cpu = 0, apic_id = 0; apic_id < MAXCPU; apic_id++) { + for (cpu = 0, apic_id = 0; apic_id <= MAX_APIC_ID; apic_id++) { if (!cpu_info[apic_id].cpu_present) continue; /* @@ -246,9 +247,8 @@ cpu_add(u_int apic_id, char boot_cpu) { - if (apic_id >= MAXCPU) { - printf("SMP: CPU %d exceeds maximum CPU %d, ignoring\n", - apic_id, MAXCPU - 1); + if (apic_id > MAX_APIC_ID) { + panic("SMP: APIC ID %d too high", apic_id); return; } KASSERT(cpu_info[apic_id].cpu_present == 0, ("CPU %d added twice", @@ -261,13 +261,13 @@ boot_cpu_id = apic_id; cpu_info[apic_id].cpu_bsp = 1; } - mp_ncpus++; - if (apic_id > mp_maxid) - mp_maxid = apic_id; + if (mp_ncpus < MAXCPU) { + mp_ncpus++; + mp_maxid = mp_ncpus -1; + } if (bootverbose) printf("SMP: Added CPU %d (%s)\n", apic_id, boot_cpu ? "BSP" : "AP"); - } void @@ -286,8 +286,7 @@ else KASSERT(mp_maxid >= mp_ncpus - 1, ("%s: counters out of sync: max %d, count %d", __func__, - mp_maxid, mp_ncpus)); - + mp_maxid, mp_ncpus)); } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 14 05:33:12 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F59C16A409; Mon, 14 May 2007 05:33:12 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A08B816A400 for ; Mon, 14 May 2007 05:33:11 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8F55D13C469 for ; Mon, 14 May 2007 05:33:11 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4E5XBMC089976 for ; Mon, 14 May 2007 05:33:11 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4E5X35c089947 for perforce@freebsd.org; Mon, 14 May 2007 05:33:03 GMT (envelope-from imp@freebsd.org) Date: Mon, 14 May 2007 05:33:03 GMT Message-Id: <200705140533.l4E5X35c089947@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 119822 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: Mon, 14 May 2007 05:33:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=119822 Change 119822 by imp@imp_paco-paco on 2007/05/14 05:32:25 IFC @119819 Affected files ... .. //depot/projects/arm/src/Makefile.inc1#26 integrate .. //depot/projects/arm/src/ObsoleteFiles.inc#20 integrate .. //depot/projects/arm/src/UPDATING#15 integrate .. //depot/projects/arm/src/bin/mv/mv.1#2 integrate .. //depot/projects/arm/src/contrib/amd/amq/amq.8#2 integrate .. //depot/projects/arm/src/etc/defaults/periodic.conf#4 integrate .. //depot/projects/arm/src/etc/periodic/daily/480.status-ntpd#1 branch .. //depot/projects/arm/src/lib/libc/Makefile#5 integrate .. //depot/projects/arm/src/lib/libc/amd64/Symbol.map#3 integrate .. //depot/projects/arm/src/lib/libc/arm/Symbol.map#3 integrate .. //depot/projects/arm/src/lib/libc/gdtoa/_hdtoa.c#3 integrate .. //depot/projects/arm/src/lib/libc/gmon/Symbol.map#3 integrate .. //depot/projects/arm/src/lib/libc/i386/Symbol.map#4 integrate .. //depot/projects/arm/src/lib/libc/net/Symbol.map#4 integrate .. //depot/projects/arm/src/lib/libc/net/ether_addr.c#2 integrate .. //depot/projects/arm/src/lib/libc/net/ethers.3#2 integrate .. //depot/projects/arm/src/lib/libc/powerpc/Symbol.map#3 integrate .. //depot/projects/arm/src/lib/libc/sparc64/Symbol.map#3 integrate .. //depot/projects/arm/src/lib/libc/stdio/vfprintf.c#5 integrate .. //depot/projects/arm/src/lib/libc_r/Makefile#3 integrate .. //depot/projects/arm/src/lib/libfetch/http.c#2 integrate .. //depot/projects/arm/src/lib/libgeom/libgeom.h#3 integrate .. //depot/projects/arm/src/lib/libipsec/pfkey_dump.c#2 integrate .. //depot/projects/arm/src/lib/libpthread/Makefile#4 integrate .. //depot/projects/arm/src/lib/libpthread/pthread.map#3 integrate .. //depot/projects/arm/src/lib/libpthread/thread/thr_private.h#4 integrate .. //depot/projects/arm/src/lib/librt/Makefile#3 integrate .. //depot/projects/arm/src/lib/libthr/Makefile#5 integrate .. //depot/projects/arm/src/lib/libthr/pthread.map#4 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_init.c#9 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_mutex.c#7 integrate .. //depot/projects/arm/src/lib/libthr/thread/thr_umtx.c#7 integrate .. //depot/projects/arm/src/lib/libthread_db/Makefile#3 integrate .. //depot/projects/arm/src/lib/libutil/Makefile#3 integrate .. //depot/projects/arm/src/lib/libutil/flopen.3#1 branch .. //depot/projects/arm/src/lib/libutil/flopen.c#1 branch .. //depot/projects/arm/src/lib/libutil/libutil.h#2 integrate .. //depot/projects/arm/src/lib/libutil/pidfile.c#2 integrate .. //depot/projects/arm/src/lib/msun/Makefile#4 integrate .. //depot/projects/arm/src/libexec/rtld-elf/Makefile#5 integrate .. //depot/projects/arm/src/libexec/rtld-elf/rtld.1#4 integrate .. //depot/projects/arm/src/release/Makefile#11 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#6 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/installation/common/install.sgml#3 integrate .. //depot/projects/arm/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#11 integrate .. //depot/projects/arm/src/release/doc/share/misc/dev.archlist.txt#7 integrate .. //depot/projects/arm/src/sbin/dumpfs/dumpfs.8#2 integrate .. //depot/projects/arm/src/sbin/fdisk/fdisk.c#3 integrate .. //depot/projects/arm/src/sbin/fdisk_pc98/fdisk.8#4 integrate .. //depot/projects/arm/src/sbin/geom/class/eli/geom_eli.c#8 integrate .. //depot/projects/arm/src/sbin/ipfw/ipfw2.c#10 integrate .. //depot/projects/arm/src/sbin/setkey/setkey.8#3 integrate .. //depot/projects/arm/src/sbin/setkey/token.l#2 integrate .. //depot/projects/arm/src/secure/lib/libcrypto/Makefile#5 integrate .. //depot/projects/arm/src/secure/lib/libcrypto/Makefile.inc#6 integrate .. //depot/projects/arm/src/secure/lib/libcrypto/opensslconf-amd64.h#4 integrate .. //depot/projects/arm/src/secure/lib/libcrypto/opensslconf-i386.h#4 integrate .. //depot/projects/arm/src/share/man/man4/Makefile#12 integrate .. //depot/projects/arm/src/share/man/man4/altq.4#6 integrate .. //depot/projects/arm/src/share/man/man4/axe.4#2 integrate .. //depot/projects/arm/src/share/man/man4/hptiop.4#1 branch .. //depot/projects/arm/src/share/man/man4/md.4#3 integrate .. //depot/projects/arm/src/share/man/man4/rum.4#1 branch .. //depot/projects/arm/src/share/man/man4/snd_atiixp.4#3 integrate .. //depot/projects/arm/src/share/man/man4/snd_via8233.4#3 integrate .. //depot/projects/arm/src/share/man/man4/twa.4#2 integrate .. //depot/projects/arm/src/share/man/man4/ubsa.4#5 integrate .. //depot/projects/arm/src/share/man/man4/vlan.4#7 integrate .. //depot/projects/arm/src/share/man/man5/passwd.5#2 integrate .. //depot/projects/arm/src/share/man/man5/periodic.conf.5#4 integrate .. //depot/projects/arm/src/share/man/man9/VFS_SYNC.9#2 integrate .. //depot/projects/arm/src/share/man/man9/VOP_FSYNC.9#2 integrate .. //depot/projects/arm/src/share/man/man9/g_bio.9#3 integrate .. //depot/projects/arm/src/share/man/man9/make_dev.9#3 integrate .. //depot/projects/arm/src/share/mk/bsd.lib.mk#7 integrate .. //depot/projects/arm/src/share/mk/bsd.libnames.mk#6 integrate .. //depot/projects/arm/src/share/mk/bsd.own.mk#11 integrate .. //depot/projects/arm/src/share/mk/bsd.symver.mk#3 integrate .. //depot/projects/arm/src/share/mklocale/ja_JP.eucJP.src#2 integrate .. //depot/projects/arm/src/sys/amd64/acpica/madt.c#8 integrate .. //depot/projects/arm/src/sys/amd64/amd64/intr_machdep.c#12 integrate .. //depot/projects/arm/src/sys/amd64/amd64/io_apic.c#12 integrate .. //depot/projects/arm/src/sys/amd64/amd64/local_apic.c#20 integrate .. //depot/projects/arm/src/sys/amd64/amd64/mp_machdep.c#16 integrate .. //depot/projects/arm/src/sys/amd64/amd64/mptable.c#6 integrate .. //depot/projects/arm/src/sys/amd64/amd64/msi.c#5 integrate .. //depot/projects/arm/src/sys/amd64/amd64/nexus.c#11 integrate .. //depot/projects/arm/src/sys/amd64/conf/GENERIC#21 integrate .. //depot/projects/arm/src/sys/amd64/conf/NOTES#15 integrate .. //depot/projects/arm/src/sys/amd64/include/apicvar.h#13 integrate .. //depot/projects/arm/src/sys/amd64/include/intr_machdep.h#11 integrate .. //depot/projects/arm/src/sys/amd64/isa/atpic.c#7 integrate .. //depot/projects/arm/src/sys/amd64/linux32/linux32_machdep.c#16 integrate .. //depot/projects/arm/src/sys/boot/common/loader.8#9 integrate .. //depot/projects/arm/src/sys/conf/Makefile.amd64#4 integrate .. //depot/projects/arm/src/sys/conf/Makefile.arm#17 integrate .. //depot/projects/arm/src/sys/conf/Makefile.i386#5 integrate .. //depot/projects/arm/src/sys/conf/Makefile.ia64#4 integrate .. //depot/projects/arm/src/sys/conf/Makefile.pc98#5 integrate .. //depot/projects/arm/src/sys/conf/Makefile.powerpc#4 integrate .. //depot/projects/arm/src/sys/conf/Makefile.sparc64#4 integrate .. //depot/projects/arm/src/sys/conf/Makefile.sun4v#2 integrate .. //depot/projects/arm/src/sys/conf/NOTES#47 integrate .. //depot/projects/arm/src/sys/conf/files#71 integrate .. //depot/projects/arm/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#4 integrate .. //depot/projects/arm/src/sys/crypto/camellia/camellia-api.c#1 branch .. //depot/projects/arm/src/sys/crypto/camellia/camellia.c#1 branch .. //depot/projects/arm/src/sys/crypto/camellia/camellia.h#1 branch .. //depot/projects/arm/src/sys/dev/acpica/acpi.c#19 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.c#37 integrate .. //depot/projects/arm/src/sys/dev/firewire/sbp_targ.c#5 integrate .. //depot/projects/arm/src/sys/dev/hptiop/hptiop.c#1 branch .. //depot/projects/arm/src/sys/dev/hptiop/hptiop.h#1 branch .. //depot/projects/arm/src/sys/dev/isp/isp_freebsd.c#28 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_pci.c#26 integrate .. //depot/projects/arm/src/sys/dev/isp/isp_sbus.c#18 integrate .. //depot/projects/arm/src/sys/dev/mfi/mfi.c#15 integrate .. //depot/projects/arm/src/sys/dev/mfi/mfi_disk.c#5 integrate .. //depot/projects/arm/src/sys/dev/mfi/mfi_ioctl.h#5 integrate .. //depot/projects/arm/src/sys/dev/mfi/mfi_pci.c#5 integrate .. //depot/projects/arm/src/sys/dev/mfi/mfivar.h#6 integrate .. //depot/projects/arm/src/sys/dev/mxge/eth_z8e.dat.gz.uu#5 integrate .. //depot/projects/arm/src/sys/dev/mxge/ethp_z8e.dat.gz.uu#5 integrate .. //depot/projects/arm/src/sys/dev/mxge/if_mxge.c#15 integrate .. //depot/projects/arm/src/sys/dev/mxge/mxge_mcp.h#4 integrate .. //depot/projects/arm/src/sys/dev/nve/if_nve.c#8 integrate .. //depot/projects/arm/src/sys/dev/pci/pci.c#27 integrate .. //depot/projects/arm/src/sys/dev/sk/if_sk.c#13 integrate .. //depot/projects/arm/src/sys/dev/sound/pci/hda/hdac.c#13 integrate .. //depot/projects/arm/src/sys/dev/sound/pcm/buffer.h#7 integrate .. //depot/projects/arm/src/sys/dev/twa/tw_cl.h#2 integrate .. //depot/projects/arm/src/sys/dev/twa/tw_cl_externs.h#2 integrate .. //depot/projects/arm/src/sys/dev/twa/tw_cl_fwif.h#2 integrate .. //depot/projects/arm/src/sys/dev/twa/tw_cl_fwimg.c#2 delete .. //depot/projects/arm/src/sys/dev/twa/tw_cl_init.c#2 integrate .. //depot/projects/arm/src/sys/dev/twa/tw_cl_intr.c#2 integrate .. //depot/projects/arm/src/sys/dev/twa/tw_cl_io.c#2 integrate .. //depot/projects/arm/src/sys/dev/twa/tw_cl_ioctl.h#2 integrate .. //depot/projects/arm/src/sys/dev/twa/tw_cl_misc.c#2 integrate .. //depot/projects/arm/src/sys/dev/twa/tw_cl_share.h#2 integrate .. //depot/projects/arm/src/sys/dev/twa/tw_osl.h#2 integrate .. //depot/projects/arm/src/sys/dev/twa/tw_osl_cam.c#5 integrate .. //depot/projects/arm/src/sys/dev/twa/tw_osl_externs.h#2 integrate .. //depot/projects/arm/src/sys/dev/twa/tw_osl_freebsd.c#4 integrate .. //depot/projects/arm/src/sys/dev/twa/tw_osl_includes.h#3 integrate .. //depot/projects/arm/src/sys/dev/twa/tw_osl_inline.h#3 integrate .. //depot/projects/arm/src/sys/dev/twa/tw_osl_ioctl.h#2 integrate .. //depot/projects/arm/src/sys/dev/twa/tw_osl_share.h#3 integrate .. //depot/projects/arm/src/sys/dev/twa/tw_osl_types.h#2 integrate .. //depot/projects/arm/src/sys/dev/usb/if_axe.c#11 integrate .. //depot/projects/arm/src/sys/dev/usb/if_cue.c#4 integrate .. //depot/projects/arm/src/sys/dev/usb/if_cuereg.h#3 integrate .. //depot/projects/arm/src/sys/dev/usb/if_kue.c#5 integrate .. //depot/projects/arm/src/sys/dev/usb/if_kuereg.h#3 integrate .. //depot/projects/arm/src/sys/dev/usb/if_rue.c#5 integrate .. //depot/projects/arm/src/sys/dev/usb/if_ruereg.h#3 integrate .. //depot/projects/arm/src/sys/dev/usb/if_rum.c#2 integrate .. //depot/projects/arm/src/sys/dev/usb/if_udav.c#7 integrate .. //depot/projects/arm/src/sys/dev/usb/if_ural.c#20 integrate .. //depot/projects/arm/src/sys/dev/usb/if_uralvar.h#5 integrate .. //depot/projects/arm/src/sys/dev/usb/ubsa.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/uhid.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/ukbd.c#8 integrate .. //depot/projects/arm/src/sys/dev/usb/ums.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/usb.c#6 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_mem.c#5 integrate .. //depot/projects/arm/src/sys/dev/usb/usb_subr.c#14 integrate .. //depot/projects/arm/src/sys/dev/usb/usbdevs#30 integrate .. //depot/projects/arm/src/sys/geom/part/g_part.c#3 integrate .. //depot/projects/arm/src/sys/geom/part/g_part.h#2 integrate .. //depot/projects/arm/src/sys/geom/part/g_part_apm.c#2 integrate .. //depot/projects/arm/src/sys/geom/part/g_part_gpt.c#2 integrate .. //depot/projects/arm/src/sys/i386/Makefile#2 integrate .. //depot/projects/arm/src/sys/i386/acpica/madt.c#8 integrate .. //depot/projects/arm/src/sys/i386/conf/GENERIC#21 integrate .. //depot/projects/arm/src/sys/i386/conf/NOTES#23 integrate .. //depot/projects/arm/src/sys/i386/conf/PAE#7 integrate .. //depot/projects/arm/src/sys/i386/i386/intr_machdep.c#12 integrate .. //depot/projects/arm/src/sys/i386/i386/io_apic.c#11 integrate .. //depot/projects/arm/src/sys/i386/i386/local_apic.c#19 integrate .. //depot/projects/arm/src/sys/i386/i386/mp_machdep.c#16 integrate .. //depot/projects/arm/src/sys/i386/i386/mptable.c#5 integrate .. //depot/projects/arm/src/sys/i386/i386/msi.c#5 integrate .. //depot/projects/arm/src/sys/i386/i386/nexus.c#11 integrate .. //depot/projects/arm/src/sys/i386/include/apicvar.h#12 integrate .. //depot/projects/arm/src/sys/i386/include/intr_machdep.h#11 integrate .. //depot/projects/arm/src/sys/i386/isa/atpic.c#7 integrate .. //depot/projects/arm/src/sys/i386/linux/linux_machdep.c#14 integrate .. //depot/projects/arm/src/sys/kern/Make.tags.inc#4 integrate .. //depot/projects/arm/src/sys/kern/kern_condvar.c#8 integrate .. //depot/projects/arm/src/sys/kern/kern_mib.c#5 integrate .. //depot/projects/arm/src/sys/kern/kern_mutex.c#16 integrate .. //depot/projects/arm/src/sys/kern/kern_rwlock.c#10 integrate .. //depot/projects/arm/src/sys/kern/kern_sx.c#11 integrate .. //depot/projects/arm/src/sys/kern/kern_synch.c#20 integrate .. //depot/projects/arm/src/sys/kern/kern_timeout.c#5 integrate .. //depot/projects/arm/src/sys/kern/uipc_socket.c#36 integrate .. //depot/projects/arm/src/sys/kern/uipc_usrreq.c#26 integrate .. //depot/projects/arm/src/sys/modules/Makefile#42 integrate .. //depot/projects/arm/src/sys/modules/crypto/Makefile#5 integrate .. //depot/projects/arm/src/sys/modules/em/Makefile#4 integrate .. //depot/projects/arm/src/sys/modules/hptiop/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/twa/Makefile#4 integrate .. //depot/projects/arm/src/sys/net/ethernet.h#8 integrate .. //depot/projects/arm/src/sys/net/ieee8023ad_lacp.c#3 integrate .. //depot/projects/arm/src/sys/net/ieee8023ad_lacp.h#2 integrate .. //depot/projects/arm/src/sys/net/if_lagg.c#3 integrate .. //depot/projects/arm/src/sys/net/if_lagg.h#3 integrate .. //depot/projects/arm/src/sys/net/pfkeyv2.h#2 integrate .. //depot/projects/arm/src/sys/netatalk/ddp_usrreq.c#7 integrate .. //depot/projects/arm/src/sys/netgraph/ng_mppc.c#4 integrate .. //depot/projects/arm/src/sys/netgraph/ng_socket.c#10 integrate .. //depot/projects/arm/src/sys/netinet/if_ether.c#17 integrate .. //depot/projects/arm/src/sys/netinet/in.c#9 integrate .. //depot/projects/arm/src/sys/netinet/in_cksum.c#2 integrate .. //depot/projects/arm/src/sys/netinet/in_gif.c#6 integrate .. //depot/projects/arm/src/sys/netinet/in_pcb.c#20 integrate .. //depot/projects/arm/src/sys/netinet/in_pcb.h#11 integrate .. //depot/projects/arm/src/sys/netinet/in_rmx.c#4 integrate .. //depot/projects/arm/src/sys/netinet/ip.h#4 integrate .. //depot/projects/arm/src/sys/netinet/ip_divert.c#11 integrate .. //depot/projects/arm/src/sys/netinet/ip_dummynet.c#10 integrate .. //depot/projects/arm/src/sys/netinet/ip_ecn.c#2 integrate .. //depot/projects/arm/src/sys/netinet/ip_encap.c#4 integrate .. //depot/projects/arm/src/sys/netinet/ip_fw2.c#31 integrate .. //depot/projects/arm/src/sys/netinet/ip_icmp.c#7 integrate .. //depot/projects/arm/src/sys/netinet/ip_id.c#2 integrate .. //depot/projects/arm/src/sys/netinet/ip_input.c#18 integrate .. //depot/projects/arm/src/sys/netinet/ip_ipsec.c#4 integrate .. //depot/projects/arm/src/sys/netinet/ip_mroute.c#13 integrate .. //depot/projects/arm/src/sys/netinet/ip_options.c#3 integrate .. //depot/projects/arm/src/sys/netinet/ip_options.h#2 integrate .. //depot/projects/arm/src/sys/netinet/ip_output.c#22 integrate .. //depot/projects/arm/src/sys/netinet/raw_ip.c#14 integrate .. //depot/projects/arm/src/sys/netinet/sctp.h#5 integrate .. //depot/projects/arm/src/sys/netinet/sctp_asconf.c#8 integrate .. //depot/projects/arm/src/sys/netinet/sctp_asconf.h#5 integrate .. //depot/projects/arm/src/sys/netinet/sctp_auth.c#8 integrate .. //depot/projects/arm/src/sys/netinet/sctp_auth.h#4 integrate .. //depot/projects/arm/src/sys/netinet/sctp_bsd_addr.c#7 integrate .. //depot/projects/arm/src/sys/netinet/sctp_bsd_addr.h#5 integrate .. //depot/projects/arm/src/sys/netinet/sctp_constants.h#10 integrate .. //depot/projects/arm/src/sys/netinet/sctp_crc32.c#6 integrate .. //depot/projects/arm/src/sys/netinet/sctp_crc32.h#3 integrate .. //depot/projects/arm/src/sys/netinet/sctp_header.h#4 integrate .. //depot/projects/arm/src/sys/netinet/sctp_indata.c#13 integrate .. //depot/projects/arm/src/sys/netinet/sctp_indata.h#5 integrate .. //depot/projects/arm/src/sys/netinet/sctp_input.c#13 integrate .. //depot/projects/arm/src/sys/netinet/sctp_input.h#3 integrate .. //depot/projects/arm/src/sys/netinet/sctp_lock_bsd.h#5 integrate .. //depot/projects/arm/src/sys/netinet/sctp_os.h#6 integrate .. //depot/projects/arm/src/sys/netinet/sctp_os_bsd.h#9 integrate .. //depot/projects/arm/src/sys/netinet/sctp_output.c#13 integrate .. //depot/projects/arm/src/sys/netinet/sctp_output.h#6 integrate .. //depot/projects/arm/src/sys/netinet/sctp_pcb.c#13 integrate .. //depot/projects/arm/src/sys/netinet/sctp_pcb.h#8 integrate .. //depot/projects/arm/src/sys/netinet/sctp_peeloff.c#8 integrate .. //depot/projects/arm/src/sys/netinet/sctp_peeloff.h#3 integrate .. //depot/projects/arm/src/sys/netinet/sctp_structs.h#12 integrate .. //depot/projects/arm/src/sys/netinet/sctp_sysctl.c#3 integrate .. //depot/projects/arm/src/sys/netinet/sctp_sysctl.h#3 integrate .. //depot/projects/arm/src/sys/netinet/sctp_timer.c#9 integrate .. //depot/projects/arm/src/sys/netinet/sctp_timer.h#3 integrate .. //depot/projects/arm/src/sys/netinet/sctp_uio.h#11 integrate .. //depot/projects/arm/src/sys/netinet/sctp_usrreq.c#13 integrate .. //depot/projects/arm/src/sys/netinet/sctp_var.h#8 integrate .. //depot/projects/arm/src/sys/netinet/sctputil.c#13 integrate .. //depot/projects/arm/src/sys/netinet/sctputil.h#11 integrate .. //depot/projects/arm/src/sys/netinet/tcp_debug.c#3 integrate .. //depot/projects/arm/src/sys/netinet/tcp_fsm.h#2 integrate .. //depot/projects/arm/src/sys/netinet/tcp_input.c#29 integrate .. //depot/projects/arm/src/sys/netinet/tcp_output.c#17 integrate .. //depot/projects/arm/src/sys/netinet/tcp_reass.c#1 branch .. //depot/projects/arm/src/sys/netinet/tcp_sack.c#13 integrate .. //depot/projects/arm/src/sys/netinet/tcp_subr.c#24 integrate .. //depot/projects/arm/src/sys/netinet/tcp_timer.c#15 integrate .. //depot/projects/arm/src/sys/netinet/tcp_timewait.c#1 branch .. //depot/projects/arm/src/sys/netinet/tcp_usrreq.c#18 integrate .. //depot/projects/arm/src/sys/netinet/tcp_var.h#18 integrate .. //depot/projects/arm/src/sys/netinet/udp_usrreq.c#19 integrate .. //depot/projects/arm/src/sys/netinet6/esp_camellia.c#1 branch .. //depot/projects/arm/src/sys/netinet6/esp_camellia.h#1 branch .. //depot/projects/arm/src/sys/netinet6/esp_core.c#4 integrate .. //depot/projects/arm/src/sys/netinet6/in6_pcb.c#13 integrate .. //depot/projects/arm/src/sys/netinet6/in6_pcb.h#4 integrate .. //depot/projects/arm/src/sys/netinet6/in6_proto.c#8 integrate .. //depot/projects/arm/src/sys/netinet6/raw_ip6.c#8 integrate .. //depot/projects/arm/src/sys/netinet6/sctp6_usrreq.c#11 integrate .. //depot/projects/arm/src/sys/netinet6/sctp6_var.h#4 integrate .. //depot/projects/arm/src/sys/netipsec/xform_esp.c#7 integrate .. //depot/projects/arm/src/sys/netipx/ipx.c#3 integrate .. //depot/projects/arm/src/sys/netipx/ipx.h#4 integrate .. //depot/projects/arm/src/sys/netipx/ipx_cksum.c#3 integrate .. //depot/projects/arm/src/sys/netipx/ipx_if.h#3 integrate .. //depot/projects/arm/src/sys/netipx/ipx_input.c#6 integrate .. //depot/projects/arm/src/sys/netipx/ipx_outputfl.c#3 integrate .. //depot/projects/arm/src/sys/netipx/ipx_pcb.c#5 integrate .. //depot/projects/arm/src/sys/netipx/ipx_pcb.h#4 integrate .. //depot/projects/arm/src/sys/netipx/ipx_usrreq.c#7 integrate .. //depot/projects/arm/src/sys/netipx/ipx_var.h#3 integrate .. //depot/projects/arm/src/sys/netipx/spx_debug.c#3 integrate .. //depot/projects/arm/src/sys/netipx/spx_debug.h#3 integrate .. //depot/projects/arm/src/sys/opencrypto/cryptodev.c#9 integrate .. //depot/projects/arm/src/sys/opencrypto/cryptodev.h#6 integrate .. //depot/projects/arm/src/sys/opencrypto/cryptosoft.c#8 integrate .. //depot/projects/arm/src/sys/opencrypto/xform.c#6 integrate .. //depot/projects/arm/src/sys/opencrypto/xform.h#3 integrate .. //depot/projects/arm/src/sys/pc98/conf/GENERIC#13 integrate .. //depot/projects/arm/src/sys/pci/if_tl.c#7 integrate .. //depot/projects/arm/src/sys/sparc64/include/profile.h#2 integrate .. //depot/projects/arm/src/sys/sun4v/include/profile.h#2 integrate .. //depot/projects/arm/src/sys/sys/callout.h#3 integrate .. //depot/projects/arm/src/sys/sys/param.h#29 integrate .. //depot/projects/arm/src/sys/sys/rwlock.h#8 integrate .. //depot/projects/arm/src/sys/sys/sx.h#10 integrate .. //depot/projects/arm/src/sys/vm/uma_int.h#3 integrate .. //depot/projects/arm/src/tools/regression/lib/libc/net/Makefile#2 integrate .. //depot/projects/arm/src/tools/regression/lib/libc/net/test-ether.c#1 branch .. //depot/projects/arm/src/tools/regression/lib/libc/net/test-ether.t#1 branch .. //depot/projects/arm/src/tools/regression/sockets/sblock/Makefile#1 branch .. //depot/projects/arm/src/tools/regression/sockets/sblock/sblock.c#1 branch .. //depot/projects/arm/src/usr.bin/calendar/calendar.c#2 integrate .. //depot/projects/arm/src/usr.bin/calendar/calendar.h#2 integrate .. //depot/projects/arm/src/usr.bin/calendar/day.c#2 integrate .. //depot/projects/arm/src/usr.bin/calendar/io.c#2 integrate .. //depot/projects/arm/src/usr.bin/calendar/ostern.c#2 integrate .. //depot/projects/arm/src/usr.bin/calendar/paskha.c#2 integrate .. //depot/projects/arm/src/usr.bin/ldd/ldd.1#2 integrate .. //depot/projects/arm/src/usr.bin/logger/Makefile#3 integrate .. //depot/projects/arm/src/usr.bin/logger/logger.c#3 integrate .. //depot/projects/arm/src/usr.bin/login/login.h#3 integrate .. //depot/projects/arm/src/usr.bin/login/login_audit.c#2 integrate .. //depot/projects/arm/src/usr.bin/login/login_fbtab.c#2 integrate .. //depot/projects/arm/src/usr.bin/quota/quota.c#7 integrate .. //depot/projects/arm/src/usr.bin/tar/read.c#7 integrate .. //depot/projects/arm/src/usr.bin/time/Makefile#2 integrate .. //depot/projects/arm/src/usr.bin/time/time.c#2 integrate .. //depot/projects/arm/src/usr.bin/tip/tip/acu.c#3 integrate .. //depot/projects/arm/src/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#3 integrate .. //depot/projects/arm/src/usr.sbin/boot0cfg/boot0cfg.8#2 integrate .. //depot/projects/arm/src/usr.sbin/config/Makefile#3 integrate .. //depot/projects/arm/src/usr.sbin/config/config.8#4 integrate .. //depot/projects/arm/src/usr.sbin/config/config.h#6 integrate .. //depot/projects/arm/src/usr.sbin/config/config.y#8 integrate .. //depot/projects/arm/src/usr.sbin/config/configvers.h#6 integrate .. //depot/projects/arm/src/usr.sbin/config/kernconf.tmpl#1 branch .. //depot/projects/arm/src/usr.sbin/config/lang.l#4 integrate .. //depot/projects/arm/src/usr.sbin/config/main.c#7 integrate .. //depot/projects/arm/src/usr.sbin/iostat/iostat.c#3 integrate .. //depot/projects/arm/src/usr.sbin/mixer/mixer.8#2 integrate .. //depot/projects/arm/src/usr.sbin/nologin/nologin.5#2 integrate .. //depot/projects/arm/src/usr.sbin/pccard/pccardc/pccardc.8#2 integrate Differences ... ==== //depot/projects/arm/src/Makefile.inc1#26 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.572 2007/04/17 15:52:36 pjd Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.574 2007/05/13 18:15:50 des Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1016,7 +1016,7 @@ ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ - lib/libopie lib/libpam lib/libpthread \ + lib/libopie lib/libpam lib/${DEFAULT_THREAD_LIB} \ lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ @@ -1135,18 +1135,14 @@ delete-old-files: @echo ">>> Removing old files (only deletes safe to delete libs)" -.for file in ${OLD_FILES} # Ask for every old file if the user really wants to remove it. # It's annoying, but better safe than sorry. - @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ - rm ${RM_I} "${DESTDIR}/${file}" || true; \ - if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then\ - echo "Removing schg flag on ${DESTDIR}/${file}"; \ - chflags noschg "${DESTDIR}/${file}"; \ - rm ${RM_I} "${DESTDIR}/${file}"; \ + @(cd ${DESTDIR}/ && for file in ${OLD_FILES}; do \ + if [ -f "./$${file}" -o -L "./$${file}" ]; then \ + chflags noschg "./$${file}" 2>/dev/null || true; \ + rm ${RM_I} "${DESTDIR}/$${file}" || true; \ fi; \ - fi -.endfor + done) # Remove catpages without corresponding manpages. @3<&0; \ find ${DESTDIR}/usr/share/man/cat* ! -type d | \ @@ -1161,11 +1157,11 @@ check-old-files: @echo ">>> Checking for old files" -.for file in ${OLD_FILES} - @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ - echo "${DESTDIR}/${file}"; \ - fi -.endfor + @(cd ${DESTDIR}/ && for file in ${OLD_FILES}; do \ + if [ -f "./$${file}" -o -L "./$${file}" ]; then \ + echo "${DESTDIR}/$${file}"; \ + fi; \ + done) # Check for catpages without corresponding manpages. @find ${DESTDIR}/usr/share/man/cat* ! -type d | \ sed -ep -e's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:' | \ @@ -1179,25 +1175,21 @@ delete-old-libs: @echo ">>> Removing old libraries" @echo "${OLD_LIBS_MESSAGE}" | fmt -.for file in ${OLD_LIBS} - @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ - rm ${RM_I} "${DESTDIR}/${file}" || true; \ - if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then\ - echo "Removing schg flag on ${DESTDIR}/${file}"; \ - chflags noschg "${DESTDIR}/${file}"; \ - rm ${RM_I} "${DESTDIR}/${file}"; \ + @(cd ${DESTDIR}/ && for file in ${OLD_LIBS}; do \ + if [ -f "./$${file}" -o -L "./$${file}" ]; then \ + chflags noschg "./$${file}" 2>/dev/null || true; \ + rm ${RM_I} "${DESTDIR}/$${file}" || true; \ fi; \ - fi -.endfor + done) @echo ">>> Old libraries removed" check-old-libs: @echo ">>> Checking for old libraries" -.for file in ${OLD_LIBS} - @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ - echo "${DESTDIR}/${file}"; \ - fi -.endfor + @(cd ${DESTDIR}/ && for file in ${OLD_LIBS}; do \ + if [ -f "./$${file}" -o -L "./$${file}" ]; then \ + echo "${DESTDIR}/$${file}"; \ + fi; \ + done) delete-old-dirs: @echo ">>> Removing old directories" ==== //depot/projects/arm/src/ObsoleteFiles.inc#20 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/ObsoleteFiles.inc,v 1.81 2007/04/24 16:58:54 emax Exp $ +# $FreeBSD: src/ObsoleteFiles.inc,v 1.82 2007/05/10 13:25:27 roberto Exp $ # # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and # directories (OLD_DIRS) which should get removed at an update. Recently @@ -14,6 +14,9 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # +# 20070510: zpool/zfs moved to /sbin +OLD_FILES+=usr/sbin/zfs +OLD_FILES+=usr/sbin/zpool # 20070423: rc.bluetooth (examples) removed OLD_FILES+=usr/share/examples/netgraph/bluetooth/rc.bluetooth # 20070421: worm.4 removed ==== //depot/projects/arm/src/UPDATING#15 (text+ko) ==== @@ -21,6 +21,19 @@ developers choose to disable these features on build machines to maximize performance. +20070513: + Symbol versioning is enabled by default. To disable it, use + option WITHOUT_SYMVER. It is not advisable to attempt to + disable symbol versioning once it is enabled; your installworld + will break because a symbol version-less libc will get installed + before the install tools. As a result, the old install tools, + which previously had symbol dependencies to FBSD_1.0, will fail + because the freshly installed libc will not have them. + + The default threading library has been changed to libthr. If + you wish to have libpthread as your default, use option + DEFAULT_THREAD_LIB=libpthread for the buildworld. + 20070423: The ABI breakage in sendmail(8)'s libmilter has been repaired so it is no longer necessary to recompile mail filters (aka, @@ -773,4 +786,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.489 2007/04/23 22:15:07 gshapiro Exp $ +$FreeBSD: src/UPDATING,v 1.490 2007/05/13 14:41:48 deischen Exp $ ==== //depot/projects/arm/src/bin/mv/mv.1#2 (text+ko) ==== @@ -30,7 +30,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)mv.1 8.1 (Berkeley) 5/31/93 -.\" $FreeBSD: src/bin/mv/mv.1,v 1.28 2005/01/16 16:41:58 ru Exp $ +.\" $FreeBSD: src/bin/mv/mv.1,v 1.29 2007/05/12 22:18:27 pav Exp $ .\" .Dd July 9, 2002 .Dt MV 1 @@ -113,9 +113,9 @@ to be verbose, showing files after they are moved. .El .Pp -It is an error for either the +It is an error for the .Ar source -operand or the destination path to specify a directory unless both do. +operand to specify a directory if the target exists and is not a directory. .Pp If the destination path does not have a mode which permits writing, .Nm ==== //depot/projects/arm/src/contrib/amd/amq/amq.8#2 (text+ko) ==== @@ -39,7 +39,7 @@ .\" %W% (Berkeley) %G% .\" .\" $Id: amq.8,v 1.3.2.8 2004/01/06 03:15:16 ezk Exp $ -.\" $FreeBSD: src/contrib/amd/amq/amq.8,v 1.12 2005/06/16 20:21:02 ru Exp $ +.\" $FreeBSD: src/contrib/amd/amq/amq.8,v 1.13 2007/05/12 10:25:31 pav Exp $ .\" .Dd March 16, 1991 .Dt AMQ 8 @@ -133,7 +133,7 @@ Ask the automounter to use the logging options specified in .Ar log_options from now on. -.It Fl D Ar log_options +.It Fl D Ar debug_options Ask the automounter to use the debugging options specified in .Ar debug_options from now on. ==== //depot/projects/arm/src/etc/defaults/periodic.conf#4 (text+ko) ==== @@ -13,7 +13,7 @@ # For a more detailed explanation of all the periodic.conf variables, please # refer to the periodic.conf(5) manual page. # -# $FreeBSD: src/etc/defaults/periodic.conf,v 1.42 2007/04/06 02:33:06 pjd Exp $ +# $FreeBSD: src/etc/defaults/periodic.conf,v 1.43 2007/05/13 09:33:35 maxim Exp $ # # What files override these defaults ? @@ -130,6 +130,9 @@ daily_status_named_enable="YES" daily_status_named_usedns="YES" # DNS lookups are ok +# 480.status-ntpd +daily_status_ntpd_enable="NO" # Check NTP status + # 500.queuerun daily_queuerun_enable="YES" # Run mail queue daily_submit_queuerun="YES" # Also submit queue ==== //depot/projects/arm/src/lib/libc/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 2/3/94 -# $FreeBSD: src/lib/libc/Makefile,v 1.69 2007/03/04 12:25:03 simon Exp $ +# $FreeBSD: src/lib/libc/Makefile,v 1.70 2007/05/13 14:12:38 deischen Exp $ SHLIBDIR?= /lib @@ -76,11 +76,9 @@ CFLAGS+=-D_FREEFALL_CONFIG .endif -.if defined(SYMVER_ENABLED) VERSION_DEF=${.CURDIR}/Versions.def SYMBOL_MAPS=${SYM_MAPS} CFLAGS+= -DSYMBOL_VERSIONING -.endif # If there are no machine dependent sources, append all the # machine-independent sources: ==== //depot/projects/arm/src/lib/libc/amd64/Symbol.map#3 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/amd64/Symbol.map,v 1.2 2007/04/29 14:05:15 deischen Exp $ + * $FreeBSD: src/lib/libc/amd64/Symbol.map,v 1.3 2007/05/13 14:16:54 deischen Exp $ */ /* @@ -11,6 +11,7 @@ /* PSEUDO syscalls */ _exit; + .mcount; _setjmp; _longjmp; fabs; ==== //depot/projects/arm/src/lib/libc/arm/Symbol.map#3 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/arm/Symbol.map,v 1.2 2007/04/29 14:05:15 deischen Exp $ + * $FreeBSD: src/lib/libc/arm/Symbol.map,v 1.3 2007/05/13 14:16:54 deischen Exp $ */ /* @@ -11,6 +11,7 @@ /* PSEUDO syscalls */ _exit; + _mcount; _setjmp; _longjmp; alloca; @@ -22,7 +23,7 @@ setjmp; longjmp; sigsetjmp; - siglongjmp + siglongjmp; htonl; __htonl; htons; @@ -65,4 +66,26 @@ __sys_fork; _fork; _sbrk; + + /* softfloat */ + __addsf3; + __adddf3; + __subsf3; + __subdf3; + __mulsf3; + __muldf3; + __divsf3; + __divdf3; + __floatsisf; + __floatsidf; + __floatdisf; + __floatdidf; + __fixsfsi; + __fixdfsi; + __fixsfdi; + __fixdfdi; + __fixunssfsi; + __fixunsdfsi; + __extendsfdf2; + __truncdfsf2; }; ==== //depot/projects/arm/src/lib/libc/gdtoa/_hdtoa.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_hdtoa.c,v 1.4 2007/01/03 04:57:58 das Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/gdtoa/_hdtoa.c,v 1.5 2007/05/08 02:59:37 das Exp $"); #include #include @@ -78,7 +78,7 @@ break; case 1: /* to nearest, halfway rounds to even */ if ((s0[ndigits] > 8) || - (s0[ndigits] == 8 && s0[ndigits - 1] & 1)) + (s0[ndigits] == 8 && s0[ndigits + 1] & 1)) adjust = roundup(s0, ndigits); break; case 2: /* toward +inf */ ==== //depot/projects/arm/src/lib/libc/gmon/Symbol.map#3 (text) ==== @@ -1,9 +1,8 @@ /* - * $FreeBSD: src/lib/libc/gmon/Symbol.map,v 1.2 2007/04/29 14:05:16 deischen Exp $ + * $FreeBSD: src/lib/libc/gmon/Symbol.map,v 1.3 2007/05/13 14:16:55 deischen Exp $ */ FBSD_1.0 { - .mcount; _mcleanup; monstartup; moncontrol; ==== //depot/projects/arm/src/lib/libc/i386/Symbol.map#4 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/i386/Symbol.map,v 1.3 2007/04/29 14:05:16 deischen Exp $ + * $FreeBSD: src/lib/libc/i386/Symbol.map,v 1.4 2007/05/13 14:16:55 deischen Exp $ */ /* @@ -11,6 +11,7 @@ /* PSEUDO syscalls */ _exit; + .mcount; _setjmp; _longjmp; alloca; ==== //depot/projects/arm/src/lib/libc/net/Symbol.map#4 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/net/Symbol.map,v 1.8 2007/04/29 14:05:17 deischen Exp $ + * $FreeBSD: src/lib/libc/net/Symbol.map,v 1.9 2007/05/13 15:01:25 rwatson Exp $ */ FBSD_1.0 { @@ -7,7 +7,9 @@ __b64_pton; ether_line; ether_aton; + ether_aton_r; ether_ntoa; + ether_ntoa_r; ether_ntohost; ether_hostton; eui64_aton; ==== //depot/projects/arm/src/lib/libc/net/ether_addr.c#2 (text+ko) ==== @@ -1,6 +1,7 @@ /* - * Copyright (c) 1995 - * Bill Paul . All rights reserved. + * Copyright (c) 1995 Bill Paul . + * Copyright (c) 2007 Robert N. M. Watson + * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -37,103 +38,104 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/ether_addr.c,v 1.15 2002/04/08 07:51:10 ru Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/ether_addr.c,v 1.17 2007/05/13 13:57:44 rwatson Exp $"); -#include -#include #include -#include -#include #include #include + #include + #ifdef YP #include #include #include #endif +#include +#include +#include +#include + #ifndef _PATH_ETHERS -#define _PATH_ETHERS "/etc/ethers" +#define _PATH_ETHERS "/etc/ethers" #endif /* - * Parse a string of text containing an ethernet address and hostname - * and separate it into its component parts. + * Parse a string of text containing an ethernet address and hostname and + * separate it into its component parts. */ int -ether_line(l, e, hostname) - const char *l; - struct ether_addr *e; - char *hostname; +ether_line(const char *l, struct ether_addr *e, char *hostname) { - int i, o[6]; + int i, o[6]; - i = sscanf(l, "%x:%x:%x:%x:%x:%x %s", &o[0], &o[1], &o[2], - &o[3], &o[4], &o[5], - hostname); + i = sscanf(l, "%x:%x:%x:%x:%x:%x %s", &o[0], &o[1], &o[2], &o[3], + &o[4], &o[5], hostname); if (i != 7) - return (i); - - for (i=0; i<6; i++) - e->octet[i] = o[i]; - return (0); + return (i); + for (i=0; i<6; i++) + e->octet[i] = o[i]; + return (0); } /* - * Convert an ASCII representation of an ethernet address to - * binary form. + * Convert an ASCII representation of an ethernet address to binary form. */ -struct -ether_addr *ether_aton(a) - const char *a; +struct ether_addr * +ether_aton_r(const char *a, struct ether_addr *e) { - int i; - static struct ether_addr o; + int i; unsigned int o0, o1, o2, o3, o4, o5; - i = sscanf(a, "%x:%x:%x:%x:%x:%x", &o0, &o1, &o2, &o3, &o4, &o5); + i = sscanf(a, "%x:%x:%x:%x:%x:%x", &o0, &o1, &o2, &o3, &o4, &o5); + if (i != 6) + return (NULL); + e->octet[0]=o0; + e->octet[1]=o1; + e->octet[2]=o2; + e->octet[3]=o3; + e->octet[4]=o4; + e->octet[5]=o5; + return (e); +} - if (i != 6) - return (NULL); +struct ether_addr * +ether_aton(const char *a) +{ + static struct ether_addr e; - o.octet[0]=o0; - o.octet[1]=o1; - o.octet[2]=o2; - o.octet[3]=o3; - o.octet[4]=o4; - o.octet[5]=o5; - - return ((struct ether_addr *)&o); + return (ether_aton_r(a, &e)); } /* - * Convert a binary representation of an ethernet address to - * an ASCII string. + * Convert a binary representation of an ethernet address to an ASCII string. */ -char -*ether_ntoa(n) - const struct ether_addr *n; +char * +ether_ntoa_r(const struct ether_addr *n, char *a) +{ + int i; + + i = sprintf(a, "%02x:%02x:%02x:%02x:%02x:%02x", n->octet[0], + n->octet[1], n->octet[2], n->octet[3], n->octet[4], n->octet[5]); + if (i < 17) + return (NULL); + return (a); +} + +char * +ether_ntoa(const struct ether_addr *n) { - int i; static char a[18]; - i = sprintf(a, "%02x:%02x:%02x:%02x:%02x:%02x", - n->octet[0], n->octet[1], n->octet[2], - n->octet[3], n->octet[4], n->octet[5]); - if (i < 17) - return (NULL); - return ((char *)&a); + return (ether_ntoa_r(n, a)); } /* - * Map an ethernet address to a hostname. Use either /etc/ethers or - * NIS/YP. + * Map an ethernet address to a hostname. Use either /etc/ethers or NIS/YP. */ int -ether_ntohost(hostname, e) - char *hostname; - const struct ether_addr *e; +ether_ntohost(char *hostname, const struct ether_addr *e) { FILE *fp; char buf[BUFSIZ + 2]; @@ -145,9 +147,9 @@ char *ether_a; char *yp_domain; #endif + if ((fp = fopen(_PATH_ETHERS, "r")) == NULL) return (1); - while (fgets(buf,BUFSIZ,fp)) { if (buf[0] == '#') continue; @@ -157,7 +159,7 @@ continue; ether_a = ether_ntoa(e); if (yp_match(yp_domain, "ethers.byaddr", ether_a, - strlen(ether_a), &result, &resultlen)) { + strlen(ether_a), &result, &resultlen)) { continue; } strncpy(buf, result, resultlen); @@ -167,8 +169,8 @@ #endif if (!ether_line(buf, &local_ether, local_host)) { if (!bcmp((char *)&local_ether.octet[0], - (char *)&e->octet[0], 6)) { - /* We have a match */ + (char *)&e->octet[0], 6)) { + /* We have a match. */ strcpy(hostname, local_host); fclose(fp); return(0); @@ -180,13 +182,10 @@ } /* - * Map a hostname to an ethernet address using /etc/ethers or - * NIS/YP. + * Map a hostname to an ethernet address using /etc/ethers or NIS/YP. */ int -ether_hostton(hostname, e) - const char *hostname; - struct ether_addr *e; +ether_hostton(const char *hostname, struct ether_addr *e) { FILE *fp; char buf[BUFSIZ + 2]; @@ -197,9 +196,9 @@ int resultlen; char *yp_domain; #endif + if ((fp = fopen(_PATH_ETHERS, "r")) == NULL) return (1); - while (fgets(buf,BUFSIZ,fp)) { if (buf[0] == '#') continue; @@ -208,7 +207,7 @@ if (yp_get_default_domain(&yp_domain)) continue; if (yp_match(yp_domain, "ethers.byname", hostname, - strlen(hostname), &result, &resultlen)) { + strlen(hostname), &result, &resultlen)) { continue; } strncpy(buf, result, resultlen); @@ -218,9 +217,9 @@ #endif if (!ether_line(buf, &local_ether, local_host)) { if (!strcmp(hostname, local_host)) { - /* We have a match */ + /* We have a match. */ bcopy((char *)&local_ether.octet[0], - (char *)&e->octet[0], 6); + (char *)&e->octet[0], 6); fclose(fp); return(0); } ==== //depot/projects/arm/src/lib/libc/net/ethers.3#2 (text+ko) ==== @@ -1,5 +1,6 @@ -.\" Copyright (c) 1995 -.\" Bill Paul . All rights reserved. +.\" Copyright (c) 1995 Bill Paul . +.\" Copyright (c) 2007 Robert N. M. Watson >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon May 14 09:45:11 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E13D16A404; Mon, 14 May 2007 09:45:11 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A1BEE16A402 for ; Mon, 14 May 2007 09:45:10 +0000 (UTC) (envelope-from alexander@leidinger.net) Received: from redbull.bpaserver.net (redbullneu.bpaserver.net [213.198.78.217]) by mx1.freebsd.org (Postfix) with ESMTP id 5C37013C483 for ; Mon, 14 May 2007 09:45:10 +0000 (UTC) (envelope-from alexander@leidinger.net) Received: from outgoing.leidinger.net (p54a5d654.dip.t-dialin.net [84.165.214.84]) by redbull.bpaserver.net (Postfix) with ESMTP id 75FE72E139; Mon, 14 May 2007 11:25:13 +0200 (CEST) Received: from webmail.leidinger.net (webmail.Leidinger.net [192.168.1.102]) by outgoing.leidinger.net (Postfix) with ESMTP id C94DA5B48A3; Mon, 14 May 2007 11:24:57 +0200 (CEST) Received: (from www@localhost) by webmail.leidinger.net (8.13.8/8.13.8/Submit) id l4E9Ovpd037273; Mon, 14 May 2007 11:24:57 +0200 (CEST) (envelope-from Alexander@Leidinger.net) Received: from pslux.cec.eu.int (pslux.cec.eu.int [158.169.9.14]) by webmail.leidinger.net (Horde MIME library) with HTTP; Mon, 14 May 2007 11:24:57 +0200 Message-ID: <20070514112457.u8e1g9mgkkw8s080@webmail.leidinger.net> X-Priority: 3 (Normal) Date: Mon, 14 May 2007 11:24:57 +0200 From: Alexander Leidinger To: Roman Divacky References: <200705120849.l4C8ndlC079878@repoman.freebsd.org> In-Reply-To: <200705120849.l4C8ndlC079878@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; DelSp="Yes"; format="flowed" Content-Disposition: inline Content-Transfer-Encoding: 7bit User-Agent: Internet Messaging Program (IMP) H3 (4.1.4) / FreeBSD-7.0 X-BPAnet-MailScanner-Information: Please contact the ISP for more information X-BPAnet-MailScanner: Found to be clean X-BPAnet-MailScanner-SpamCheck: not spam, SpamAssassin (not cached, score=-14.864, required 8, autolearn=not spam, BAYES_00 -15.00, DK_POLICY_SIGNSOME 0.00, FORGED_RCVD_HELO 0.14) X-BPAnet-MailScanner-From: alexander@leidinger.net X-Spam-Status: No Cc: Perforce Change Reviews Subject: Re: PERFORCE change 119718 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: Mon, 14 May 2007 09:45:11 -0000 Quoting Roman Divacky (from Sat, 12 May 2007 08:49:39 GMT): //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/linux32/linux32_support.s#3 (text+ko) > ==== > > @@ -1,5 +1,5 @@ > /*- > - * Copyright (c) 1993 The Regents of the University of California. > + * Copyright (c) 2007 The FreeBSD Project > * All rights reserved. > * > * Redistribution and use in source and binary forms, with or without Would you please do a forced commit to explain the reason for the license change? Bye, Alexander. -- A liberal is a person whose interests aren't at stake at the moment. -- Willis Player http://www.Leidinger.net Alexander @ Leidinger.net: PGP ID = B0063FE7 http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID = 72077137 From owner-p4-projects@FreeBSD.ORG Mon May 14 12:36:04 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D848616A405; Mon, 14 May 2007 12:36:03 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AE06716A402; Mon, 14 May 2007 12:36:03 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from cyrus.watson.org (cyrus.watson.org [209.31.154.42]) by mx1.freebsd.org (Postfix) with ESMTP id 3AFCE13C4AE; Mon, 14 May 2007 12:36:03 +0000 (UTC) (envelope-from rwatson@FreeBSD.org) Received: from fledge.watson.org (fledge.watson.org [209.31.154.41]) by cyrus.watson.org (Postfix) with ESMTP id 7DA5846C59; Mon, 14 May 2007 08:36:01 -0400 (EDT) Date: Mon, 14 May 2007 13:36:01 +0100 (BST) From: Robert Watson X-X-Sender: robert@fledge.watson.org To: Alexander Leidinger In-Reply-To: <20070514112457.u8e1g9mgkkw8s080@webmail.leidinger.net> Message-ID: <20070514133058.U24765@fledge.watson.org> References: <200705120849.l4C8ndlC079878@repoman.freebsd.org> <20070514112457.u8e1g9mgkkw8s080@webmail.leidinger.net> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII; format=flowed Cc: Roman Divacky , Perforce Change Reviews Subject: Re: PERFORCE change 119718 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: Mon, 14 May 2007 12:36:04 -0000 On Mon, 14 May 2007, Alexander Leidinger wrote: > Quoting Roman Divacky (from Sat, 12 May 2007 08:49:39 > GMT): > > //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/linux32/linux32_support.s#3 > (text+ko) >> ==== >> >> @@ -1,5 +1,5 @@ >> /*- >> - * Copyright (c) 1993 The Regents of the University of California. >> + * Copyright (c) 2007 The FreeBSD Project >> * All rights reserved. >> * >> * Redistribution and use in source and binary forms, with or without > > Would you please do a forced commit to explain the reason for the license > change? I've also replied to this e-mail privately, but since there seems to be a common confusion regarding this, perhaps a public e-mail is desirable. In recent years, we have expressed a strong preference against using "The FreeBSD Project" as a pseudonym copyright holder for specific code contributions. It does not constitute an assignment, so it doesn't allow the FreeBSD Project (which is also not an incorporated entity) to change the license, and it also masks the identity of the true copyright holder (the author). As we know from the issue of adjusting licenses, which has come up before, being able to easily identify the true copyright holder is very important. If assignment is desired, then copyrights can be assigned to the FreeBSD Foundation, but that requires real-world paperwork and so needs to be coordinated with the Foundation. Finally, copyright law varies by country, and many countries do not actually allow assignment of a copyright, so caution should be applied in even assuming it can be done. Robert N M Watson Computer Laboratory University of Cambridge From owner-p4-projects@FreeBSD.ORG Mon May 14 13:32:38 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AA2D016A412; Mon, 14 May 2007 13:32:38 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3CD6316A40D for ; Mon, 14 May 2007 13:32:38 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 29A2113C459 for ; Mon, 14 May 2007 13:32:38 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4EDWcvO098546 for ; Mon, 14 May 2007 13:32:38 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4EDWbRr098541 for perforce@freebsd.org; Mon, 14 May 2007 13:32:37 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 14 May 2007 13:32:37 GMT Message-Id: <200705141332.l4EDWbRr098541@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Cc: Subject: PERFORCE change 119842 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: Mon, 14 May 2007 13:32:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=119842 Change 119842 by rwatson@rwatson_fledge on 2007/05/14 13:31:54 Remove apple license header tags, since we don't use mechanical license management in OpenBSM. Affected files ... .. //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#10 edit .. //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#8 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#8 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#13 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#26 edit .. //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.h#8 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit.h#22 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#16 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#48 edit .. //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#26 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#10 (text+ko) ==== @@ -1,8 +1,6 @@ .\" Copyright (c) 2004 Apple Computer, Inc. .\" All rights reserved. .\" -.\" @APPLE_BSD_LICENSE_HEADER_START@ -.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: @@ -27,9 +25,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" @APPLE_BSD_LICENSE_HEADER_END@ -.\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#9 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.8#10 $ .\" .Dd October 2, 2006 .Dt AUDIT 8 ==== //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#8 (text+ko) ==== @@ -2,8 +2,6 @@ * Copyright (c) 2005 Apple Computer, Inc. * All rights reserved. * - * @APPLE_BSD_LICENSE_HEADER_START@ - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -28,9 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * @APPLE_BSD_LICENSE_HEADER_END@ - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#7 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/audit/audit.c#8 $ */ /* * Program to trigger the audit daemon with a message that is either: ==== //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#8 (text+ko) ==== @@ -2,8 +2,6 @@ * Copyright (c) 2005 Apple Computer, Inc. * All rights reserved. * - * @APPLE_BSD_LICENSE_HEADER_START@ - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -28,9 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * @APPLE_BSD_LICENSE_HEADER_END@ - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#7 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/audit_warn.c#8 $ */ #include ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#13 (text+ko) ==== @@ -1,8 +1,6 @@ .\" Copyright (c) 2004 Apple Computer, Inc. .\" All rights reserved. .\" -.\" @APPLE_BSD_LICENSE_HEADER_START@ -.\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions .\" are met: @@ -27,9 +25,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.\" @APPLE_BSD_LICENSE_HEADER_END@ -.\" -.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#12 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.8#13 $ .\" .Dd October 2, 2006 .Dt AUDITD 8 ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#26 (text+ko) ==== @@ -2,8 +2,6 @@ * Copyright (c) 2004 Apple Computer, Inc. * All rights reserved. * - * @APPLE_BSD_LICENSE_HEADER_START@ - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -28,9 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * @APPLE_BSD_LICENSE_HEADER_END@ - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#25 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.c#26 $ */ #include ==== //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.h#8 (text+ko) ==== @@ -2,8 +2,6 @@ * Copyright (c) 2005 Apple Computer, Inc. * All rights reserved. * - * @APPLE_BSD_LICENSE_HEADER_START@ - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -28,9 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * @APPLE_BSD_LICENSE_HEADER_END@ - * - * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.h#7 $ + * $P4: //depot/projects/trustedbsd/openbsm/bin/auditd/auditd.h#8 $ */ #ifndef _AUDITD_H_ ==== //depot/projects/trustedbsd/openbsm/bsm/audit.h#22 (text+ko) ==== @@ -2,8 +2,6 @@ * Copyright (c) 2005 Apple Computer, Inc. * All rights reserved. * - * @APPLE_BSD_LICENSE_HEADER_START@ - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -28,9 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * @APPLE_BSD_LICENSE_HEADER_END@ - * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit.h#21 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit.h#22 $ */ #ifndef _BSM_AUDIT_H ==== //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#16 (text+ko) ==== @@ -6,8 +6,6 @@ * This code was developed in part by Robert N. M. Watson, Senior Principal * Scientist, SPARTA, Inc. * - * @APPLE_BSD_LICENSE_HEADER_START@ - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -32,9 +30,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * @APPLE_BSD_LICENSE_HEADER_END@ - * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#15 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_internal.h#16 $ */ #ifndef _AUDIT_INTERNAL_H ==== //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#48 (text+ko) ==== @@ -2,8 +2,6 @@ * Copyright (c) 2005 Apple Computer, Inc. * All rights reserved. * - * @APPLE_BSD_LICENSE_HEADER_START@ - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -28,9 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * @APPLE_BSD_LICENSE_HEADER_END@ - * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#47 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_kevents.h#48 $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ ==== //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#26 (text+ko) ==== @@ -2,8 +2,6 @@ * Copyright (c) 2005 Apple Computer, Inc. * All rights reserved. * - * @APPLE_BSD_LICENSE_HEADER_START@ - * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -28,9 +26,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * @APPLE_BSD_LICENSE_HEADER_END@ - * - * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#25 $ + * $P4: //depot/projects/trustedbsd/openbsm/bsm/audit_record.h#26 $ */ #ifndef _BSM_AUDIT_RECORD_H_ From owner-p4-projects@FreeBSD.ORG Mon May 14 13:32:43 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 534FB16A404; Mon, 14 May 2007 13:32:43 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3040516A400; Mon, 14 May 2007 13:32:43 +0000 (UTC) (envelope-from rdivacky@vlk.vlakno.cz) Received: from vlakno.cz (vlk.vlakno.cz [62.168.28.247]) by mx1.freebsd.org (Postfix) with ESMTP id DE23B13C487; Mon, 14 May 2007 13:32:42 +0000 (UTC) (envelope-from rdivacky@vlk.vlakno.cz) Received: from localhost (localhost [127.0.0.1]) by vlakno.cz (Postfix) with ESMTP id 3FEAF8BD5B6; Mon, 14 May 2007 15:32:41 +0200 (CEST) X-Virus-Scanned: amavisd-new at vlakno.cz Received: from vlakno.cz ([127.0.0.1]) by localhost (vlk.vlakno.cz [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id AhsyI-lSzS3h; Mon, 14 May 2007 15:32:40 +0200 (CEST) Received: from vlk.vlakno.cz (localhost [127.0.0.1]) by vlakno.cz (Postfix) with ESMTP id 504448BD58B; Mon, 14 May 2007 15:32:40 +0200 (CEST) Received: (from rdivacky@localhost) by vlk.vlakno.cz (8.13.8/8.13.8/Submit) id l4EDWeip098036; Mon, 14 May 2007 15:32:40 +0200 (CEST) (envelope-from rdivacky) Date: Mon, 14 May 2007 15:32:39 +0200 From: Roman Divacky To: Robert Watson Message-ID: <20070514133239.GA97987@freebsd.org> References: <200705120849.l4C8ndlC079878@repoman.freebsd.org> <20070514112457.u8e1g9mgkkw8s080@webmail.leidinger.net> <20070514133058.U24765@fledge.watson.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20070514133058.U24765@fledge.watson.org> User-Agent: Mutt/1.4.2.2i Cc: Alexander Leidinger , Perforce Change Reviews Subject: Re: PERFORCE change 119718 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: Mon, 14 May 2007 13:32:43 -0000 On Mon, May 14, 2007 at 01:36:01PM +0100, Robert Watson wrote: > On Mon, 14 May 2007, Alexander Leidinger wrote: > > >Quoting Roman Divacky (from Sat, 12 May 2007 > >08:49:39 GMT): > > > >//depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/linux32/linux32_support.s#3 > >(text+ko) > >>==== > >> > >>@@ -1,5 +1,5 @@ > >>/*- > >>- * Copyright (c) 1993 The Regents of the University of California. > >>+ * Copyright (c) 2007 The FreeBSD Project > >> * All rights reserved. > >> * > >> * Redistribution and use in source and binary forms, with or without > > > >Would you please do a forced commit to explain the reason for the license > >change? > > I've also replied to this e-mail privately, but since there seems to be a > common confusion regarding this, perhaps a public e-mail is desirable. In > recent years, we have expressed a strong preference against using "The > FreeBSD Project" as a pseudonym copyright holder for specific code > contributions. It does not constitute an assignment, so it doesn't allow > the FreeBSD Project (which is also not an incorporated entity) to change > the license, and it also masks the identity of the true copyright holder > (the author). As we know from the issue of adjusting licenses, which has > come up before, being able to easily identify the true copyright holder is > very important. If assignment is desired, then copyrights can be assigned > to the FreeBSD Foundation, but that requires real-world paperwork and so > needs to be coordinated with the Foundation. Finally, copyright law varies > by country, and many countries do not actually allow assignment of a > copyright, so caution should be applied in even assuming it can be done. yeah, yeah.. this is a WIP. I just submitted what I got from kib@, and we already "fixed" that issue. the "WIP" commit was just because I wanted to generate a new diff against -current From owner-p4-projects@FreeBSD.ORG Mon May 14 18:26:15 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B319E16A405; Mon, 14 May 2007 18:26:15 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8603116A40D for ; Mon, 14 May 2007 18:26:15 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 768CB13C4B7 for ; Mon, 14 May 2007 18:26:15 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4EIQF0M049226 for ; Mon, 14 May 2007 18:26:15 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4EIQFcO049210 for perforce@freebsd.org; Mon, 14 May 2007 18:26:15 GMT (envelope-from sam@freebsd.org) Date: Mon, 14 May 2007 18:26:15 GMT Message-Id: <200705141826.l4EIQFcO049210@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Cc: Subject: PERFORCE change 119848 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: Mon, 14 May 2007 18:26:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=119848 Change 119848 by sam@sam_ebb on 2007/05/14 18:25:22 bandaid conflicting use of M_PROTO5; switch M_AMPDU to M_PROTO1 Noticed by: sephe Affected files ... .. //depot/projects/wifi/sys/net80211/ieee80211_freebsd.h#28 edit Differences ... ==== //depot/projects/wifi/sys/net80211/ieee80211_freebsd.h#28 (text+ko) ==== @@ -186,13 +186,14 @@ #define time_before_eq(a,b) time_after_eq(b,a) struct mbuf *ieee80211_getmgtframe(uint8_t **frm, int headroom, int pktlen); +/* tx path usage */ #define M_LINK0 M_PROTO1 /* WEP requested */ #define M_PWR_SAV M_PROTO4 /* bypass PS handling */ #define M_MORE_DATA M_PROTO5 /* more data frames to follow */ #define M_FF 0x20000 /* fast frame */ #define M_TXCB 0x40000 /* do tx complete callback */ /* rx path usage */ -#define M_AMPDU M_PROTO5 /* A-MPDU processing done */ +#define M_AMPDU M_PROTO1 /* A-MPDU processing done */ /* * Encode WME access control bits in the PROTO flags. * This is safe since it's passed directly in to the From owner-p4-projects@FreeBSD.ORG Mon May 14 21:00:27 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9CF7116A408; Mon, 14 May 2007 21:00:27 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4EC5516A406 for ; Mon, 14 May 2007 21:00:27 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 3FB1E13C447 for ; Mon, 14 May 2007 21:00:27 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4EL0Rip073433 for ; Mon, 14 May 2007 21:00:27 GMT (envelope-from ivoras@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4EL0Rg9073423 for perforce@freebsd.org; Mon, 14 May 2007 21:00:27 GMT (envelope-from ivoras@FreeBSD.org) Date: Mon, 14 May 2007 21:00:27 GMT Message-Id: <200705142100.l4EL0Rg9073423@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ivoras@FreeBSD.org using -f From: Ivan Voras To: Perforce Change Reviews Cc: Subject: PERFORCE change 119852 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: Mon, 14 May 2007 21:00:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=119852 Change 119852 by ivoras@ivoras_finstall on 2007/05/14 21:00:09 Misc. submit to sync with laptop client Affected files ... .. //depot/projects/soc2007/ivoras_finstall/installer/finstall.py#4 edit .. //depot/projects/soc2007/ivoras_finstall/installer/glade/mainwin.glade#3 edit .. //depot/projects/soc2007/ivoras_finstall/installer/text/intro.txt#2 edit .. //depot/projects/soc2007/ivoras_finstall/pybackend/conffile.py#2 edit .. //depot/projects/soc2007/ivoras_finstall/pybackend/freebsd.py#2 edit .. //depot/projects/soc2007/ivoras_finstall/pybackend/globals.py#3 edit .. //depot/projects/soc2007/ivoras_finstall/pybackend/systoold.py#3 edit .. //depot/projects/soc2007/ivoras_finstall/pybackend/systoolengine.py#3 edit .. //depot/projects/soc2007/ivoras_finstall/pybackend/xmldict.py#2 edit Differences ... ==== //depot/projects/soc2007/ivoras_finstall/installer/finstall.py#4 (text+ko) ==== ==== //depot/projects/soc2007/ivoras_finstall/installer/glade/mainwin.glade#3 (text+ko) ==== ==== //depot/projects/soc2007/ivoras_finstall/installer/text/intro.txt#2 (text+ko) ==== ==== //depot/projects/soc2007/ivoras_finstall/pybackend/conffile.py#2 (text+ko) ==== ==== //depot/projects/soc2007/ivoras_finstall/pybackend/freebsd.py#2 (text+ko) ==== ==== //depot/projects/soc2007/ivoras_finstall/pybackend/globals.py#3 (text+ko) ==== ==== //depot/projects/soc2007/ivoras_finstall/pybackend/systoold.py#3 (text+ko) ==== ==== //depot/projects/soc2007/ivoras_finstall/pybackend/systoolengine.py#3 (text+ko) ==== ==== //depot/projects/soc2007/ivoras_finstall/pybackend/xmldict.py#2 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Mon May 14 21:31:07 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F9A516A408; Mon, 14 May 2007 21:31:07 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E160116A405 for ; Mon, 14 May 2007 21:31:06 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D251713C458 for ; Mon, 14 May 2007 21:31:06 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4ELV6Tf030077 for ; Mon, 14 May 2007 21:31:06 GMT (envelope-from bms@incunabulum.net) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4ELV6LC030039 for perforce@freebsd.org; Mon, 14 May 2007 21:31:06 GMT (envelope-from bms@incunabulum.net) Date: Mon, 14 May 2007 21:31:06 GMT Message-Id: <200705142131.l4ELV6LC030039@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bms@incunabulum.net using -f From: Bruce M Simpson To: Perforce Change Reviews Cc: Subject: PERFORCE change 119854 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: Mon, 14 May 2007 21:31:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=119854 Change 119854 by bms@bms_anglepoise on 2007/05/14 21:30:28 build ehci and uhci drivers in (to exercise pci attachment). Try byte-swapping endianness of 32 bit reads from PCI configuration space. Affected files ... .. //depot/projects/mips2/src/sys/dev/siba/siba_pcib.c#4 edit .. //depot/projects/mips2/src/sys/mips/conf/SENTRY5#8 edit Differences ... ==== //depot/projects/mips2/src/sys/dev/siba/siba_pcib.c#4 (text+ko) ==== @@ -372,9 +372,7 @@ printf("reading 4 bytes from %08x\n", cfgaddr); val = *(volatile uint32_t *)MIPS_PHYS_TO_KSEG1(cfgaddr); /* XXX MIPS */ - // this is just...odd. it doesn't look right. - - //val = bswap32(val); /* XXX ? */ + val = bswap32(val); /* XXX seems to be needed for now */ /* swizzle and return what was asked for */ val &= 0xffffffff >> ((4 - bytes) * 8); ==== //depot/projects/mips2/src/sys/mips/conf/SENTRY5#8 (text+ko) ==== @@ -1,6 +1,6 @@ # # $FreeBSD$ -# $P4: //depot/projects/mips2/src/sys/mips/conf/SENTRY5#7 $ +# $P4: //depot/projects/mips2/src/sys/mips/conf/SENTRY5#8 $ # # The Broadcom Sentry5 series of processors and boards is very commonly # used in COTS hardware including the Netgear WGT634U. @@ -75,6 +75,18 @@ device bfe # XXX will build both pci and siba device miibus # attachments +# pci devices +# notyet: +#device ath # in pci slot +#device ath_hal # in pci slot + +device usb # USB Bus (required) +device uhci # UHCI PCI->USB interface +device ehci # EHCI PCI->USB interface (USB 2.0) + +# need to teach the code to ignore the bridge.... + + # XXX notyet; need to be auto probed children of siba_cc. #device uart #device uart_ns8250 From owner-p4-projects@FreeBSD.ORG Mon May 14 21:32:08 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B9CA816A405; Mon, 14 May 2007 21:32:08 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 984EB16A402 for ; Mon, 14 May 2007 21:32:08 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 899CE13C455 for ; Mon, 14 May 2007 21:32:08 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4ELW8pr032166 for ; Mon, 14 May 2007 21:32:08 GMT (envelope-from bms@incunabulum.net) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4ELW8sw032157 for perforce@freebsd.org; Mon, 14 May 2007 21:32:08 GMT (envelope-from bms@incunabulum.net) Date: Mon, 14 May 2007 21:32:08 GMT Message-Id: <200705142132.l4ELW8sw032157@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bms@incunabulum.net using -f From: Bruce M Simpson To: Perforce Change Reviews Cc: Subject: PERFORCE change 119855 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: Mon, 14 May 2007 21:32:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=119855 Change 119855 by bms@bms_anglepoise on 2007/05/14 21:31:24 Make siba's notification of unattached devices more like pci's. Affected files ... .. //depot/projects/mips2/src/sys/dev/siba/siba.c#5 edit Differences ... ==== //depot/projects/mips2/src/sys/dev/siba/siba.c#5 (text+ko) ==== @@ -590,7 +590,8 @@ struct siba_devid *sd; sd = siba_dev_match(siba_get_vendor(child), siba_get_device(child), SIBA_REV_ANY); - device_printf(dev, "<0x%04x, 0x%04x \"%s\"> not attached\n", + device_printf(dev, + "<0x%04x, 0x%04x \"%s\"> (driver not attached)\n", siba_get_vendor(child), siba_get_device(child), sd != NULL ? sd->sd_desc : "unknown"); } From owner-p4-projects@FreeBSD.ORG Mon May 14 21:50:32 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DFFFB16A406; Mon, 14 May 2007 21:50:31 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7633116A402 for ; Mon, 14 May 2007 21:50:31 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6620513C489 for ; Mon, 14 May 2007 21:50:31 +0000 (UTC) (envelope-from bms@incunabulum.net) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4ELoVRc066384 for ; Mon, 14 May 2007 21:50:31 GMT (envelope-from bms@incunabulum.net) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4ELoVSR066366 for perforce@freebsd.org; Mon, 14 May 2007 21:50:31 GMT (envelope-from bms@incunabulum.net) Date: Mon, 14 May 2007 21:50:31 GMT Message-Id: <200705142150.l4ELoVSR066366@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bms@incunabulum.net using -f From: Bruce M Simpson To: Perforce Change Reviews Cc: Subject: PERFORCE change 119856 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: Mon, 14 May 2007 21:50:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=119856 Change 119856 by bms@bms_anglepoise on 2007/05/14 21:50:17 Really be more like pci in output. Affected files ... .. //depot/projects/mips2/src/sys/dev/siba/siba.c#6 edit .. //depot/projects/mips2/src/sys/dev/siba/sibavar.h#3 edit Differences ... ==== //depot/projects/mips2/src/sys/dev/siba/siba.c#6 (text+ko) ==== @@ -565,6 +565,9 @@ case SIBA_IVAR_REVID: *result = sdi->sdi_rev; break; + case SIBA_IVAR_CORE_INDEX: + *result = sdi->sdi_idx; + break; default: return (ENOENT); } @@ -588,12 +591,19 @@ */ if (siba_debug) { struct siba_devid *sd; + sd = siba_dev_match(siba_get_vendor(child), siba_get_device(child), SIBA_REV_ANY); - device_printf(dev, - "<0x%04x, 0x%04x \"%s\"> (driver not attached)\n", - siba_get_vendor(child), siba_get_device(child), - sd != NULL ? sd->sd_desc : "unknown"); + if (sd != NULL && sd->sd_desc != NULL) { + device_printf(dev, "<%s> " + "at device %d (no driver attached)\n", + sd->sd_desc, siba_get_core_index(child)); + } else { + device_printf(dev, "<0x%04x, 0x%04x> " + "at device %d (no driver attached)\n", + siba_get_vendor(child), siba_get_device(child), + siba_get_core_index(child)); + } } } ==== //depot/projects/mips2/src/sys/dev/siba/sibavar.h#3 (text+ko) ==== @@ -73,15 +73,17 @@ enum siba_device_ivars { SIBA_IVAR_VENDOR, SIBA_IVAR_DEVICE, - SIBA_IVAR_REVID + SIBA_IVAR_REVID, + SIBA_IVAR_CORE_INDEX }; #define SIBA_ACCESSOR(var, ivar, type) \ __BUS_ACCESSOR(siba, var, SIBA, ivar, type) -SIBA_ACCESSOR(vendor, VENDOR, uint16_t) -SIBA_ACCESSOR(device, DEVICE, uint16_t) -SIBA_ACCESSOR(revid, REVID, uint8_t) +SIBA_ACCESSOR(vendor, VENDOR, uint16_t) +SIBA_ACCESSOR(device, DEVICE, uint16_t) +SIBA_ACCESSOR(revid, REVID, uint8_t) +SIBA_ACCESSOR(core_index, CORE_INDEX, uint8_t) #undef SIBA_ACCESSOR From owner-p4-projects@FreeBSD.ORG Mon May 14 21:51:34 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 66A4D16A468; Mon, 14 May 2007 21:51:34 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 43A0516A403 for ; Mon, 14 May 2007 21:51:34 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2D62313C447 for ; Mon, 14 May 2007 21:51:34 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4ELpY6A068232 for ; Mon, 14 May 2007 21:51:34 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4ELpXvP068210 for perforce@freebsd.org; Mon, 14 May 2007 21:51:33 GMT (envelope-from jhb@freebsd.org) Date: Mon, 14 May 2007 21:51:33 GMT Message-Id: <200705142151.l4ELpXvP068210@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 119857 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: Mon, 14 May 2007 21:51:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=119857 Change 119857 by jhb@jhb_mutex on 2007/05/14 21:51:29 Change handling of resource limits for 32-bit processes on 64-bit kernels so that we just cap the values on read instead of always creating a new limit structure on exec. The problem with the old approach is that the new limits would be inherited by child 64-bit processes, which has proven to be a significant POLA violation. Affected files ... .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#25 edit .. //depot/projects/smpng/sys/compat/ia32/ia32_sysvec.c#16 edit .. //depot/projects/smpng/sys/kern/imgact_elf.c#55 edit .. //depot/projects/smpng/sys/kern/kern_exec.c#104 edit .. //depot/projects/smpng/sys/kern/kern_resource.c#71 edit .. //depot/projects/smpng/sys/sys/sysent.h#26 edit Differences ... ==== //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#25 (text+ko) ==== @@ -119,7 +119,7 @@ static void linux_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask); static void exec_linux_setregs(struct thread *td, u_long entry, u_long stack, u_long ps_strings); -static void linux32_fixlimits(struct proc *p); +static void linux32_fixlimit(struct rlimit *rl, int which); extern LIST_HEAD(futex_list, futex) futex_list; extern struct sx futex_sx; @@ -963,42 +963,36 @@ SYSCTL_ULONG(_compat_linux32, OID_AUTO, maxvmem, CTLFLAG_RW, &linux32_maxvmem, 0, ""); -/* - * XXX copied from ia32_sysvec.c. - */ static void -linux32_fixlimits(struct proc *p) +linux32_fixlimit(struct rlimit *rl, int which) { - struct plimit *oldlim, *newlim; - if (linux32_maxdsiz == 0 && linux32_maxssiz == 0 && - linux32_maxvmem == 0) - return; - newlim = lim_alloc(); - PROC_LOCK(p); - oldlim = p->p_limit; - lim_copy(newlim, oldlim); - if (linux32_maxdsiz != 0) { - if (newlim->pl_rlimit[RLIMIT_DATA].rlim_cur > linux32_maxdsiz) - newlim->pl_rlimit[RLIMIT_DATA].rlim_cur = linux32_maxdsiz; - if (newlim->pl_rlimit[RLIMIT_DATA].rlim_max > linux32_maxdsiz) - newlim->pl_rlimit[RLIMIT_DATA].rlim_max = linux32_maxdsiz; + switch (which) { + case RLIMIT_DATA: + if (linux32_maxdsiz != 0) { + if (rl->rlim_cur > linux32_maxdsiz) + rl->rlim_cur = linux32_maxdsiz; + if (rl->rlim_max > linux32_maxdsiz) + rl->rlim_max = linux32_maxdsiz; + } + break; + case RLIMIT_STACK: + if (linux32_maxssiz != 0) { + if (rl->rlim_cur > linux32_maxssiz) + rl->rlim_cur = linux32_maxssiz; + if (rl->rlim_max > linux32_maxssiz) + rl->rlim_max = linux32_maxssiz; + } + break; + case RLIMIT_VMEM: + if (linux32_maxvmem != 0) { + if (rl->rlim_cur > linux32_maxvmem) + rl->rlim_cur = linux32_maxvmem; + if (rl->rlim_max > linux32_maxvmem) + rl->rlim_max = linux32_maxvmem; + } + break; } - if (linux32_maxssiz != 0) { - if (newlim->pl_rlimit[RLIMIT_STACK].rlim_cur > linux32_maxssiz) - newlim->pl_rlimit[RLIMIT_STACK].rlim_cur = linux32_maxssiz; - if (newlim->pl_rlimit[RLIMIT_STACK].rlim_max > linux32_maxssiz) - newlim->pl_rlimit[RLIMIT_STACK].rlim_max = linux32_maxssiz; - } - if (linux32_maxvmem != 0) { - if (newlim->pl_rlimit[RLIMIT_VMEM].rlim_cur > linux32_maxvmem) - newlim->pl_rlimit[RLIMIT_VMEM].rlim_cur = linux32_maxvmem; - if (newlim->pl_rlimit[RLIMIT_VMEM].rlim_max > linux32_maxvmem) - newlim->pl_rlimit[RLIMIT_VMEM].rlim_max = linux32_maxvmem; - } - p->p_limit = newlim; - PROC_UNLOCK(p); - lim_free(oldlim); } struct sysentvec elf_linux_sysvec = { @@ -1027,7 +1021,7 @@ VM_PROT_ALL, linux_copyout_strings, exec_linux_setregs, - linux32_fixlimits + linux32_fixlimit }; static Elf32_Brandinfo linux_brand = { ==== //depot/projects/smpng/sys/compat/ia32/ia32_sysvec.c#16 (text+ko) ==== @@ -94,7 +94,7 @@ #endif static register_t *ia32_copyout_strings(struct image_params *imgp); -static void ia32_fixlimits(struct proc *p); +static void ia32_fixlimit(struct rlimit *rl, int which); extern struct sysent freebsd32_sysent[]; @@ -126,7 +126,7 @@ VM_PROT_ALL, ia32_copyout_strings, ia32_setregs, - ia32_fixlimits + ia32_fixlimit }; @@ -281,35 +281,33 @@ SYSCTL_ULONG(_compat_ia32, OID_AUTO, maxvmem, CTLFLAG_RW, &ia32_maxvmem, 0, ""); static void -ia32_fixlimits(struct proc *p) +ia32_fixlimit(struct rlimit *rl, int which) { - struct plimit *oldlim, *newlim; - if (ia32_maxdsiz == 0 && ia32_maxssiz == 0 && ia32_maxvmem == 0) - return; - newlim = lim_alloc(); - PROC_LOCK(p); - oldlim = p->p_limit; - lim_copy(newlim, oldlim); - if (ia32_maxdsiz != 0) { - if (newlim->pl_rlimit[RLIMIT_DATA].rlim_cur > ia32_maxdsiz) - newlim->pl_rlimit[RLIMIT_DATA].rlim_cur = ia32_maxdsiz; - if (newlim->pl_rlimit[RLIMIT_DATA].rlim_max > ia32_maxdsiz) - newlim->pl_rlimit[RLIMIT_DATA].rlim_max = ia32_maxdsiz; + switch (which) { + case RLIMIT_DATA: + if (ia32_maxdsiz != 0) { + if (rl->rlim_cur > ia32_maxdsiz) + rl->rlim_cur = ia32_maxdsiz; + if (rl->rlim_max > ia32_maxdsiz) + rl->rlim_max = ia32_maxdsiz; + } + break; + case RLIMIT_STACK: + if (ia32_maxssiz != 0) { + if (rl->rlim_cur > ia32_maxssiz) + rl->rlim_cur = ia32_maxssiz; + if (rl->rlim_max > ia32_maxssiz) + rl->rlim_max = ia32_maxssiz; + } + break; + case RLIMIT_VMEM: + if (ia32_maxvmem != 0) { + if (rl->rlim_cur > ia32_maxvmem) + rl->rlim_cur = ia32_maxvmem; + if (rl->rlim_max > ia32_maxvmem) + rl->rlim_max = ia32_maxvmem; + } + break; } - if (ia32_maxssiz != 0) { - if (newlim->pl_rlimit[RLIMIT_STACK].rlim_cur > ia32_maxssiz) - newlim->pl_rlimit[RLIMIT_STACK].rlim_cur = ia32_maxssiz; - if (newlim->pl_rlimit[RLIMIT_STACK].rlim_max > ia32_maxssiz) - newlim->pl_rlimit[RLIMIT_STACK].rlim_max = ia32_maxssiz; - } - if (ia32_maxvmem != 0) { - if (newlim->pl_rlimit[RLIMIT_VMEM].rlim_cur > ia32_maxvmem) - newlim->pl_rlimit[RLIMIT_VMEM].rlim_cur = ia32_maxvmem; - if (newlim->pl_rlimit[RLIMIT_VMEM].rlim_max > ia32_maxvmem) - newlim->pl_rlimit[RLIMIT_VMEM].rlim_max = ia32_maxvmem; - } - p->p_limit = newlim; - PROC_UNLOCK(p); - lim_free(oldlim); } ==== //depot/projects/smpng/sys/kern/imgact_elf.c#55 (text+ko) ==== @@ -667,6 +667,7 @@ VOP_UNLOCK(imgp->vp, 0, td); exec_new_vmspace(imgp, sv); + imgp->proc->p_sysent = sv; vn_lock(imgp->vp, LK_EXCLUSIVE | LK_RETRY, td); @@ -784,7 +785,6 @@ imgp->entry_addr = entry; - imgp->proc->p_sysent = sv; if (interp != NULL) { VOP_UNLOCK(imgp->vp, 0, td); if (brand_info->emul_path != NULL && ==== //depot/projects/smpng/sys/kern/kern_exec.c#104 (text+ko) ==== @@ -908,15 +908,6 @@ EVENTHANDLER_INVOKE(process_exec, p, imgp); /* - * Here is as good a place as any to do any resource limit cleanups. - * This is needed if a 64 bit binary exec's a 32 bit binary - the - * data size limit may need to be changed to a value that makes - * sense for the 32 bit binary. - */ - if (sv->sv_fixlimits != NULL) - sv->sv_fixlimits(p); - - /* * Blow away entire process VM, if address space not shared, * otherwise, create a new VM space so that other threads are * not disrupted ==== //depot/projects/smpng/sys/kern/kern_resource.c#71 (text+ko) ==== @@ -701,6 +701,8 @@ limp->rlim_max = 1; break; } + if (td->td_proc->p_sysent->sv_fixlimit != NULL) + td->td_proc->p_sysent->sv_fixlimit(limp, which); *alimp = *limp; p->p_limit = newlim; PROC_UNLOCK(p); @@ -734,12 +736,6 @@ } } - /* - * The data size limit may need to be changed to a value - * that makes sense for the 32 bit binary. - */ - if (p->p_sysent->sv_fixlimits != NULL) - p->p_sysent->sv_fixlimits(p); return (0); } @@ -1062,6 +1058,8 @@ KASSERT(which >= 0 && which < RLIM_NLIMITS, ("request for invalid resource limit")); *rlp = p->p_limit->pl_rlimit[which]; + if (p->p_sysent->sv_fixlimit != NULL) + p->p_sysent->sv_fixlimit(rlp, which); } /* ==== //depot/projects/smpng/sys/sys/sysent.h#26 (text+ko) ==== @@ -34,7 +34,7 @@ #include -struct proc; +struct rlimit; struct sysent; struct thread; struct ksiginfo; @@ -98,7 +98,7 @@ int sv_stackprot; /* vm protection for stack */ register_t *(*sv_copyout_strings)(struct image_params *); void (*sv_setregs)(struct thread *, u_long, u_long, u_long); - void (*sv_fixlimits)(struct proc *); + void (*sv_fixlimit)(struct rlimit *, int); }; #ifdef _KERNEL From owner-p4-projects@FreeBSD.ORG Tue May 15 11:33:15 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D6C6816A405; Tue, 15 May 2007 11:33:14 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8CA2316A402 for ; Tue, 15 May 2007 11:33:14 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7CE1B13C4C2 for ; Tue, 15 May 2007 11:33:14 +0000 (UTC) (envelope-from sephe@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4FBXEgH006112 for ; Tue, 15 May 2007 11:33:14 GMT (envelope-from sephe@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4FBXE1F006105 for perforce@freebsd.org; Tue, 15 May 2007 11:33:14 GMT (envelope-from sephe@FreeBSD.org) Date: Tue, 15 May 2007 11:33:14 GMT Message-Id: <200705151133.l4FBXE1F006105@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sephe@FreeBSD.org using -f From: Sepherosa Ziehau To: Perforce Change Reviews Cc: Subject: PERFORCE change 119878 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 May 2007 11:33:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=119878 Change 119878 by sephe@sephe_zealot:sam_wifi on 2007/05/15 11:32:57 - Stop using M_HASFCS in 802.11 drivers. - Stop processing M_HASFCS in 802.11 generic layer. These save us one mbuf flag. Discussed with: sam Approved by: sam Affected files ... .. //depot/projects/wifi/sys/dev/awi/awi.c#16 edit .. //depot/projects/wifi/sys/dev/usb/if_ural.c#25 edit .. //depot/projects/wifi/sys/net80211/ieee80211_input.c#104 edit Differences ... ==== //depot/projects/wifi/sys/dev/awi/awi.c#16 (text+ko) ==== @@ -1341,7 +1341,6 @@ m->m_pkthdr.rcvif = ifp; m->m_pkthdr.len = len; m->m_len = MHLEN; - m->m_flags |= M_HASFCS; } else { MGET(m, M_DONTWAIT, MT_DATA); if (m == NULL) { @@ -1371,6 +1370,10 @@ *mp = m; mp = &m->m_next; } + if (top != NULL) { + /* Strip trailing 802.11 MAC FCS. */ + m_adj(top, -IEEE80211_CRC_LEN); + } return top; } ==== //depot/projects/wifi/sys/dev/usb/if_ural.c#25 (text+ko) ==== @@ -939,7 +939,6 @@ /* finalize mbuf */ m->m_pkthdr.rcvif = ifp; m->m_pkthdr.len = m->m_len = (le32toh(desc->flags) >> 16) & 0xfff; - m->m_flags |= M_HASFCS; /* h/w leaves FCS */ if (bpf_peers_present(sc->sc_drvbpf)) { struct ural_rx_radiotap_header *tap = &sc->sc_rxtap; @@ -954,6 +953,9 @@ bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_rxtap_len, m); } + /* Strip trailing 802.11 MAC FCS. */ + m_adj(m, -IEEE80211_CRC_LEN); + wh = mtod(m, struct ieee80211_frame *); ni = ieee80211_find_rxnode(ic, (struct ieee80211_frame_min *)wh); ==== //depot/projects/wifi/sys/net80211/ieee80211_input.c#104 (text+ko) ==== @@ -133,11 +133,6 @@ KASSERT(ni != NULL, ("null node")); ni->ni_inact = ni->ni_inact_reload; - /* trim CRC here so WEP can find its own CRC at the end of packet. */ - if (m->m_flags & M_HASFCS) { - m_adj(m, -IEEE80211_CRC_LEN); - m->m_flags &= ~M_HASFCS; - } need_tap = 1; /* mbuf need to be tapped. */ type = -1; /* undefined */ /* From owner-p4-projects@FreeBSD.ORG Tue May 15 13:09:18 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C8FBA16A40E; Tue, 15 May 2007 13:09:17 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 71A9616A40A for ; Tue, 15 May 2007 13:09:17 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 403A613C4BD for ; Tue, 15 May 2007 13:09:17 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4FD9H4w057003 for ; Tue, 15 May 2007 13:09:17 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4FD9HQ0056970 for perforce@freebsd.org; Tue, 15 May 2007 13:09:17 GMT (envelope-from rpaulo@FreeBSD.org) Date: Tue, 15 May 2007 13:09:17 GMT Message-Id: <200705151309.l4FD9HQ0056970@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 119881 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 May 2007 13:09:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=119881 Change 119881 by rpaulo@rpaulo_epsilon on 2007/05/15 13:08:42 Driver for Apple System Management Console. Tested on a MacBook by me. Tested on a MacBook Pro by Florian C. Smeets. TODO: figure out correct names for the temperatures. add support for keyboard backlight. Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmc.c#1 add .. //depot/projects/soc2007/rpaulo-macbook/dev/asmc/asmcvar.h#1 add .. //depot/projects/soc2007/rpaulo-macbook/modules/asmc/Makefile#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Tue May 15 13:14:25 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 143CB16A406; Tue, 15 May 2007 13:14:25 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D3D6B16A403 for ; Tue, 15 May 2007 13:14:24 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C37D013C458 for ; Tue, 15 May 2007 13:14:24 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4FDEO7M064586 for ; Tue, 15 May 2007 13:14:24 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4FDEO5V064557 for perforce@freebsd.org; Tue, 15 May 2007 13:14:24 GMT (envelope-from rpaulo@FreeBSD.org) Date: Tue, 15 May 2007 13:14:24 GMT Message-Id: <200705151314.l4FDEO5V064557@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 119882 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 May 2007 13:14:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=119882 Change 119882 by rpaulo@rpaulo_epsilon on 2007/05/15 13:14:01 Hook asmc(4) to the build. Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/conf/files.amd64#3 edit .. //depot/projects/soc2007/rpaulo-macbook/conf/files.i386#3 edit .. //depot/projects/soc2007/rpaulo-macbook/modules/Makefile#6 edit Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/conf/files.amd64#3 (text+ko) ==== @@ -140,6 +140,7 @@ netsmb dev/acpica/acpi_if.m standard dev/arcmsr/arcmsr.c optional arcmsr pci +dev/asmc/asmc.c optional asmc isa dev/atkbdc/atkbd.c optional atkbd atkbdc dev/atkbdc/atkbd_atkbdc.c optional atkbd atkbdc dev/atkbdc/atkbdc.c optional atkbdc ==== //depot/projects/soc2007/rpaulo-macbook/conf/files.i386#3 (text+ko) ==== @@ -148,6 +148,7 @@ dev/ar/if_ar_pci.c optional ar pci dev/arl/if_arl.c optional arl dev/arl/if_arl_isa.c optional arl isa +dev/asmc/asmc.c optional asmc isa dev/atkbdc/atkbd.c optional atkbd atkbdc dev/atkbdc/atkbd_atkbdc.c optional atkbd atkbdc dev/atkbdc/atkbdc.c optional atkbdc ==== //depot/projects/soc2007/rpaulo-macbook/modules/Makefile#6 (text+ko) ==== @@ -23,6 +23,7 @@ ${_arcmsr} \ ${_arcnet} \ ${_arl} \ + ${_asmc} \ ${_asr} \ ata \ ${_ath} \ @@ -422,6 +423,7 @@ _ahb= ahb _arcmsr= arcmsr _arl= arl +_asmc= asmc _asr= asr _bios= bios _ciss= ciss @@ -470,6 +472,7 @@ _agp= agp _an= an _arcmsr= arcmsr +_asmc= asmc _ath= ath _ath_hal= ath_hal _ath_rate_sample=ath_rate_sample From owner-p4-projects@FreeBSD.ORG Tue May 15 22:09:17 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7CBB816A403; Tue, 15 May 2007 22:09:17 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3770916A402 for ; Tue, 15 May 2007 22:09:17 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 2762713C448 for ; Tue, 15 May 2007 22:09:17 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4FM9HCO011169 for ; Tue, 15 May 2007 22:09:17 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4FM9DeP011063 for perforce@freebsd.org; Tue, 15 May 2007 22:09:13 GMT (envelope-from jhb@freebsd.org) Date: Tue, 15 May 2007 22:09:13 GMT Message-Id: <200705152209.l4FM9DeP011063@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 119896 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 May 2007 22:09:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=119896 Change 119896 by jhb@jhb_mutex on 2007/05/15 22:08:42 IFC @119893 Affected files ... .. //depot/projects/smpng/sys/amd64/conf/GENERIC#58 integrate .. //depot/projects/smpng/sys/amd64/conf/NOTES#38 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_machdep.c#24 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#26 integrate .. //depot/projects/smpng/sys/boot/common/loader.8#45 integrate .. //depot/projects/smpng/sys/cam/cam_periph.c#25 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#45 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_cd.c#32 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ch.c#16 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#76 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#28 integrate .. //depot/projects/smpng/sys/compat/ia32/ia32_sysvec.c#17 integrate .. //depot/projects/smpng/sys/conf/Makefile.amd64#15 integrate .. //depot/projects/smpng/sys/conf/Makefile.arm#25 integrate .. //depot/projects/smpng/sys/conf/Makefile.i386#27 integrate .. //depot/projects/smpng/sys/conf/Makefile.ia64#33 integrate .. //depot/projects/smpng/sys/conf/Makefile.pc98#26 integrate .. //depot/projects/smpng/sys/conf/Makefile.powerpc#34 integrate .. //depot/projects/smpng/sys/conf/Makefile.sparc64#29 integrate .. //depot/projects/smpng/sys/conf/Makefile.sun4v#2 integrate .. //depot/projects/smpng/sys/conf/NOTES#143 integrate .. //depot/projects/smpng/sys/conf/files#207 integrate .. //depot/projects/smpng/sys/conf/options#143 integrate .. //depot/projects/smpng/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#4 integrate .. //depot/projects/smpng/sys/crypto/camellia/camellia-api.c#1 branch .. //depot/projects/smpng/sys/crypto/camellia/camellia.c#1 branch .. //depot/projects/smpng/sys/crypto/camellia/camellia.h#1 branch .. //depot/projects/smpng/sys/dev/acpica/acpi.c#102 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_hpet.c#6 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#66 integrate .. //depot/projects/smpng/sys/dev/ciss/ciss.c#53 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#82 integrate .. //depot/projects/smpng/sys/dev/firewire/sbp_targ.c#11 integrate .. //depot/projects/smpng/sys/dev/hptiop/hptiop.c#1 branch .. //depot/projects/smpng/sys/dev/hptiop/hptiop.h#1 branch .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#57 integrate .. //depot/projects/smpng/sys/dev/isp/isp_pci.c#56 integrate .. //depot/projects/smpng/sys/dev/isp/isp_sbus.c#27 integrate .. //depot/projects/smpng/sys/dev/mfi/mfi.c#17 integrate .. //depot/projects/smpng/sys/dev/mfi/mfi_disk.c#6 integrate .. //depot/projects/smpng/sys/dev/mfi/mfi_ioctl.h#5 integrate .. //depot/projects/smpng/sys/dev/mfi/mfi_pci.c#6 integrate .. //depot/projects/smpng/sys/dev/mfi/mfivar.h#6 integrate .. //depot/projects/smpng/sys/dev/mmc/mmc.c#2 integrate .. //depot/projects/smpng/sys/dev/mmc/mmcsd.c#2 integrate .. //depot/projects/smpng/sys/dev/mmc/mmcvar.h#2 integrate .. //depot/projects/smpng/sys/dev/sk/if_sk.c#13 integrate .. //depot/projects/smpng/sys/dev/sound/pci/hda/hdac.c#14 integrate .. //depot/projects/smpng/sys/dev/twa/tw_cl.h#3 integrate .. //depot/projects/smpng/sys/dev/twa/tw_cl_externs.h#3 integrate .. //depot/projects/smpng/sys/dev/twa/tw_cl_fwif.h#3 integrate .. //depot/projects/smpng/sys/dev/twa/tw_cl_fwimg.c#3 delete .. //depot/projects/smpng/sys/dev/twa/tw_cl_init.c#3 integrate .. //depot/projects/smpng/sys/dev/twa/tw_cl_intr.c#3 integrate .. //depot/projects/smpng/sys/dev/twa/tw_cl_io.c#3 integrate .. //depot/projects/smpng/sys/dev/twa/tw_cl_ioctl.h#3 integrate .. //depot/projects/smpng/sys/dev/twa/tw_cl_misc.c#3 integrate .. //depot/projects/smpng/sys/dev/twa/tw_cl_share.h#3 integrate .. //depot/projects/smpng/sys/dev/twa/tw_osl.h#3 integrate .. //depot/projects/smpng/sys/dev/twa/tw_osl_cam.c#10 integrate .. //depot/projects/smpng/sys/dev/twa/tw_osl_externs.h#2 integrate .. //depot/projects/smpng/sys/dev/twa/tw_osl_freebsd.c#7 integrate .. //depot/projects/smpng/sys/dev/twa/tw_osl_includes.h#5 integrate .. //depot/projects/smpng/sys/dev/twa/tw_osl_inline.h#3 integrate .. //depot/projects/smpng/sys/dev/twa/tw_osl_ioctl.h#3 integrate .. //depot/projects/smpng/sys/dev/twa/tw_osl_share.h#6 integrate .. //depot/projects/smpng/sys/dev/twa/tw_osl_types.h#2 integrate .. //depot/projects/smpng/sys/dev/usb/if_axe.c#31 integrate .. //depot/projects/smpng/sys/dev/usb/if_cue.c#33 integrate .. //depot/projects/smpng/sys/dev/usb/if_cuereg.h#9 integrate .. //depot/projects/smpng/sys/dev/usb/if_kue.c#30 integrate .. //depot/projects/smpng/sys/dev/usb/if_kuereg.h#10 integrate .. //depot/projects/smpng/sys/dev/usb/if_rue.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/if_ruereg.h#6 integrate .. //depot/projects/smpng/sys/dev/usb/if_udav.c#17 integrate .. //depot/projects/smpng/sys/dev/usb/if_ural.c#25 integrate .. //depot/projects/smpng/sys/dev/usb/if_uralvar.h#7 integrate .. //depot/projects/smpng/sys/dev/usb/uhid.c#30 integrate .. //depot/projects/smpng/sys/dev/usb/ukbd.c#24 integrate .. //depot/projects/smpng/sys/dev/usb/ums.c#26 integrate .. //depot/projects/smpng/sys/dev/usb/usb.c#36 integrate .. //depot/projects/smpng/sys/dev/usb/usb_mem.c#9 integrate .. //depot/projects/smpng/sys/geom/part/g_part.c#4 integrate .. //depot/projects/smpng/sys/i386/Makefile#4 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#89 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#127 integrate .. //depot/projects/smpng/sys/i386/linux/linux_machdep.c#46 integrate .. //depot/projects/smpng/sys/kern/Make.tags.inc#7 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#56 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#105 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#123 integrate .. //depot/projects/smpng/sys/kern/kern_mib.c#30 integrate .. //depot/projects/smpng/sys/kern/kern_resource.c#72 integrate .. //depot/projects/smpng/sys/kern/kern_timeout.c#32 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#78 integrate .. //depot/projects/smpng/sys/modules/Makefile#141 integrate .. //depot/projects/smpng/sys/modules/crypto/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/hptiop/Makefile#1 branch .. //depot/projects/smpng/sys/modules/netgraph/Makefile#26 integrate .. //depot/projects/smpng/sys/modules/netgraph/car/Makefile#1 branch .. //depot/projects/smpng/sys/modules/twa/Makefile#6 integrate .. //depot/projects/smpng/sys/net/ethernet.h#13 integrate .. //depot/projects/smpng/sys/net/ieee8023ad_lacp.c#6 integrate .. //depot/projects/smpng/sys/net/ieee8023ad_lacp.h#4 integrate .. //depot/projects/smpng/sys/net/if_lagg.c#5 integrate .. //depot/projects/smpng/sys/net/if_lagg.h#4 integrate .. //depot/projects/smpng/sys/net/pfkeyv2.h#8 integrate .. //depot/projects/smpng/sys/netatalk/ddp_usrreq.c#30 integrate .. //depot/projects/smpng/sys/netgraph/ng_car.c#1 branch .. //depot/projects/smpng/sys/netgraph/ng_car.h#1 branch .. //depot/projects/smpng/sys/netgraph/ng_mppc.c#14 integrate .. //depot/projects/smpng/sys/netgraph/ng_socket.c#43 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#55 integrate .. //depot/projects/smpng/sys/netinet/in.c#38 integrate .. //depot/projects/smpng/sys/netinet/in_cksum.c#4 integrate .. //depot/projects/smpng/sys/netinet/in_gif.c#20 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#75 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#47 integrate .. //depot/projects/smpng/sys/netinet/in_rmx.c#14 integrate .. //depot/projects/smpng/sys/netinet/ip.h#13 integrate .. //depot/projects/smpng/sys/netinet/ip_divert.c#54 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.c#46 integrate .. //depot/projects/smpng/sys/netinet/ip_ecn.c#5 integrate .. //depot/projects/smpng/sys/netinet/ip_encap.c#16 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#87 integrate .. //depot/projects/smpng/sys/netinet/ip_icmp.c#41 integrate .. //depot/projects/smpng/sys/netinet/ip_id.c#7 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#84 integrate .. //depot/projects/smpng/sys/netinet/ip_ipsec.c#4 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.c#57 integrate .. //depot/projects/smpng/sys/netinet/ip_options.c#3 integrate .. //depot/projects/smpng/sys/netinet/ip_options.h#2 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#92 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#66 integrate .. //depot/projects/smpng/sys/netinet/sctp_asconf.c#9 integrate .. //depot/projects/smpng/sys/netinet/sctp_auth.c#9 integrate .. //depot/projects/smpng/sys/netinet/sctp_indata.c#13 integrate .. //depot/projects/smpng/sys/netinet/sctp_input.c#13 integrate .. //depot/projects/smpng/sys/netinet/sctp_os_bsd.h#11 integrate .. //depot/projects/smpng/sys/netinet/sctp_output.c#13 integrate .. //depot/projects/smpng/sys/netinet/sctp_pcb.c#13 integrate .. //depot/projects/smpng/sys/netinet/sctp_pcb.h#11 integrate .. //depot/projects/smpng/sys/netinet/sctp_peeloff.c#9 integrate .. //depot/projects/smpng/sys/netinet/sctp_timer.c#10 integrate .. //depot/projects/smpng/sys/netinet/sctp_usrreq.c#14 integrate .. //depot/projects/smpng/sys/netinet/sctputil.c#15 integrate .. //depot/projects/smpng/sys/netinet/sctputil.h#10 integrate .. //depot/projects/smpng/sys/netinet/tcp_fsm.h#6 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#106 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#50 integrate .. //depot/projects/smpng/sys/netinet/tcp_reass.c#1 branch .. //depot/projects/smpng/sys/netinet/tcp_sack.c#22 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#94 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.c#37 integrate .. //depot/projects/smpng/sys/netinet/tcp_timewait.c#1 branch .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#63 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#52 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#78 integrate .. //depot/projects/smpng/sys/netinet6/esp_camellia.c#1 branch .. //depot/projects/smpng/sys/netinet6/esp_camellia.h#1 branch .. //depot/projects/smpng/sys/netinet6/esp_core.c#13 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.c#49 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.h#14 integrate .. //depot/projects/smpng/sys/netinet6/ip6_input.c#48 integrate .. //depot/projects/smpng/sys/netinet6/raw_ip6.c#44 integrate .. //depot/projects/smpng/sys/netinet6/sctp6_usrreq.c#12 integrate .. //depot/projects/smpng/sys/netipsec/xform_esp.c#11 integrate .. //depot/projects/smpng/sys/netipx/ipx.c#13 integrate .. //depot/projects/smpng/sys/netipx/ipx.h#9 integrate .. //depot/projects/smpng/sys/netipx/ipx_cksum.c#7 integrate .. //depot/projects/smpng/sys/netipx/ipx_if.h#7 integrate .. //depot/projects/smpng/sys/netipx/ipx_input.c#19 integrate .. //depot/projects/smpng/sys/netipx/ipx_outputfl.c#8 integrate .. //depot/projects/smpng/sys/netipx/ipx_pcb.c#21 integrate .. //depot/projects/smpng/sys/netipx/ipx_pcb.h#11 integrate .. //depot/projects/smpng/sys/netipx/ipx_usrreq.c#27 integrate .. //depot/projects/smpng/sys/netipx/ipx_var.h#10 integrate .. //depot/projects/smpng/sys/netipx/spx_debug.c#5 integrate .. //depot/projects/smpng/sys/netipx/spx_debug.h#6 integrate .. //depot/projects/smpng/sys/opencrypto/cryptodev.c#23 integrate .. //depot/projects/smpng/sys/opencrypto/cryptodev.h#11 integrate .. //depot/projects/smpng/sys/opencrypto/cryptosoft.c#13 integrate .. //depot/projects/smpng/sys/opencrypto/xform.c#7 integrate .. //depot/projects/smpng/sys/opencrypto/xform.h#4 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#70 integrate .. //depot/projects/smpng/sys/pci/if_tl.c#36 integrate .. //depot/projects/smpng/sys/sparc64/include/profile.h#7 integrate .. //depot/projects/smpng/sys/sun4v/include/profile.h#2 integrate .. //depot/projects/smpng/sys/sys/callout.h#11 integrate .. //depot/projects/smpng/sys/sys/param.h#117 integrate .. //depot/projects/smpng/sys/sys/sysent.h#27 integrate .. //depot/projects/smpng/sys/vm/uma_int.h#30 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/conf/GENERIC#58 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.475 2007/04/10 21:40:12 pjd Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.477 2007/05/10 01:39:50 kevlo Exp $ cpu HAMMER ident GENERIC @@ -97,6 +97,7 @@ options AHD_REG_PRETTY_PRINT # Print register bitfields in debug # output. Adds ~215k to driver. device amd # AMD 53C974 (Tekram DC-390(T)) +device hptiop # Highpoint RocketRaid 3xxx series device isp # Qlogic family #device ispfw # Firmware for QLogic HBAs- normally a module device mpt # LSI-Logic MPT-Fusion @@ -230,6 +231,7 @@ device wlan_wep # 802.11 WEP support device wlan_ccmp # 802.11 CCMP support device wlan_tkip # 802.11 TKIP support +device wlan_amrr # AMRR transmit rate control algorithm device an # Aironet 4500/4800 802.11 wireless NICs. device ath # Atheros pci/cardbus NIC's device ath_hal # Atheros HAL (Hardware Access Layer) ==== //depot/projects/smpng/sys/amd64/conf/NOTES#38 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.64 2007/03/22 18:16:38 jkim Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.65 2007/05/09 15:55:45 scottl Exp $ # # @@ -377,6 +377,10 @@ device rr232x # +# Highpoint RocketRaid 3xxx series SATA RAID +device hptiop + +# # IBM (now Adaptec) ServeRAID controllers device ips ==== //depot/projects/smpng/sys/amd64/linux32/linux32_machdep.c#24 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.42 2007/04/18 20:12:05 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.43 2007/05/11 01:25:50 kan Exp $"); #include #include @@ -561,12 +561,13 @@ #endif exit_signal = args->flags & 0x000000ff; - if (!LINUX_SIG_VALID(exit_signal) && exit_signal != 0) + if (LINUX_SIG_VALID(exit_signal)) { + if (exit_signal <= LINUX_SIGTBLSZ) + exit_signal = + linux_to_bsd_signal[_SIG_IDX(exit_signal)]; + } else if (exit_signal != 0) return (EINVAL); - if (exit_signal <= LINUX_SIGTBLSZ) - exit_signal = linux_to_bsd_signal[_SIG_IDX(exit_signal)]; - if (args->flags & LINUX_CLONE_VM) ff |= RFMEM; if (args->flags & LINUX_CLONE_SIGHAND) ==== //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#26 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.28 2007/04/02 18:38:12 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.29 2007/05/14 22:40:04 jhb Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 ==== //depot/projects/smpng/sys/boot/common/loader.8#45 (text+ko) ==== @@ -22,9 +22,9 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.92 2007/05/05 17:36:42 jmg Exp $ +.\" $FreeBSD: src/sys/boot/common/loader.8,v 1.93 2007/05/09 02:37:58 sepotvin Exp $ .\" -.Dd May 5, 2007 +.Dd May 8, 2007 .Dt LOADER 8 .Os .Sh NAME @@ -615,6 +615,15 @@ This overrides the value determined when the kernel was compiled. Modifies .Dv VM_KMEM_SIZE . +.It Va vm.kmem_size_min +.It Va vm.kmem_size_max +Sets the minimum and maximum (respectively) amount of kernel memory +that will be automatically allocated by the kernel. +These override the values determined when the kernel was compiled. +Modifies +.Dv VM_KMEM_SIZE_MIN +and +.Dv VM_KMEM_SIZE_MAX . .El .Ss BUILTIN PARSER When a builtin command is executed, the rest of the line is taken ==== //depot/projects/smpng/sys/cam/cam_periph.c#25 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.68 2007/04/19 23:34:51 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.69 2007/05/14 21:48:52 scottl Exp $"); #include #include @@ -102,7 +102,8 @@ int ndrivers; ndrivers = nperiph_drivers + 2; - newdrivers = malloc(sizeof(*newdrivers) * ndrivers, M_TEMP, M_WAITOK); + newdrivers = malloc(sizeof(*newdrivers) * ndrivers, M_CAMPERIPH, + M_WAITOK); if (periph_drivers) bcopy(periph_drivers, newdrivers, sizeof(*newdrivers) * nperiph_drivers); @@ -111,7 +112,7 @@ old = periph_drivers; periph_drivers = newdrivers; if (old) - free(old, M_TEMP); + free(old, M_CAMPERIPH); nperiph_drivers++; } ==== //depot/projects/smpng/sys/cam/cam_xpt.c#45 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.183 2007/04/27 14:23:05 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.184 2007/05/14 21:48:52 scottl Exp $"); #include #include @@ -1533,7 +1533,7 @@ */ xsoftc.xpt_config_hook = (struct intr_config_hook *)malloc(sizeof(struct intr_config_hook), - M_TEMP, M_NOWAIT | M_ZERO); + M_CAMXPT, M_NOWAIT | M_ZERO); if (xsoftc.xpt_config_hook == NULL) { printf("xpt_init: Cannot malloc config hook " "- failing attach\n"); @@ -1542,7 +1542,7 @@ xsoftc.xpt_config_hook->ich_func = xpt_config; if (config_intrhook_establish(xsoftc.xpt_config_hook) != 0) { - free (xsoftc.xpt_config_hook, M_TEMP); + free (xsoftc.xpt_config_hook, M_CAMXPT); printf("xpt_init: config_intrhook_establish failed " "- failing attach\n"); } @@ -5243,7 +5243,7 @@ /* Save some state for use while we probe for devices */ scan_info = (xpt_scan_bus_info *) - malloc(sizeof(xpt_scan_bus_info), M_TEMP, M_NOWAIT); + malloc(sizeof(xpt_scan_bus_info), M_CAMXPT, M_NOWAIT); scan_info->request_ccb = request_ccb; scan_info->cpi = &work_ccb->cpi; @@ -5277,7 +5277,7 @@ printf("xpt_scan_bus: xpt_create_path failed" " with status %#x, bus scan halted\n", status); - free(scan_info, M_TEMP); + free(scan_info, M_CAMXPT); request_ccb->ccb_h.status = status; xpt_free_ccb(work_ccb); xpt_done(request_ccb); @@ -5285,7 +5285,7 @@ } work_ccb = xpt_alloc_ccb_nowait(); if (work_ccb == NULL) { - free(scan_info, M_TEMP); + free(scan_info, M_CAMXPT); xpt_free_path(path); request_ccb->ccb_h.status = CAM_RESRC_UNAVAIL; xpt_done(request_ccb); @@ -5398,7 +5398,7 @@ xpt_free_ccb(request_ccb); xpt_free_ccb((union ccb *)scan_info->cpi); request_ccb = scan_info->request_ccb; - free(scan_info, M_TEMP); + free(scan_info, M_CAMXPT); request_ccb->ccb_h.status = CAM_REQ_CMP; xpt_done(request_ccb); break; @@ -5417,7 +5417,7 @@ xpt_free_ccb(request_ccb); xpt_free_ccb((union ccb *)scan_info->cpi); request_ccb = scan_info->request_ccb; - free(scan_info, M_TEMP); + free(scan_info, M_CAMXPT); request_ccb->ccb_h.status = status; xpt_done(request_ccb); break; @@ -5518,17 +5518,17 @@ } if (request_ccb == NULL) { - request_ccb = malloc(sizeof(union ccb), M_TEMP, M_NOWAIT); + request_ccb = malloc(sizeof(union ccb), M_CAMXPT, M_NOWAIT); if (request_ccb == NULL) { xpt_print(path, "xpt_scan_lun: can't allocate CCB, " "can't continue\n"); return; } - new_path = malloc(sizeof(*new_path), M_TEMP, M_NOWAIT); + new_path = malloc(sizeof(*new_path), M_CAMXPT, M_NOWAIT); if (new_path == NULL) { xpt_print(path, "xpt_scan_lun: can't allocate path, " "can't continue\n"); - free(request_ccb, M_TEMP); + free(request_ccb, M_CAMXPT); return; } status = xpt_compile_path(new_path, xpt_periph, @@ -5539,8 +5539,8 @@ if (status != CAM_REQ_CMP) { xpt_print(path, "xpt_scan_lun: can't compile path, " "can't continue\n"); - free(request_ccb, M_TEMP); - free(new_path, M_TEMP); + free(request_ccb, M_CAMXPT); + free(new_path, M_CAMXPT); return; } xpt_setup_ccb(&request_ccb->ccb_h, new_path, /*priority*/ 1); @@ -5575,8 +5575,8 @@ xptscandone(struct cam_periph *periph, union ccb *done_ccb) { xpt_release_path(done_ccb->ccb_h.path); - free(done_ccb->ccb_h.path, M_TEMP); - free(done_ccb, M_TEMP); + free(done_ccb->ccb_h.path, M_CAMXPT); + free(done_ccb, M_CAMXPT); } static cam_status @@ -5598,7 +5598,7 @@ return(CAM_REQ_CMP_ERR); } - softc = (probe_softc *)malloc(sizeof(*softc), M_TEMP, M_NOWAIT); + softc = (probe_softc *)malloc(sizeof(*softc), M_CAMXPT, M_NOWAIT); if (softc == NULL) { printf("proberegister: Unable to probe new device. " @@ -5751,7 +5751,7 @@ if (softc->action == PROBE_INQUIRY_BASIC_DV1 || softc->action == PROBE_INQUIRY_BASIC_DV2) { - inq_buf = malloc(inquiry_len, M_TEMP, M_NOWAIT); + inq_buf = malloc(inquiry_len, M_CAMXPT, M_NOWAIT); } if (inq_buf == NULL) { xpt_print(periph->path, "malloc failure- skipping Basic" @@ -5785,7 +5785,7 @@ mode_buf_len = sizeof(struct scsi_mode_header_6) + sizeof(struct scsi_mode_blk_desc) + sizeof(struct scsi_control_page); - mode_buf = malloc(mode_buf_len, M_TEMP, M_NOWAIT); + mode_buf = malloc(mode_buf_len, M_CAMXPT, M_NOWAIT); if (mode_buf != NULL) { scsi_mode_sense(csio, /*retries*/4, @@ -5817,7 +5817,7 @@ if ((device->quirk->quirks & CAM_QUIRK_NOSERIAL) == 0) serial_buf = (struct scsi_vpd_unit_serial_number *) - malloc(sizeof(*serial_buf), M_TEMP, + malloc(sizeof(*serial_buf), M_CAMXPT, M_NOWAIT | M_ZERO); if (serial_buf != NULL) { @@ -6107,7 +6107,7 @@ /*count*/1, /*run_queue*/TRUE); } xpt_release_ccb(done_ccb); - free(mode_hdr, M_TEMP); + free(mode_hdr, M_CAMXPT); softc->action = PROBE_SERIAL_NUM; xpt_schedule(periph, priority); return; @@ -6194,7 +6194,7 @@ xpt_async(AC_LOST_DEVICE, path, NULL); } if (serial_buf != NULL) - free(serial_buf, M_TEMP); + free(serial_buf, M_CAMXPT); if (changed != 0) { /* @@ -6283,12 +6283,12 @@ /* give up */ softc->action = PROBE_DV_EXIT; } - free(nbuf, M_TEMP); + free(nbuf, M_CAMXPT); xpt_release_ccb(done_ccb); xpt_schedule(periph, priority); return; } - free(nbuf, M_TEMP); + free(nbuf, M_CAMXPT); if (softc->action == PROBE_INQUIRY_BASIC_DV1) { softc->action = PROBE_INQUIRY_BASIC_DV2; xpt_release_ccb(done_ccb); @@ -6327,7 +6327,7 @@ static void probecleanup(struct cam_periph *periph) { - free(periph->softc, M_TEMP); + free(periph->softc, M_CAMXPT); } static void @@ -6984,7 +6984,7 @@ /* Release our hook so that the boot can continue. */ config_intrhook_disestablish(xsoftc.xpt_config_hook); - free(xsoftc.xpt_config_hook, M_TEMP); + free(xsoftc.xpt_config_hook, M_CAMXPT); xsoftc.xpt_config_hook = NULL; } ==== //depot/projects/smpng/sys/cam/scsi/scsi_cd.c#32 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.99 2007/04/16 19:41:14 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.100 2007/05/14 21:48:53 scottl Exp $"); #include "opt_cd.h" @@ -329,6 +329,8 @@ static STAILQ_HEAD(changerlist, cdchanger) changerq; static int num_changers; +MALLOC_DEFINE(M_SCSICD, "scsi_cd", "scsi_cd buffers"); + static void cdinit(void) { @@ -1519,7 +1521,7 @@ { rcap = (struct scsi_read_capacity_data *)malloc(sizeof(*rcap), - M_TEMP, + M_SCSICD, M_NOWAIT); if (rcap == NULL) { xpt_print(periph->path, @@ -1778,7 +1780,7 @@ } } } - free(rdcap, M_TEMP); + free(rdcap, M_SCSICD); if (announce_buf[0] != '\0') { xpt_announce_periph(periph, announce_buf); if (softc->flags & CD_FLAG_CHANGER) @@ -1906,7 +1908,7 @@ union cd_pages *page; params.alloc_len = sizeof(union cd_mode_data_6_10); - params.mode_buf = malloc(params.alloc_len, M_TEMP, + params.mode_buf = malloc(params.alloc_len, M_SCSICD, M_WAITOK | M_ZERO); cam_periph_lock(periph); @@ -1915,7 +1917,7 @@ error = cdgetmode(periph, ¶ms, AUDIO_PAGE); if (error) { - free(params.mode_buf, M_TEMP); + free(params.mode_buf, M_SCSICD); cam_periph_unlock(periph); break; } @@ -1924,7 +1926,7 @@ page->audio.flags &= ~CD_PA_SOTC; page->audio.flags |= CD_PA_IMMED; error = cdsetmode(periph, ¶ms); - free(params.mode_buf, M_TEMP); + free(params.mode_buf, M_SCSICD); if (error) { cam_periph_unlock(periph); break; @@ -2001,7 +2003,7 @@ union cd_pages *page; params.alloc_len = sizeof(union cd_mode_data_6_10); - params.mode_buf = malloc(params.alloc_len, M_TEMP, + params.mode_buf = malloc(params.alloc_len, M_SCSICD, M_WAITOK | M_ZERO); cam_periph_lock(periph); @@ -2010,7 +2012,7 @@ error = cdgetmode(periph, ¶ms, AUDIO_PAGE); if (error) { - free(params.mode_buf, M_TEMP); + free(params.mode_buf, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2019,7 +2021,7 @@ page->audio.flags &= ~CD_PA_SOTC; page->audio.flags |= CD_PA_IMMED; error = cdsetmode(periph, ¶ms); - free(params.mode_buf, M_TEMP); + free(params.mode_buf, M_SCSICD); if (error) { cam_periph_unlock(periph); break; @@ -2042,7 +2044,7 @@ union cd_pages *page; params.alloc_len = sizeof(union cd_mode_data_6_10); - params.mode_buf = malloc(params.alloc_len, M_TEMP, + params.mode_buf = malloc(params.alloc_len, M_SCSICD, M_WAITOK | M_ZERO); cam_periph_lock(periph); @@ -2052,7 +2054,7 @@ error = cdgetmode(periph, ¶ms, AUDIO_PAGE); if (error) { - free(params.mode_buf, M_TEMP); + free(params.mode_buf, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2061,7 +2063,7 @@ page->audio.flags &= ~CD_PA_SOTC; page->audio.flags |= CD_PA_IMMED; error = cdsetmode(periph, ¶ms); - free(params.mode_buf, M_TEMP); + free(params.mode_buf, M_SCSICD); if (error) { cam_periph_unlock(periph); break; @@ -2081,7 +2083,7 @@ u_int32_t len = args->data_len; data = malloc(sizeof(struct cd_sub_channel_info), - M_TEMP, M_WAITOK); + M_SCSICD, M_WAITOK); cam_periph_lock(periph); CAM_DEBUG(periph->path, CAM_DEBUG_SUBTRACE, @@ -2094,7 +2096,7 @@ "cdioreadsubchannel: error, len=%d\n", len); error = EINVAL; - free(data, M_TEMP); + free(data, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2106,7 +2108,7 @@ args->data_format, args->track, data, len); if (error) { - free(data, M_TEMP); + free(data, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2124,7 +2126,7 @@ } else { bcopy(data, args->data, len); } - free(data, M_TEMP); + free(data, M_SCSICD); } break; @@ -2132,7 +2134,7 @@ { struct ioc_toc_header *th; - th = malloc(sizeof(struct ioc_toc_header), M_TEMP, + th = malloc(sizeof(struct ioc_toc_header), M_SCSICD, M_WAITOK); cam_periph_lock(periph); @@ -2142,7 +2144,7 @@ error = cdreadtoc(periph, 0, 0, (u_int8_t *)th, sizeof (*th), /*sense_flags*/0); if (error) { - free(th, M_TEMP); + free(th, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2156,7 +2158,7 @@ } th->len = ntohs(th->len); bcopy(th, addr, sizeof(*th)); - free(th, M_TEMP); + free(th, M_SCSICD); cam_periph_unlock(periph); } break; @@ -2170,8 +2172,8 @@ u_int32_t len, readlen, idx, num; u_int32_t starting_track = te->starting_track; - data = malloc(sizeof(*data), M_TEMP, M_WAITOK); - lead = malloc(sizeof(*lead), M_TEMP, M_WAITOK); + data = malloc(sizeof(*data), M_SCSICD, M_WAITOK); + lead = malloc(sizeof(*lead), M_SCSICD, M_WAITOK); cam_periph_lock(periph); CAM_DEBUG(periph->path, CAM_DEBUG_SUBTRACE, @@ -2184,8 +2186,8 @@ error = EINVAL; printf("scsi_cd: error in readtocentries, " "returning EINVAL\n"); - free(data, M_TEMP); - free(lead, M_TEMP); + free(data, M_SCSICD); + free(lead, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2194,8 +2196,8 @@ error = cdreadtoc(periph, 0, 0, (u_int8_t *)th, sizeof (*th), /*sense_flags*/0); if (error) { - free(data, M_TEMP); - free(lead, M_TEMP); + free(data, M_SCSICD); + free(lead, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2217,8 +2219,8 @@ starting_track > th->ending_track + 1) { printf("scsi_cd: error in readtocentries, " "returning EINVAL\n"); - free(data, M_TEMP); - free(lead, M_TEMP); + free(data, M_SCSICD); + free(lead, M_SCSICD); cam_periph_unlock(periph); error = EINVAL; break; @@ -2239,8 +2241,8 @@ printf("scsi_cd: error in readtocentries, " "returning EINVAL\n"); error = EINVAL; - free(data, M_TEMP); - free(lead, M_TEMP); + free(data, M_SCSICD); + free(lead, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2253,8 +2255,8 @@ readlen + sizeof (*th), /*sense_flags*/0); if (error) { - free(data, M_TEMP); - free(lead, M_TEMP); + free(data, M_SCSICD); + free(lead, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2270,8 +2272,8 @@ sizeof(*lead), /*sense_flags*/0); if (error) { - free(data, M_TEMP); - free(lead, M_TEMP); + free(data, M_SCSICD); + free(lead, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2287,8 +2289,8 @@ cam_periph_unlock(periph); error = copyout(data->entries, te->data, len); - free(data, M_TEMP); - free(lead, M_TEMP); + free(data, M_SCSICD); + free(lead, M_SCSICD); } break; case CDIOREADTOCENTRY: @@ -2299,7 +2301,7 @@ struct ioc_toc_header *th; u_int32_t track; - data = malloc(sizeof(*data), M_TEMP, M_WAITOK); + data = malloc(sizeof(*data), M_SCSICD, M_WAITOK); cam_periph_lock(periph); CAM_DEBUG(periph->path, CAM_DEBUG_SUBTRACE, @@ -2309,7 +2311,7 @@ && te->address_format != CD_LBA_FORMAT) { printf("error in readtocentry, " " returning EINVAL\n"); - free(data, M_TEMP); + free(data, M_SCSICD); error = EINVAL; cam_periph_unlock(periph); break; @@ -2319,7 +2321,7 @@ error = cdreadtoc(periph, 0, 0, (u_int8_t *)th, sizeof (*th), /*sense_flags*/0); if (error) { - free(data, M_TEMP); + free(data, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2341,7 +2343,7 @@ track > th->ending_track + 1) { printf("error in readtocentry, " " returning EINVAL\n"); - free(data, M_TEMP); + free(data, M_SCSICD); error = EINVAL; cam_periph_unlock(periph); break; @@ -2351,7 +2353,7 @@ (u_int8_t *)data, sizeof(*data), /*sense_flags*/0); if (error) { - free(data, M_TEMP); + free(data, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2360,7 +2362,7 @@ data->entry.track = bcd2bin(data->entry.track); bcopy(&data->entry, &te->entry, sizeof(struct cd_toc_entry)); - free(data, M_TEMP); + free(data, M_SCSICD); cam_periph_unlock(periph); } break; @@ -2371,7 +2373,7 @@ union cd_pages *page; params.alloc_len = sizeof(union cd_mode_data_6_10); - params.mode_buf = malloc(params.alloc_len, M_TEMP, + params.mode_buf = malloc(params.alloc_len, M_SCSICD, M_WAITOK | M_ZERO); cam_periph_lock(periph); @@ -2380,7 +2382,7 @@ error = cdgetmode(periph, ¶ms, AUDIO_PAGE); if (error) { - free(params.mode_buf, M_TEMP); + free(params.mode_buf, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2393,7 +2395,7 @@ page->audio.port[2].channels = arg->patch[2]; page->audio.port[3].channels = arg->patch[3]; error = cdsetmode(periph, ¶ms); - free(params.mode_buf, M_TEMP); + free(params.mode_buf, M_SCSICD); cam_periph_unlock(periph); } break; @@ -2404,7 +2406,7 @@ union cd_pages *page; params.alloc_len = sizeof(union cd_mode_data_6_10); - params.mode_buf = malloc(params.alloc_len, M_TEMP, + params.mode_buf = malloc(params.alloc_len, M_SCSICD, M_WAITOK | M_ZERO); cam_periph_lock(periph); @@ -2413,7 +2415,7 @@ error = cdgetmode(periph, ¶ms, AUDIO_PAGE); if (error) { - free(params.mode_buf, M_TEMP); + free(params.mode_buf, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2425,7 +2427,7 @@ page->audio.port[RIGHT_PORT].volume; arg->vol[2] = page->audio.port[2].volume; arg->vol[3] = page->audio.port[3].volume; - free(params.mode_buf, M_TEMP); + free(params.mode_buf, M_SCSICD); cam_periph_unlock(periph); } break; @@ -2436,7 +2438,7 @@ union cd_pages *page; params.alloc_len = sizeof(union cd_mode_data_6_10); - params.mode_buf = malloc(params.alloc_len, M_TEMP, + params.mode_buf = malloc(params.alloc_len, M_SCSICD, M_WAITOK | M_ZERO); cam_periph_lock(periph); @@ -2445,7 +2447,7 @@ error = cdgetmode(periph, ¶ms, AUDIO_PAGE); if (error) { - free(params.mode_buf, M_TEMP); + free(params.mode_buf, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2461,7 +2463,7 @@ page->audio.port[3].volume = arg->vol[3]; error = cdsetmode(periph, ¶ms); cam_periph_unlock(periph); - free(params.mode_buf, M_TEMP); + free(params.mode_buf, M_SCSICD); } break; case CDIOCSETMONO: @@ -2470,7 +2472,7 @@ union cd_pages *page; params.alloc_len = sizeof(union cd_mode_data_6_10); - params.mode_buf = malloc(params.alloc_len, M_TEMP, + params.mode_buf = malloc(params.alloc_len, M_SCSICD, M_WAITOK | M_ZERO); cam_periph_lock(periph); @@ -2479,7 +2481,7 @@ error = cdgetmode(periph, ¶ms, AUDIO_PAGE); if (error) { - free(params.mode_buf, M_TEMP); + free(params.mode_buf, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2493,7 +2495,7 @@ page->audio.port[3].channels = 0; error = cdsetmode(periph, ¶ms); cam_periph_unlock(periph); - free(params.mode_buf, M_TEMP); + free(params.mode_buf, M_SCSICD); } break; case CDIOCSETSTEREO: @@ -2502,7 +2504,7 @@ union cd_pages *page; params.alloc_len = sizeof(union cd_mode_data_6_10); - params.mode_buf = malloc(params.alloc_len, M_TEMP, + params.mode_buf = malloc(params.alloc_len, M_SCSICD, M_WAITOK | M_ZERO); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue May 15 22:15:26 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3391E16A4EE; Tue, 15 May 2007 22:15:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EFFAE16A4E5 for ; Tue, 15 May 2007 22:15:25 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E202213C469 for ; Tue, 15 May 2007 22:15:25 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4FMFP3r020045 for ; Tue, 15 May 2007 22:15:25 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4FMFPeU020029 for perforce@freebsd.org; Tue, 15 May 2007 22:15:25 GMT (envelope-from jhb@freebsd.org) Date: Tue, 15 May 2007 22:15:25 GMT Message-Id: <200705152215.l4FMFPeU020029@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 119897 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 May 2007 22:15:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=119897 Change 119897 by jhb@jhb_mutex on 2007/05/15 22:14:39 Drop this local diff. I believe Robert said that the kernel linker is supposed to manually check securelevel for some reason. Affected files ... .. //depot/projects/smpng/sys/kern/kern_linker.c#88 edit Differences ... ==== //depot/projects/smpng/sys/kern/kern_linker.c#88 (text+ko) ==== @@ -367,8 +367,8 @@ int foundfile, error; /* Refuse to load modules if securelevel raised */ - if ((error = securelevel_gt(curthread->td_ucred, 0)) != 0) - return (error); + if (securelevel > 0) + return (EPERM); KLD_LOCK_ASSERT(); lf = linker_find_file_by_name(filename); @@ -560,8 +560,8 @@ int error, i; /* Refuse to unload modules if securelevel raised. */ - if ((error = securelevel_gt(curthread->td_ucred, 0)) != 0) - return (error); + if (securelevel > 0) + return (EPERM); KLD_LOCK_ASSERT(); KLD_DPF(FILE, ("linker_file_unload: lf->refs=%d\n", file->refs)); From owner-p4-projects@FreeBSD.ORG Tue May 15 22:15:27 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B7EBF16A5C4; Tue, 15 May 2007 22:15:26 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 46C0B16A549 for ; Tue, 15 May 2007 22:15:26 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 32D3113C46E for ; Tue, 15 May 2007 22:15:26 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4FMFQoR020056 for ; Tue, 15 May 2007 22:15:26 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4FMFPbO020049 for perforce@freebsd.org; Tue, 15 May 2007 22:15:25 GMT (envelope-from jhb@freebsd.org) Date: Tue, 15 May 2007 22:15:25 GMT Message-Id: <200705152215.l4FMFPbO020049@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 119898 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 May 2007 22:15:27 -0000 http://perforce.freebsd.org/chv.cgi?CH=119898 Change 119898 by jhb@jhb_mutex on 2007/05/15 22:14:56 Drop the MI Linux module version thing. Affected files ... .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#27 edit .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#81 edit .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#56 edit .. //depot/projects/smpng/sys/notes#95 edit Differences ... ==== //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#27 (text+ko) ==== @@ -80,6 +80,8 @@ #include #include +MODULE_VERSION(linux, 1); + MALLOC_DEFINE(M_LINUX, "linux", "Linux mode structures"); #define AUXARGS_ENTRY_32(pos, id, val) \ ==== //depot/projects/smpng/sys/compat/linux/linux_misc.c#81 (text+ko) ==== @@ -1711,5 +1711,3 @@ return (error); } - -MODULE_VERSION(linux, 1); ==== //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#56 (text+ko) ==== @@ -67,6 +67,8 @@ #include #include +MODULE_VERSION(linux, 1); + MALLOC_DEFINE(M_LINUX, "linux", "Linux mode structures"); #if BYTE_ORDER == LITTLE_ENDIAN ==== //depot/projects/smpng/sys/notes#95 (text+ko) ==== @@ -1,8 +1,6 @@ This file serves as a sort of todo list for this branch as well as documenting what patches currently live in this branch. -- Consolidate linux module version into MI location. - - Not sure if we don't want flexibility of MD versions - Fixup asm constraints to use '+' rather than declaring a variable in both the input and output sections with '0', etc. in both the at386 and pc98 bus headers. Also removes bogus 'cc' clobbers. gcc already clobbers 'cc' @@ -73,11 +71,6 @@ recursion) and panic if we try to sleep with any held to provide a cheaper version of the current WITNESS check that doesn't bog the system down quite as bad. -- syscall fixes - + make nfssvc less hackish - - fix audit events for syscalls in modules - + done - - untested Active child branches: - jhb_intr - misc interrupt stuff From owner-p4-projects@FreeBSD.ORG Wed May 16 17:26:45 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 08EA016A402; Wed, 16 May 2007 17:26:45 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AAC1B16A401 for ; Wed, 16 May 2007 17:26:44 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9BF8513C44B for ; Wed, 16 May 2007 17:26:44 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4GHQiit041471 for ; Wed, 16 May 2007 17:26:44 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4GHQiC6041462 for perforce@freebsd.org; Wed, 16 May 2007 17:26:44 GMT (envelope-from jhb@freebsd.org) Date: Wed, 16 May 2007 17:26:44 GMT Message-Id: <200705161726.l4GHQiC6041462@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 119918 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: Wed, 16 May 2007 17:26:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=119918 Change 119918 by jhb@jhb_mutex on 2007/05/16 17:26:36 Make BPF_CHECK_DIRECTION not contain if, but just test the condition. Also, invert it's sense so it reads better (it returns true if the direction is ok and false if the packet should be skipped). Affected files ... .. //depot/projects/smpng/sys/net/bpf.c#68 edit Differences ... ==== //depot/projects/smpng/sys/net/bpf.c#68 (text+ko) ==== @@ -1321,8 +1321,8 @@ } #define BPF_CHECK_DIRECTION(d, m) \ - if (((d)->bd_direction == BPF_D_IN && (m)->m_pkthdr.rcvif == NULL) || \ - ((d)->bd_direction == BPF_D_OUT && (m)->m_pkthdr.rcvif != NULL)) + (((d)->bd_direction == BPF_D_IN && (m)->m_pkthdr.rcvif != NULL) || \ + ((d)->bd_direction == BPF_D_OUT && (m)->m_pkthdr.rcvif == NULL)) /* * Incoming linkage from device drivers, when packet is in an mbuf chain. @@ -1346,7 +1346,7 @@ BPFIF_LOCK(bp); LIST_FOREACH(d, &bp->bif_dlist, bd_next) { - BPF_CHECK_DIRECTION(d, m) + if (!BPF_CHECK_DIRECTION(d, m)) continue; BPFD_LOCK(d); ++d->bd_rcount; @@ -1409,7 +1409,7 @@ BPFIF_LOCK(bp); LIST_FOREACH(d, &bp->bif_dlist, bd_next) { - BPF_CHECK_DIRECTION(d, m) + if (!BPF_CHECK_DIRECTION(d, m)) continue; BPFD_LOCK(d); ++d->bd_rcount; From owner-p4-projects@FreeBSD.ORG Wed May 16 17:27:46 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 86F2816A40A; Wed, 16 May 2007 17:27:46 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6545016A408 for ; Wed, 16 May 2007 17:27:46 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 567FF13C448 for ; Wed, 16 May 2007 17:27:46 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4GHRkAp042253 for ; Wed, 16 May 2007 17:27:46 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4GHRkTC042247 for perforce@freebsd.org; Wed, 16 May 2007 17:27:46 GMT (envelope-from jhb@freebsd.org) Date: Wed, 16 May 2007 17:27:46 GMT Message-Id: <200705161727.l4GHRkTC042247@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 119919 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: Wed, 16 May 2007 17:27:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=119919 Change 119919 by jhb@jhb_mutex on 2007/05/16 17:27:39 Retire uz_lock and just use uz_keg->uk_lock, it's still a single pointer deref but makes 'uma_zone' smaller. Also, cleanup the macros to init/teardown some for the locking being a keg lock rather than a zone lock. Affected files ... .. //depot/projects/smpng/sys/vm/uma_core.c#70 edit .. //depot/projects/smpng/sys/vm/uma_int.h#31 edit Differences ... ==== //depot/projects/smpng/sys/vm/uma_core.c#70 (text+ko) ==== @@ -1247,14 +1247,9 @@ } /* - * Initialize keg's lock (shared among zones) through - * Master zone + * Initialize keg's lock (shared among zones). */ - zone->uz_lock = &keg->uk_lock; - if (arg->flags & UMA_ZONE_MTXCLASS) - ZONE_LOCK_INIT(zone, 1); - else - ZONE_LOCK_INIT(zone, 0); + KEG_LOCK_INIT(keg, zone->uz_name, arg->flags & UMA_ZONE_MTXCLASS); /* * If we're putting the slab header in the actual page we need to @@ -1349,7 +1344,6 @@ zone->uz_keg = keg; zone->uz_init = arg->uminit; zone->uz_fini = arg->fini; - zone->uz_lock = &keg->uk_lock; mtx_lock(&uma_mtx); ZONE_LOCK(zone); keg->uk_flags |= UMA_ZONE_SECONDARY; @@ -1382,7 +1376,6 @@ return (error); } keg = zone->uz_keg; - zone->uz_lock = &keg->uk_lock; /* * Some internal zones don't have room allocated for the per cpu @@ -1416,18 +1409,18 @@ uma_keg_t keg; keg = (uma_keg_t)arg; - mtx_lock(&keg->uk_lock); + KEG_LOCK(keg); if (keg->uk_free != 0) { printf("Freed UMA keg was not empty (%d items). " " Lost %d pages of memory.\n", keg->uk_free, keg->uk_pages); } - mtx_unlock(&keg->uk_lock); + KEG_UNLOCK(keg); if (keg->uk_flags & UMA_ZONE_HASH) hash_free(&keg->uk_hash); - mtx_destroy(&keg->uk_lock); + KEG_LOCK_FINI(keg); } /* ==== //depot/projects/smpng/sys/vm/uma_int.h#31 (text+ko) ==== @@ -331,19 +331,21 @@ /* Lock Macros */ -#define ZONE_LOCK_INIT(z, lc) \ +#define KEG_LOCK_INIT(k, name, lc) \ do { \ if ((lc)) \ - mtx_init((z)->uz_lock, (z)->uz_name, \ - (z)->uz_name, MTX_DEF | MTX_DUPOK); \ + mtx_init(&(k)->uk_lock, (name), \ + NULL, MTX_DEF | MTX_DUPOK); \ else \ - mtx_init((z)->uz_lock, (z)->uz_name, \ + mtx_init(&(k)->uk_lock, (name), \ "UMA zone", MTX_DEF | MTX_DUPOK); \ } while (0) - -#define ZONE_LOCK_FINI(z) mtx_destroy((z)->uz_lock) -#define ZONE_LOCK(z) mtx_lock((z)->uz_lock) -#define ZONE_UNLOCK(z) mtx_unlock((z)->uz_lock) +#define KEG_LOCK_FINI(k) mtx_destroy(&(k)->uk_lock) +#define KEG_LOCK(k) mtx_lock(&(k)->uk_lock) +#define KEG_UNLOCK(k) mtx_unlock(&(k)->uk_lock) + +#define ZONE_LOCK(z) mtx_lock(&(z)->uz_keg->uk_lock) +#define ZONE_UNLOCK(z) mtx_unlock(&(z)->uz_keg->uk_lock) /* * Find a slab within a hash table. This is used for OFFPAGE zones to lookup From owner-p4-projects@FreeBSD.ORG Wed May 16 18:09:41 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 09E2116A403; Wed, 16 May 2007 18:09:41 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CFE6916A401 for ; Wed, 16 May 2007 18:09:40 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C144613C45B for ; Wed, 16 May 2007 18:09:40 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4GI9e6Q074762 for ; Wed, 16 May 2007 18:09:40 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4GI9eb1074756 for perforce@freebsd.org; Wed, 16 May 2007 18:09:40 GMT (envelope-from jhb@freebsd.org) Date: Wed, 16 May 2007 18:09:40 GMT Message-Id: <200705161809.l4GI9eb1074756@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 119923 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: Wed, 16 May 2007 18:09:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=119923 Change 119923 by jhb@jhb_mutex on 2007/05/16 18:08:42 Better. Affected files ... .. //depot/projects/smpng/sys/net/bpf.c#69 edit Differences ... ==== //depot/projects/smpng/sys/net/bpf.c#69 (text+ko) ==== @@ -1321,8 +1321,8 @@ } #define BPF_CHECK_DIRECTION(d, m) \ - (((d)->bd_direction == BPF_D_IN && (m)->m_pkthdr.rcvif != NULL) || \ - ((d)->bd_direction == BPF_D_OUT && (m)->m_pkthdr.rcvif == NULL)) + (!(((d)->bd_direction == BPF_D_IN && (m)->m_pkthdr.rcvif == NULL) || \ + ((d)->bd_direction == BPF_D_OUT && (m)->m_pkthdr.rcvif != NULL))) /* * Incoming linkage from device drivers, when packet is in an mbuf chain. From owner-p4-projects@FreeBSD.ORG Wed May 16 23:01:13 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 56B1816A402; Wed, 16 May 2007 23:01:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 16E2516A400 for ; Wed, 16 May 2007 23:01:13 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 08FCB13C448 for ; Wed, 16 May 2007 23:01:13 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4GN1CmN047531 for ; Wed, 16 May 2007 23:01:12 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4GN1CCG047479 for perforce@freebsd.org; Wed, 16 May 2007 23:01:12 GMT (envelope-from imp@freebsd.org) Date: Wed, 16 May 2007 23:01:12 GMT Message-Id: <200705162301.l4GN1CCG047479@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 119938 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: Wed, 16 May 2007 23:01:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=119938 Change 119938 by imp@imp_lighthouse on 2007/05/16 23:00:49 Hex values for commands. Affected files ... .. //depot/projects/arm/src/sys/dev/mmc/mmcreg.h#16 edit Differences ... ==== //depot/projects/arm/src/sys/dev/mmc/mmcreg.h#16 (text+ko) ==== @@ -242,13 +242,13 @@ /* Application specific commands for SD */ -#define ACMD_SET_BUS_WIDTH 6 -#define ACMD_SD_STATUS 13 -#define ACMD_SEND_NUM_WR_BLOCKS 22 -#define ACMD_SET_WR_BLK_ERASE_COUNT 23 -#define ACMD_SD_SEND_OP_COND 41 -#define ACMD_SET_CLR_CARD_DETECT 42 -#define ACMD_SEND_SCR 51 +#define ACMD_SET_BUS_WIDTH 6 /* 0x06 */ +#define ACMD_SD_STATUS 13 /* 0x0d */ +#define ACMD_SEND_NUM_WR_BLOCKS 22 /* 0x16 */ +#define ACMD_SET_WR_BLK_ERASE_COUNT 23 /* 0x17 */ +#define ACMD_SD_SEND_OP_COND 41 /* 0x29 */ +#define ACMD_SET_CLR_CARD_DETECT 42 /* 0x2a */ +#define ACMD_SEND_SCR 51 /* 0x33 */ /* OCR bits */ From owner-p4-projects@FreeBSD.ORG Wed May 16 23:04:18 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E43516A409; Wed, 16 May 2007 23:04:18 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 586B116A407 for ; Wed, 16 May 2007 23:04:18 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 464D613C468 for ; Wed, 16 May 2007 23:04:18 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4GN4IQY051707 for ; Wed, 16 May 2007 23:04:18 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4GN4HMu051695 for perforce@freebsd.org; Wed, 16 May 2007 23:04:17 GMT (envelope-from imp@freebsd.org) Date: Wed, 16 May 2007 23:04:17 GMT Message-Id: <200705162304.l4GN4HMu051695@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 119939 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: Wed, 16 May 2007 23:04:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=119939 Change 119939 by imp@imp_lighthouse on 2007/05/16 23:04:10 Try harder. Affected files ... .. //depot/projects/arm/src/gnu/usr.bin/binutils/Makefile#2 edit .. //depot/projects/arm/src/gnu/usr.bin/binutils/Makefile.inc#3 edit .. //depot/projects/arm/src/gnu/usr.bin/binutils/Makefile.inc0#6 edit .. //depot/projects/arm/src/sys/arm/at91/at91_pio.c#28 edit .. //depot/projects/arm/src/sys/arm/at91/uart_bus_at91usart.c#10 edit .. //depot/projects/arm/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#11 edit .. //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#42 edit .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/tsc_board.c#8 edit .. //depot/projects/arm/src/sys/conf/options.arm#22 edit .. //depot/projects/arm/src/sys/dev/ath/if_ath.c#26 edit .. //depot/projects/arm/src/sys/dev/mmc/mmc.c#23 edit .. //depot/projects/arm/src/sys/kern/subr_bus.c#20 edit .. //depot/projects/arm/src/sys/modules/Makefile#43 edit .. //depot/projects/usb/src/sys/dev/usb/ugen.c#15 edit .. //depot/user/imp/freebsd-imp/usr.sbin/pccard/Makefile#4 edit .. //depot/user/imp/newcard/dev/usb/umass.c#71 edit .. //depot/user/imp/newcard/dev/usb/usbdevs#126 edit Differences ... ==== //depot/projects/arm/src/gnu/usr.bin/binutils/Makefile#2 (text+ko) ==== ==== //depot/projects/arm/src/gnu/usr.bin/binutils/Makefile.inc#3 (text+ko) ==== ==== //depot/projects/arm/src/gnu/usr.bin/binutils/Makefile.inc0#6 (text+ko) ==== @@ -6,7 +6,7 @@ VERSION= "2.15 [FreeBSD] 2004-05-23" -TARGET_ARCH?= ${MACHINE_CPU} +TARGET_ARCH?= ${MACHINE_ARCH} .if ${TARGET_ARCH} == "amd64" BINUTILS_ARCH=x86_64 .else ==== //depot/projects/arm/src/sys/arm/at91/at91_pio.c#28 (text+ko) ==== @@ -240,7 +240,7 @@ /* Reading the status also clears the interrupt */ status = RD4(sc, PIO_ISR) & RD4(sc, PIO_IMR); if (status == 0) - return; + return (FILTER_STRAY); AT91_PIO_LOCK(sc); i = 0; while (status) { ==== //depot/projects/arm/src/sys/arm/at91/uart_bus_at91usart.c#10 (text+ko) ==== ==== //depot/projects/arm/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#11 (text+ko) ==== @@ -79,6 +79,10 @@ di->parity = UART_PARITY_NONE; uart_bus_space_io = &at91_bs_tag; uart_bus_space_mem = NULL; +#if 0 /* Check the environment for overrides */ return (uart_getenv(devtype, di, class)); +#else + return 0; +#endif } ==== //depot/projects/arm/src/sys/arm/at91/uart_dev_at91usart.c#42 (text+ko) ==== ==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/tsc_board.c#8 (text+ko) ==== @@ -11,10 +11,6 @@ unsigned char mac[6] = { 0x42, 0x53, 0x44, 0, 0, 1 }; -#define KLUDGE_STRAP -#define TSC_FPGA - -#ifdef TSC_FPGA #include "at91rm9200.h" #include "spi_flash.h" #include "fpga.h" @@ -38,6 +34,7 @@ int len, off, i, offset; char *addr = buffer; + printf("Loading fpga..."); len = FPGA_LEN; offset = FPGA_OFFSET; for (i = 0; i < len; i+= FLASH_PAGE_SIZE) { @@ -48,92 +45,40 @@ fpga_clear(&main_fpga); fpga_write_bytes(&main_fpga, addr, len); fpga_done(&main_fpga); + printf("done\n"); } -#endif static void MacFromEE() { -#if 0 uint32_t sig; -#ifdef KLUDGE_STRAP - uint8_t euid64[8] = { 0x00, 0x30, 0x96, 0x20, - 0x00, 0x00, 0x00, 0x03 }; -#endif -#ifdef KLUDGE_STRAP - printf("writing...\n"); - sig = 0xaa55aa55; - EEWrite(0, (uint8_t *)&sig, sizeof(sig)); - printf("euid64\n"); - EEWrite(48, euid64, sizeof(euid64)); - printf("done\n"); -#endif sig = 0; EERead(0, (uint8_t *)&sig, sizeof(sig)); if (sig != 0xaa55aa55) return; EERead(48, mac, 3); EERead(48+5, mac+3, 3); -#else - mac[0] = 0; - mac[1] = 0x30; - mac[2] = 0x96; - mac[3] = 0; - mac[4] = 0; - mac[5] = 3; -#endif printf("MAC %x:%x:%x:%x:%x:%x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); } -#ifdef XMODEM_DL -#define FLASH_OFFSET (0 * FLASH_PAGE_SIZE) -#define FPGA_OFFSET (15 * FLASH_PAGE_SIZE) -#define FPGA_LEN (212608) -#define KERNEL_OFFSET (220 * FLASH_PAGE_SIZE) -#define KERNEL_LEN (6 * 1024 * FLASH_PAGE_SIZE) - -static void -UpdateFlash(int offset) -{ - char *addr = (char *)0x20000000 + (1 << 20); /* Load to base + 1MB */ - int len, i, off; - - while ((len = xmodem_rx(addr)) == -1) - continue; - printf("\nDownloaded %u bytes.\n", len); - for (i = 0; i < len; i+= FLASH_PAGE_SIZE) { - off = i + offset; - SPI_WriteFlash(off, addr + i, FLASH_PAGE_SIZE); - } -} void Update(void) { - UpdateFlash(FLASH_OFFSET); } -#else -void -Update(void) -{ -} -#endif - void board_init(void) { -#ifdef TSC_FPGA - SPI_InitFlash(); - fpga_load(); -#endif - EEInit(); - MacFromEE(); - EMAC_Init(); - sdcard_init(); - EMAC_SetMACAddress(mac); - + while (!sdcard_init()) + printf("Probing for SD card...\n"); + SPI_InitFlash(); + fpga_load(); + EEInit(); + MacFromEE(); + EMAC_Init(); + EMAC_SetMACAddress(mac); } #include "../bootspi/ee.c" ==== //depot/projects/arm/src/sys/conf/options.arm#22 (text+ko) ==== @@ -8,6 +8,9 @@ CPU_SA1100 opt_global.h CPU_SA1110 opt_global.h CPU_ARM9 opt_global.h +CPU_ARM9E opt_global.h +CPU_ARM10 opt_global.h +CPU_ARM11 opt_global.h CPU_XSCALE_80321 opt_global.h CPU_XSCALE_80219 opt_global.h CPU_XSCALE_IXP425 opt_global.h ==== //depot/projects/arm/src/sys/dev/ath/if_ath.c#26 (text+ko) ==== @@ -653,6 +653,7 @@ __func__, ifp->if_flags); ath_stop(ifp); + printf("bpfdetach\n"); bpfdetach(ifp); /* * NB: the order of these is important: @@ -666,17 +667,23 @@ * it last * Other than that, it's straightforward... */ + printf("ieee80211_ifdetach\n"); ieee80211_ifdetach(&sc->sc_ic); #ifdef ATH_TX99_DIAG if (sc->sc_tx99 != NULL) sc->sc_tx99->detach(sc->sc_tx99); #endif taskqueue_free(sc->sc_tq); +printf("ath_rate_detach\n"); ath_rate_detach(sc->sc_rc); +printf("ath_desc_free\n"); ath_desc_free(sc); +printf("ath_tx_cleanup\n"); ath_tx_cleanup(sc); +printf("ath_hal_detach\n"); ath_hal_detach(sc->sc_ah); if_free(ifp); + printf("ath_Detach returns\n"); return 0; } @@ -1046,6 +1053,7 @@ if (sc->sc_tx99 != NULL) sc->sc_tx99->stop(sc->sc_tx99); #endif + printf("b4 new_state\n"); ieee80211_new_state(ic, IEEE80211_S_INIT, -1); ifp->if_drv_flags &= ~IFF_DRV_RUNNING; ifp->if_timer = 0; @@ -1056,8 +1064,10 @@ !sc->sc_ledon); sc->sc_blinking = 0; } + printf("hal_intrset\n"); ath_hal_intrset(ah, 0); } + printf("ath_draintxq\n"); ath_draintxq(sc); if (!sc->sc_invalid) { ath_stoprecv(sc); @@ -1065,8 +1075,10 @@ } else sc->sc_rxlink = NULL; IFQ_DRV_PURGE(&ifp->if_snd); + printf("ath_beacon_free\n"); ath_beacon_free(sc); } + printf("ath_stop returns\n"); } static void @@ -2285,6 +2297,7 @@ struct ath_buf *bf; STAILQ_FOREACH(bf, &sc->sc_bbuf, bf_list) { + printf("feeing bf %p\n", bf); if (bf->bf_m != NULL) { bus_dmamap_unload(sc->sc_dmat, bf->bf_dmamap); m_freem(bf->bf_m); @@ -3326,9 +3339,11 @@ ath_tx_cleanupq(struct ath_softc *sc, struct ath_txq *txq) { - ath_hal_releasetxqueue(sc->sc_ah, txq->axq_qnum); + printf("Releasing..."); +/* ath_hal_releasetxqueue(sc->sc_ah, txq->axq_qnum); */ ATH_TXQ_LOCK_DESTROY(txq); sc->sc_txqsetup &= ~(1<axq_qnum); + printf("done"); } /* @@ -3340,9 +3355,12 @@ int i; ATH_TXBUF_LOCK_DESTROY(sc); - for (i = 0; i < HAL_NUM_TX_QUEUES; i++) + for (i = 0; i < HAL_NUM_TX_QUEUES; i++) { + printf("%d: ", i); if (ATH_TXQ_SETUP(sc, i)) ath_tx_cleanupq(sc, &sc->sc_txq[i]); + printf("\n"); + } ATH_TXQ_LOCK_DESTROY(&sc->sc_mcastq); } ==== //depot/projects/arm/src/sys/dev/mmc/mmc.c#23 (text+ko) ==== @@ -347,7 +347,7 @@ cmd.arg = ocr; cmd.flags = MMC_RSP_R3 | MMC_CMD_BCR; - for (i = 0; i < 10; i++) { + for (i = 0; i < 100; i++) { err = mmc_wait_for_app_cmd(sc, 0, &cmd, CMD_RETRIES); if (err != MMC_ERR_NONE) break; ==== //depot/projects/arm/src/sys/kern/subr_bus.c#20 (text+ko) ==== ==== //depot/projects/arm/src/sys/modules/Makefile#43 (text+ko) ==== @@ -15,7 +15,6 @@ aic7xxx \ aio \ ${_amd} \ - amr \ ${_an} \ ${_aout} \ ${_apm} \ ==== //depot/projects/usb/src/sys/dev/usb/ugen.c#15 (text+ko) ==== @@ -55,8 +55,8 @@ #include #include #include -#include #include +#include #include #include @@ -1008,6 +1008,7 @@ /* let application process data */ break; } +#if 0 if(flag & IO_NDELAY) { if(n) @@ -1016,7 +1017,7 @@ } break; } - +#endif /* wait for data */ sce->state |= (UGEN_RD_SLP|UGEN_RD_WUP); @@ -1233,7 +1234,7 @@ */ usbd_transfer_start(sce->xfer_out[0]); usbd_transfer_start(sce->xfer_out[1]); - +#if 0 if(flag & IO_NDELAY) { if(n) @@ -1242,7 +1243,7 @@ } break; } - +#endif sce->state |= (UGEN_WR_SLP|UGEN_WR_WUP); error = mtx_sleep(sce, &sc->sc_mtx, (PZERO|PCATCH), ==== //depot/user/imp/freebsd-imp/usr.sbin/pccard/Makefile#4 (text+ko) ==== @@ -1,6 +1,6 @@ # Makefile for pccardc/pccardd. # $FreeBSD: src/usr.sbin/pccard/Makefile,v 1.8 2006/10/18 21:09:43 imp Exp $ -SUBDIR= dumpcis +SUBDIR= .include ==== //depot/user/imp/newcard/dev/usb/umass.c#71 (text+ko) ==== @@ -129,6 +129,7 @@ #include +#define USB_DEBUG #ifdef USB_DEBUG #define DIF(m, x) if (umassdebug & (m)) do { x ; } while (0) #define DPRINTF(m, x) if (umassdebug & (m)) logprintf x @@ -142,7 +143,7 @@ #define UDMASS_CBI 0x00400000 /* CBI transfers */ #define UDMASS_WIRE (UDMASS_BBB|UDMASS_CBI) #define UDMASS_ALL 0xffff0000 /* all of the above */ -int umassdebug = 0; +int umassdebug = UDMASS_ALL; SYSCTL_NODE(_hw_usb, OID_AUTO, umass, CTLFLAG_RW, 0, "USB umass"); SYSCTL_INT(_hw_usb_umass, OID_AUTO, debug, CTLFLAG_RW, &umassdebug, 0, "umass debug level"); ==== //depot/user/imp/newcard/dev/usb/usbdevs#126 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Wed May 16 23:12:29 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 378C016A403; Wed, 16 May 2007 23:12:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E70B116A401 for ; Wed, 16 May 2007 23:12:28 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id C047913C43E for ; Wed, 16 May 2007 23:12:28 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4GNCSX6059667 for ; Wed, 16 May 2007 23:12:28 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4GNCSCt059661 for perforce@freebsd.org; Wed, 16 May 2007 23:12:28 GMT (envelope-from imp@freebsd.org) Date: Wed, 16 May 2007 23:12:28 GMT Message-Id: <200705162312.l4GNCSCt059661@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 119940 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: Wed, 16 May 2007 23:12:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=119940 Change 119940 by imp@imp_lighthouse on 2007/05/16 23:12:04 Revert Affected files ... .. //depot/projects/arm/src/gnu/usr.bin/binutils/Makefile.inc0#7 edit Differences ... ==== //depot/projects/arm/src/gnu/usr.bin/binutils/Makefile.inc0#7 (text+ko) ==== @@ -6,7 +6,7 @@ VERSION= "2.15 [FreeBSD] 2004-05-23" -TARGET_ARCH?= ${MACHINE_ARCH} +TARGET_ARCH?= ${MACHINE_CPU} .if ${TARGET_ARCH} == "amd64" BINUTILS_ARCH=x86_64 .else From owner-p4-projects@FreeBSD.ORG Wed May 16 23:13:30 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A30E516A406; Wed, 16 May 2007 23:13:30 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8125316A404 for ; Wed, 16 May 2007 23:13:30 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 7261313C455 for ; Wed, 16 May 2007 23:13:30 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4GNDUe6060676 for ; Wed, 16 May 2007 23:13:30 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4GNDU0X060665 for perforce@freebsd.org; Wed, 16 May 2007 23:13:30 GMT (envelope-from imp@freebsd.org) Date: Wed, 16 May 2007 23:13:30 GMT Message-Id: <200705162313.l4GNDU0X060665@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 119941 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: Wed, 16 May 2007 23:13:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=119941 Change 119941 by imp@imp_lighthouse on 2007/05/16 23:13:28 Revert. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/tsc_board.c#9 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/tsc_board.c#9 (text+ko) ==== @@ -11,6 +11,10 @@ unsigned char mac[6] = { 0x42, 0x53, 0x44, 0, 0, 1 }; +#define KLUDGE_STRAP +#define TSC_FPGA + +#ifdef TSC_FPGA #include "at91rm9200.h" #include "spi_flash.h" #include "fpga.h" @@ -34,7 +38,6 @@ int len, off, i, offset; char *addr = buffer; - printf("Loading fpga..."); len = FPGA_LEN; offset = FPGA_OFFSET; for (i = 0; i < len; i+= FLASH_PAGE_SIZE) { @@ -45,40 +48,92 @@ fpga_clear(&main_fpga); fpga_write_bytes(&main_fpga, addr, len); fpga_done(&main_fpga); - printf("done\n"); } +#endif static void MacFromEE() { +#if 0 uint32_t sig; +#ifdef KLUDGE_STRAP + uint8_t euid64[8] = { 0x00, 0x30, 0x96, 0x20, + 0x00, 0x00, 0x00, 0x03 }; +#endif +#ifdef KLUDGE_STRAP + printf("writing...\n"); + sig = 0xaa55aa55; + EEWrite(0, (uint8_t *)&sig, sizeof(sig)); + printf("euid64\n"); + EEWrite(48, euid64, sizeof(euid64)); + printf("done\n"); +#endif sig = 0; EERead(0, (uint8_t *)&sig, sizeof(sig)); if (sig != 0xaa55aa55) return; EERead(48, mac, 3); EERead(48+5, mac+3, 3); +#else + mac[0] = 0; + mac[1] = 0x30; + mac[2] = 0x96; + mac[3] = 0; + mac[4] = 0; + mac[5] = 3; +#endif printf("MAC %x:%x:%x:%x:%x:%x\n", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); } +#ifdef XMODEM_DL +#define FLASH_OFFSET (0 * FLASH_PAGE_SIZE) +#define FPGA_OFFSET (15 * FLASH_PAGE_SIZE) +#define FPGA_LEN (212608) +#define KERNEL_OFFSET (220 * FLASH_PAGE_SIZE) +#define KERNEL_LEN (6 * 1024 * FLASH_PAGE_SIZE) + +static void +UpdateFlash(int offset) +{ + char *addr = (char *)0x20000000 + (1 << 20); /* Load to base + 1MB */ + int len, i, off; + + while ((len = xmodem_rx(addr)) == -1) + continue; + printf("\nDownloaded %u bytes.\n", len); + for (i = 0; i < len; i+= FLASH_PAGE_SIZE) { + off = i + offset; + SPI_WriteFlash(off, addr + i, FLASH_PAGE_SIZE); + } +} void Update(void) { + UpdateFlash(FLASH_OFFSET); } +#else +void +Update(void) +{ +} +#endif + void board_init(void) { - while (!sdcard_init()) - printf("Probing for SD card...\n"); - SPI_InitFlash(); - fpga_load(); - EEInit(); - MacFromEE(); - EMAC_Init(); - EMAC_SetMACAddress(mac); +#ifdef TSC_FPGA + SPI_InitFlash(); + fpga_load(); +#endif + EEInit(); + MacFromEE(); + EMAC_Init(); + sdcard_init(); + EMAC_SetMACAddress(mac); + } #include "../bootspi/ee.c" From owner-p4-projects@FreeBSD.ORG Wed May 16 23:15:33 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BEB3316A406; Wed, 16 May 2007 23:15:33 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9545016A402 for ; Wed, 16 May 2007 23:15:33 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 86E2713C458 for ; Wed, 16 May 2007 23:15:33 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4GNFX2J062756 for ; Wed, 16 May 2007 23:15:33 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4GNFXVa062749 for perforce@freebsd.org; Wed, 16 May 2007 23:15:33 GMT (envelope-from imp@freebsd.org) Date: Wed, 16 May 2007 23:15:33 GMT Message-Id: <200705162315.l4GNFXVa062749@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 119942 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: Wed, 16 May 2007 23:15:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=119942 Change 119942 by imp@imp_lighthouse on 2007/05/16 23:15:15 Revert. Affected files ... .. //depot/projects/arm/src/sys/dev/ath/if_ath.c#27 edit Differences ... ==== //depot/projects/arm/src/sys/dev/ath/if_ath.c#27 (text+ko) ==== @@ -653,7 +653,6 @@ __func__, ifp->if_flags); ath_stop(ifp); - printf("bpfdetach\n"); bpfdetach(ifp); /* * NB: the order of these is important: @@ -667,23 +666,17 @@ * it last * Other than that, it's straightforward... */ - printf("ieee80211_ifdetach\n"); ieee80211_ifdetach(&sc->sc_ic); #ifdef ATH_TX99_DIAG if (sc->sc_tx99 != NULL) sc->sc_tx99->detach(sc->sc_tx99); #endif taskqueue_free(sc->sc_tq); -printf("ath_rate_detach\n"); ath_rate_detach(sc->sc_rc); -printf("ath_desc_free\n"); ath_desc_free(sc); -printf("ath_tx_cleanup\n"); ath_tx_cleanup(sc); -printf("ath_hal_detach\n"); ath_hal_detach(sc->sc_ah); if_free(ifp); - printf("ath_Detach returns\n"); return 0; } @@ -1053,7 +1046,6 @@ if (sc->sc_tx99 != NULL) sc->sc_tx99->stop(sc->sc_tx99); #endif - printf("b4 new_state\n"); ieee80211_new_state(ic, IEEE80211_S_INIT, -1); ifp->if_drv_flags &= ~IFF_DRV_RUNNING; ifp->if_timer = 0; @@ -1064,10 +1056,8 @@ !sc->sc_ledon); sc->sc_blinking = 0; } - printf("hal_intrset\n"); ath_hal_intrset(ah, 0); } - printf("ath_draintxq\n"); ath_draintxq(sc); if (!sc->sc_invalid) { ath_stoprecv(sc); @@ -1075,10 +1065,8 @@ } else sc->sc_rxlink = NULL; IFQ_DRV_PURGE(&ifp->if_snd); - printf("ath_beacon_free\n"); ath_beacon_free(sc); } - printf("ath_stop returns\n"); } static void @@ -2297,7 +2285,6 @@ struct ath_buf *bf; STAILQ_FOREACH(bf, &sc->sc_bbuf, bf_list) { - printf("feeing bf %p\n", bf); if (bf->bf_m != NULL) { bus_dmamap_unload(sc->sc_dmat, bf->bf_dmamap); m_freem(bf->bf_m); @@ -3339,11 +3326,9 @@ ath_tx_cleanupq(struct ath_softc *sc, struct ath_txq *txq) { - printf("Releasing..."); -/* ath_hal_releasetxqueue(sc->sc_ah, txq->axq_qnum); */ + ath_hal_releasetxqueue(sc->sc_ah, txq->axq_qnum); ATH_TXQ_LOCK_DESTROY(txq); sc->sc_txqsetup &= ~(1<axq_qnum); - printf("done"); } /* @@ -3355,12 +3340,9 @@ int i; ATH_TXBUF_LOCK_DESTROY(sc); - for (i = 0; i < HAL_NUM_TX_QUEUES; i++) { - printf("%d: ", i); + for (i = 0; i < HAL_NUM_TX_QUEUES; i++) if (ATH_TXQ_SETUP(sc, i)) ath_tx_cleanupq(sc, &sc->sc_txq[i]); - printf("\n"); - } ATH_TXQ_LOCK_DESTROY(&sc->sc_mcastq); } From owner-p4-projects@FreeBSD.ORG Wed May 16 23:17:37 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 346E616A404; Wed, 16 May 2007 23:17:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E62C316A402 for ; Wed, 16 May 2007 23:17:36 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D7DBA13C448 for ; Wed, 16 May 2007 23:17:36 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4GNHamH064593 for ; Wed, 16 May 2007 23:17:36 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4GNHaJR064584 for perforce@freebsd.org; Wed, 16 May 2007 23:17:36 GMT (envelope-from imp@freebsd.org) Date: Wed, 16 May 2007 23:17:36 GMT Message-Id: <200705162317.l4GNHaJR064584@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 119943 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: Wed, 16 May 2007 23:17:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=119943 Change 119943 by imp@imp_lighthouse on 2007/05/16 23:16:53 Revert. The last commit was a lame experiment that I had in my tree. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ugen.c#16 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ugen.c#16 (text+ko) ==== @@ -55,8 +55,8 @@ #include #include #include +#include #include -#include #include #include @@ -1008,7 +1008,6 @@ /* let application process data */ break; } -#if 0 if(flag & IO_NDELAY) { if(n) @@ -1017,7 +1016,7 @@ } break; } -#endif + /* wait for data */ sce->state |= (UGEN_RD_SLP|UGEN_RD_WUP); @@ -1234,7 +1233,7 @@ */ usbd_transfer_start(sce->xfer_out[0]); usbd_transfer_start(sce->xfer_out[1]); -#if 0 + if(flag & IO_NDELAY) { if(n) @@ -1243,7 +1242,7 @@ } break; } -#endif + sce->state |= (UGEN_WR_SLP|UGEN_WR_WUP); error = mtx_sleep(sce, &sc->sc_mtx, (PZERO|PCATCH), From owner-p4-projects@FreeBSD.ORG Thu May 17 01:47:58 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5CD3616A403; Thu, 17 May 2007 01:47:58 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 1F5E316A400 for ; Thu, 17 May 2007 01:47:58 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 0F98F13C457 for ; Thu, 17 May 2007 01:47:58 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4H1lveu011362 for ; Thu, 17 May 2007 01:47:57 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4H1lvgG011350 for perforce@freebsd.org; Thu, 17 May 2007 01:47:57 GMT (envelope-from imp@freebsd.org) Date: Thu, 17 May 2007 01:47:57 GMT Message-Id: <200705170147.l4H1lvgG011350@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 119952 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: Thu, 17 May 2007 01:47:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=119952 Change 119952 by imp@imp_lighthouse on 2007/05/17 01:47:13 Add support for the german centipad board. Affected files ... .. //depot/projects/arm/src/sys/boot/arm/at91/Makefile.inc#32 edit .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/boot2.c#34 edit .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/centipad_board.c#1 add .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/kb920x_board.c#8 edit .. //depot/projects/arm/src/sys/boot/arm/at91/boot2/tsc_board.c#10 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#16 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#13 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#43 edit .. //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.h#17 edit Differences ... ==== //depot/projects/arm/src/sys/boot/arm/at91/Makefile.inc#32 (text+ko) ==== @@ -5,8 +5,8 @@ __at91_boot_Makefile.inc__: -# tsc, bwct, kb920x are the supported flavors -BOOT_FLAVOR=kb920x +# tsc, bwct, kb920x, centipad are the supported flavors +BOOT_FLAVOR=centipad CFLAGS=-Os -mcpu=arm9 -ffreestanding \ -I${.CURDIR}/../libat91 \ ==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/boot2.c#34 (text+ko) ==== @@ -142,8 +142,6 @@ ino_t ino; board_init(); - while (sdcard_init() == 0) - printf("Looking for SD card\n"); dmadat = (void *)(0x20000000 + (16 << 20)); /* Process configuration file */ ==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/kb920x_board.c#8 (text+ko) ==== @@ -59,8 +59,9 @@ InitEEPROM(); MacFromEE(); EMAC_Init(); - sdcard_init(); EMAC_SetMACAddress(mac); + while (sdcard_init() == 0) + printf("Looking for SD card\n"); } int ==== //depot/projects/arm/src/sys/boot/arm/at91/boot2/tsc_board.c#10 (text+ko) ==== @@ -131,9 +131,9 @@ EEInit(); MacFromEE(); EMAC_Init(); - sdcard_init(); EMAC_SetMACAddress(mac); - + while (sdcard_init() == 0) + printf("Looking for SD card\n"); } #include "../bootspi/ee.c" ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#16 (text) ==== @@ -62,7 +62,7 @@ AT91C_BASE_PIOC->PIO_CODR = AT91C_PIO_PC10; #endif -#ifdef BOOT_KB920X +#if defined(BOOT_KB920X) || defined(BOOT_CENTIPAD) AT91C_BASE_PIOC->PIO_PER = AT91C_PIO_PC18 | AT91C_PIO_PC19 | AT91C_PIO_PC20; AT91C_BASE_PIOC->PIO_OER = AT91C_PIO_PC18 | AT91C_PIO_PC19 | ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#13 (text) ==== @@ -39,6 +39,14 @@ #define OSC_MAIN_MULT 90 #endif +#ifdef BOOT_CENTIPAD +/* The following divisor sets PLLA frequency: e.g. 10/5 * 90 = 180MHz */ +#define OSC_MAIN_FREQ_DIV 5 /* for 10MHz osc */ +#define SDRAM_WIDTH AT91C_SDRC_DBW_16_BITS +typedef unsigned short sdram_size_t; +#define OSC_MAIN_MULT 90 +#endif + #ifdef BOOT_BWCT /* The following divisor sets PLLA frequency: e.g. 16/4 * 45 = 180MHz */ #define OSC_MAIN_FREQ_DIV 4 /* for 16MHz osc */ ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.c#43 (text+ko) ==== @@ -380,7 +380,7 @@ static void MII_GetLinkSpeed(AT91PS_EMAC pEmac) { -#if defined(BOOT_TSC) | defined(BOOT_KB920X) +#if defined(BOOT_TSC) || defined(BOOT_KB920X) || defined(BOOT_CENTIPAD) unsigned short stat2; #endif unsigned update; @@ -394,7 +394,7 @@ update |= AT91C_EMAC_SPD; update |= AT91C_EMAC_FD; #endif -#ifdef BOOT_KB920X +#if defined(BOOT_KB920X) || defined(BOOT_CENTIPAD) stat2 = AT91F_MII_ReadPhy(pEmac, MII_STS2_REG); if (!(stat2 & MII_STS2_LINK)) return ; ==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/emac.h#17 (text+ko) ==== @@ -114,7 +114,7 @@ /* MII registers definition */ #define MII_STS_REG 0x01 #define MII_STS_LINK_STAT 0x04 -#ifdef BOOT_KB920X +#if defined(BOOT_KB920X) || defined(BOOT_CENTIPAD) #define MII_STS2_REG 0x11 #define MII_STS2_LINK 0x400 #define MII_STS2_100TX 0x4000 From owner-p4-projects@FreeBSD.ORG Thu May 17 09:27:56 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2895216A405; Thu, 17 May 2007 09:27:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DFAC916A402; Thu, 17 May 2007 09:27:55 +0000 (UTC) (envelope-from hselasky@freebsd.org) Received: from swip.net (mailfe05.swip.net [212.247.154.129]) by mx1.freebsd.org (Postfix) with ESMTP id 522A513C455; Thu, 17 May 2007 09:27:55 +0000 (UTC) (envelope-from hselasky@freebsd.org) X-Cloudmark-Score: 0.000000 [] Received: from [82.116.76.134] (account mc467741@c2i.net HELO [192.168.1.106]) by mailfe05.swip.net (CommuniGate Pro SMTP 5.1.7) with ESMTPA id 391762318; Thu, 17 May 2007 10:27:52 +0200 From: Hans Petter Selasky To: Sepherosa Ziehau Date: Thu, 17 May 2007 10:27:40 +0200 User-Agent: KMail/1.9.5 References: <200705151133.l4FBXE1F006105@repoman.freebsd.org> In-Reply-To: <200705151133.l4FBXE1F006105@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200705171027.40294.hselasky@freebsd.org> Cc: Perforce Change Reviews Subject: Re: PERFORCE change 119878 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: Thu, 17 May 2007 09:27:56 -0000 Hi, 1) Maybe you should bump __FreeBSD_version when this is introduced into HEAD. 2) Are you sure that you want to do this? If you look at the implementation of "m_adj()" for a negative number it is not too efficient. With regard to "if_ural.c" it is faster to remove those bytes at an earlier point. And then just never set M_HASFCS at all. --HPS > > ==== //depot/projects/wifi/sys/dev/usb/if_ural.c#25 (text+ko) ==== > > @@ -939,7 +939,6 @@ > /* finalize mbuf */ > m->m_pkthdr.rcvif = ifp; > m->m_pkthdr.len = m->m_len = (le32toh(desc->flags) >> 16) & 0xfff; > - m->m_flags |= M_HASFCS; /* h/w leaves FCS */ > > if (bpf_peers_present(sc->sc_drvbpf)) { > struct ural_rx_radiotap_header *tap = &sc->sc_rxtap; > @@ -954,6 +953,9 @@ > bpf_mtap2(sc->sc_drvbpf, tap, sc->sc_rxtap_len, m); > } > > + /* Strip trailing 802.11 MAC FCS. */ > + m_adj(m, -IEEE80211_CRC_LEN); > + > wh = mtod(m, struct ieee80211_frame *); > ni = ieee80211_find_rxnode(ic, (struct ieee80211_frame_min *)wh); > > --HPS From owner-p4-projects@FreeBSD.ORG Thu May 17 14:20:42 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E1D616A413; Thu, 17 May 2007 14:20:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 454B216A411 for ; Thu, 17 May 2007 14:20:42 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 330C013C45A for ; Thu, 17 May 2007 14:20:42 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4HEKgfB020038 for ; Thu, 17 May 2007 14:20:42 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4HEKckf019997 for perforce@freebsd.org; Thu, 17 May 2007 14:20:38 GMT (envelope-from imp@freebsd.org) Date: Thu, 17 May 2007 14:20:38 GMT Message-Id: <200705171420.l4HEKckf019997@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 119970 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: Thu, 17 May 2007 14:20:43 -0000 http://perforce.freebsd.org/chv.cgi?CH=119970 Change 119970 by imp@imp_paco-paco on 2007/05/17 14:19:42 IFC @119967 Affected files ... .. //depot/projects/arm/src/sys/amd64/linux32/linux32_sysvec.c#15 integrate .. //depot/projects/arm/src/sys/cam/cam_periph.c#10 integrate .. //depot/projects/arm/src/sys/cam/cam_xpt.c#19 integrate .. //depot/projects/arm/src/sys/cam/cam_xpt.h#5 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_cd.c#8 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_ch.c#5 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_da.c#19 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_pass.c#6 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_pt.c#5 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_sa.c#7 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_ses.c#5 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_sg.c#5 integrate .. //depot/projects/arm/src/sys/cam/scsi/scsi_targ_bh.c#5 integrate .. //depot/projects/arm/src/sys/compat/ia32/ia32_sysvec.c#5 integrate .. //depot/projects/arm/src/sys/conf/Makefile.amd64#5 integrate .. //depot/projects/arm/src/sys/conf/Makefile.arm#18 integrate .. //depot/projects/arm/src/sys/conf/Makefile.i386#6 integrate .. //depot/projects/arm/src/sys/conf/Makefile.ia64#5 integrate .. //depot/projects/arm/src/sys/conf/Makefile.pc98#6 integrate .. //depot/projects/arm/src/sys/conf/Makefile.powerpc#5 integrate .. //depot/projects/arm/src/sys/conf/Makefile.sparc64#5 integrate .. //depot/projects/arm/src/sys/conf/Makefile.sun4v#3 integrate .. //depot/projects/arm/src/sys/conf/NOTES#48 integrate .. //depot/projects/arm/src/sys/conf/files#72 integrate .. //depot/projects/arm/src/sys/conf/options#45 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi.c#20 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpi_hpet.c#5 integrate .. //depot/projects/arm/src/sys/dev/acpica/acpivar.h#10 integrate .. //depot/projects/arm/src/sys/dev/bce/if_bce.c#18 integrate .. //depot/projects/arm/src/sys/dev/bce/if_bcefw.h#3 integrate .. //depot/projects/arm/src/sys/dev/bce/if_bcereg.h#8 integrate .. //depot/projects/arm/src/sys/dev/cardbus/cardbus.c#10 integrate .. //depot/projects/arm/src/sys/dev/cardbus/cardbus_cis.c#7 integrate .. //depot/projects/arm/src/sys/dev/ciss/ciss.c#14 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_80003es2lan.c#2 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_80003es2lan.h#2 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_82540.c#2 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_82541.c#2 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_82541.h#2 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_82542.c#2 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_82543.c#2 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_82543.h#2 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_82571.c#2 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_82571.h#2 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_82575.c#2 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_82575.h#2 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_api.c#2 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_api.h#2 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_defines.h#2 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_hw.h#2 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_ich8lan.c#2 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_ich8lan.h#2 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_mac.c#2 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_mac.h#2 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_manage.c#2 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_manage.h#2 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_nvm.c#2 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_nvm.h#2 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_osdep.h#2 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_phy.c#2 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_phy.h#2 integrate .. //depot/projects/arm/src/sys/dev/em/e1000_regs.h#2 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.c#38 integrate .. //depot/projects/arm/src/sys/dev/em/if_em.h#16 integrate .. //depot/projects/arm/src/sys/dev/mfi/mfi.c#16 integrate .. //depot/projects/arm/src/sys/dev/mfi/mfi_cam.c#1 branch .. //depot/projects/arm/src/sys/dev/mfi/mfireg.h#7 integrate .. //depot/projects/arm/src/sys/dev/mfi/mfivar.h#7 integrate .. //depot/projects/arm/src/sys/dev/mmc/mmc.c#24 integrate .. //depot/projects/arm/src/sys/dev/mmc/mmcsd.c#12 integrate .. //depot/projects/arm/src/sys/dev/mmc/mmcvar.h#3 integrate .. //depot/projects/arm/src/sys/dev/pccbb/pccbb.c#16 integrate .. //depot/projects/arm/src/sys/dev/pci/pci.c#28 integrate .. //depot/projects/arm/src/sys/dev/pci/pci_private.h#12 integrate .. //depot/projects/arm/src/sys/dev/pci/pcireg.h#12 integrate .. //depot/projects/arm/src/sys/dev/uart/uart_bus_pci.c#7 integrate .. //depot/projects/arm/src/sys/geom/part/g_part.c#4 integrate .. //depot/projects/arm/src/sys/kern/imgact_elf.c#9 integrate .. //depot/projects/arm/src/sys/kern/kern_exec.c#17 integrate .. //depot/projects/arm/src/sys/kern/kern_exit.c#22 integrate .. //depot/projects/arm/src/sys/kern/kern_mib.c#6 integrate .. //depot/projects/arm/src/sys/kern/kern_resource.c#16 integrate .. //depot/projects/arm/src/sys/kern/uipc_domain.c#6 integrate .. //depot/projects/arm/src/sys/kern/uipc_mbuf.c#19 integrate .. //depot/projects/arm/src/sys/kern/uipc_sockbuf.c#8 integrate .. //depot/projects/arm/src/sys/kern/uipc_socket.c#37 integrate .. //depot/projects/arm/src/sys/kern/uipc_syscalls.c#24 integrate .. //depot/projects/arm/src/sys/modules/mfi/Makefile#5 integrate .. //depot/projects/arm/src/sys/modules/mfi/mfip/Makefile#1 branch .. //depot/projects/arm/src/sys/modules/netgraph/Makefile#6 integrate .. //depot/projects/arm/src/sys/modules/netgraph/car/Makefile#1 branch .. //depot/projects/arm/src/sys/net/ieee8023ad_lacp.c#4 integrate .. //depot/projects/arm/src/sys/net/ieee8023ad_lacp.h#3 integrate .. //depot/projects/arm/src/sys/net/if.c#21 integrate .. //depot/projects/arm/src/sys/net/if.h#10 integrate .. //depot/projects/arm/src/sys/net/if_lagg.c#4 integrate .. //depot/projects/arm/src/sys/net/if_lagg.h#4 integrate .. //depot/projects/arm/src/sys/net/if_var.h#10 integrate .. //depot/projects/arm/src/sys/netgraph/ng_car.c#1 branch .. //depot/projects/arm/src/sys/netgraph/ng_car.h#1 branch .. //depot/projects/arm/src/sys/netinet/ip_input.c#19 integrate .. //depot/projects/arm/src/sys/netinet/sctp.h#6 integrate .. //depot/projects/arm/src/sys/netinet/sctp_asconf.c#9 integrate .. //depot/projects/arm/src/sys/netinet/sctp_auth.c#9 integrate .. //depot/projects/arm/src/sys/netinet/sctp_constants.h#11 integrate .. //depot/projects/arm/src/sys/netinet/sctp_indata.c#14 integrate .. //depot/projects/arm/src/sys/netinet/sctp_input.c#14 integrate .. //depot/projects/arm/src/sys/netinet/sctp_output.c#14 integrate .. //depot/projects/arm/src/sys/netinet/sctp_pcb.c#14 integrate .. //depot/projects/arm/src/sys/netinet/sctp_sysctl.c#4 integrate .. //depot/projects/arm/src/sys/netinet/sctp_timer.c#10 integrate .. //depot/projects/arm/src/sys/netinet/sctp_uio.h#12 integrate .. //depot/projects/arm/src/sys/netinet/sctp_usrreq.c#14 integrate .. //depot/projects/arm/src/sys/netinet/sctputil.c#14 integrate .. //depot/projects/arm/src/sys/netinet/tcp_input.c#30 integrate .. //depot/projects/arm/src/sys/netinet/tcp_subr.c#25 integrate .. //depot/projects/arm/src/sys/netinet/tcp_timer.c#16 integrate .. //depot/projects/arm/src/sys/netinet/tcp_timer.h#8 integrate .. //depot/projects/arm/src/sys/netinet/tcp_timewait.c#2 integrate .. //depot/projects/arm/src/sys/netinet/tcp_var.h#19 integrate .. //depot/projects/arm/src/sys/netinet/udp_usrreq.c#20 integrate .. //depot/projects/arm/src/sys/netinet6/ip6_input.c#10 integrate .. //depot/projects/arm/src/sys/netinet6/sctp6_usrreq.c#12 integrate .. //depot/projects/arm/src/sys/sys/sysent.h#9 integrate Differences ... ==== //depot/projects/arm/src/sys/amd64/linux32/linux32_sysvec.c#15 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.28 2007/04/02 18:38:12 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.29 2007/05/14 22:40:04 jhb Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -121,7 +121,7 @@ static void linux_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask); static void exec_linux_setregs(struct thread *td, u_long entry, u_long stack, u_long ps_strings); -static void linux32_fixlimits(struct proc *p); +static void linux32_fixlimit(struct rlimit *rl, int which); extern LIST_HEAD(futex_list, futex) futex_list; extern struct sx futex_sx; @@ -965,42 +965,36 @@ SYSCTL_ULONG(_compat_linux32, OID_AUTO, maxvmem, CTLFLAG_RW, &linux32_maxvmem, 0, ""); -/* - * XXX copied from ia32_sysvec.c. - */ static void -linux32_fixlimits(struct proc *p) +linux32_fixlimit(struct rlimit *rl, int which) { - struct plimit *oldlim, *newlim; - if (linux32_maxdsiz == 0 && linux32_maxssiz == 0 && - linux32_maxvmem == 0) - return; - newlim = lim_alloc(); - PROC_LOCK(p); - oldlim = p->p_limit; - lim_copy(newlim, oldlim); - if (linux32_maxdsiz != 0) { - if (newlim->pl_rlimit[RLIMIT_DATA].rlim_cur > linux32_maxdsiz) - newlim->pl_rlimit[RLIMIT_DATA].rlim_cur = linux32_maxdsiz; - if (newlim->pl_rlimit[RLIMIT_DATA].rlim_max > linux32_maxdsiz) - newlim->pl_rlimit[RLIMIT_DATA].rlim_max = linux32_maxdsiz; - } - if (linux32_maxssiz != 0) { - if (newlim->pl_rlimit[RLIMIT_STACK].rlim_cur > linux32_maxssiz) - newlim->pl_rlimit[RLIMIT_STACK].rlim_cur = linux32_maxssiz; - if (newlim->pl_rlimit[RLIMIT_STACK].rlim_max > linux32_maxssiz) - newlim->pl_rlimit[RLIMIT_STACK].rlim_max = linux32_maxssiz; - } - if (linux32_maxvmem != 0) { - if (newlim->pl_rlimit[RLIMIT_VMEM].rlim_cur > linux32_maxvmem) - newlim->pl_rlimit[RLIMIT_VMEM].rlim_cur = linux32_maxvmem; - if (newlim->pl_rlimit[RLIMIT_VMEM].rlim_max > linux32_maxvmem) - newlim->pl_rlimit[RLIMIT_VMEM].rlim_max = linux32_maxvmem; + switch (which) { + case RLIMIT_DATA: + if (linux32_maxdsiz != 0) { + if (rl->rlim_cur > linux32_maxdsiz) + rl->rlim_cur = linux32_maxdsiz; + if (rl->rlim_max > linux32_maxdsiz) + rl->rlim_max = linux32_maxdsiz; + } + break; + case RLIMIT_STACK: + if (linux32_maxssiz != 0) { + if (rl->rlim_cur > linux32_maxssiz) + rl->rlim_cur = linux32_maxssiz; + if (rl->rlim_max > linux32_maxssiz) + rl->rlim_max = linux32_maxssiz; + } + break; + case RLIMIT_VMEM: + if (linux32_maxvmem != 0) { + if (rl->rlim_cur > linux32_maxvmem) + rl->rlim_cur = linux32_maxvmem; + if (rl->rlim_max > linux32_maxvmem) + rl->rlim_max = linux32_maxvmem; + } + break; } - p->p_limit = newlim; - PROC_UNLOCK(p); - lim_free(oldlim); } struct sysentvec elf_linux_sysvec = { @@ -1029,7 +1023,7 @@ VM_PROT_ALL, linux_copyout_strings, exec_linux_setregs, - linux32_fixlimits + linux32_fixlimit }; static Elf32_Brandinfo linux_brand = { ==== //depot/projects/arm/src/sys/cam/cam_periph.c#10 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.68 2007/04/19 23:34:51 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.69 2007/05/14 21:48:52 scottl Exp $"); #include #include @@ -102,7 +102,8 @@ int ndrivers; ndrivers = nperiph_drivers + 2; - newdrivers = malloc(sizeof(*newdrivers) * ndrivers, M_TEMP, M_WAITOK); + newdrivers = malloc(sizeof(*newdrivers) * ndrivers, M_CAMPERIPH, + M_WAITOK); if (periph_drivers) bcopy(periph_drivers, newdrivers, sizeof(*newdrivers) * nperiph_drivers); @@ -111,7 +112,7 @@ old = periph_drivers; periph_drivers = newdrivers; if (old) - free(old, M_TEMP); + free(old, M_CAMPERIPH); nperiph_drivers++; } ==== //depot/projects/arm/src/sys/cam/cam_xpt.c#19 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.183 2007/04/27 14:23:05 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.187 2007/05/16 16:57:21 scottl Exp $"); #include #include @@ -1197,6 +1197,7 @@ error = ENOTSUP; break; } + xpt_release_bus(bus); break; } /* @@ -1533,7 +1534,7 @@ */ xsoftc.xpt_config_hook = (struct intr_config_hook *)malloc(sizeof(struct intr_config_hook), - M_TEMP, M_NOWAIT | M_ZERO); + M_CAMXPT, M_NOWAIT | M_ZERO); if (xsoftc.xpt_config_hook == NULL) { printf("xpt_init: Cannot malloc config hook " "- failing attach\n"); @@ -1542,7 +1543,7 @@ xsoftc.xpt_config_hook->ich_func = xpt_config; if (config_intrhook_establish(xsoftc.xpt_config_hook) != 0) { - free (xsoftc.xpt_config_hook, M_TEMP); + free (xsoftc.xpt_config_hook, M_CAMXPT); printf("xpt_init: config_intrhook_establish failed " "- failing attach\n"); } @@ -4139,7 +4140,6 @@ void xpt_print_path(struct cam_path *path) { - mtx_assert(path->bus->sim->mtx, MA_OWNED); if (path == NULL) printf("(nopath): "); @@ -5243,7 +5243,7 @@ /* Save some state for use while we probe for devices */ scan_info = (xpt_scan_bus_info *) - malloc(sizeof(xpt_scan_bus_info), M_TEMP, M_NOWAIT); + malloc(sizeof(xpt_scan_bus_info), M_CAMXPT, M_NOWAIT); scan_info->request_ccb = request_ccb; scan_info->cpi = &work_ccb->cpi; @@ -5277,7 +5277,7 @@ printf("xpt_scan_bus: xpt_create_path failed" " with status %#x, bus scan halted\n", status); - free(scan_info, M_TEMP); + free(scan_info, M_CAMXPT); request_ccb->ccb_h.status = status; xpt_free_ccb(work_ccb); xpt_done(request_ccb); @@ -5285,7 +5285,7 @@ } work_ccb = xpt_alloc_ccb_nowait(); if (work_ccb == NULL) { - free(scan_info, M_TEMP); + free(scan_info, M_CAMXPT); xpt_free_path(path); request_ccb->ccb_h.status = CAM_RESRC_UNAVAIL; xpt_done(request_ccb); @@ -5398,7 +5398,7 @@ xpt_free_ccb(request_ccb); xpt_free_ccb((union ccb *)scan_info->cpi); request_ccb = scan_info->request_ccb; - free(scan_info, M_TEMP); + free(scan_info, M_CAMXPT); request_ccb->ccb_h.status = CAM_REQ_CMP; xpt_done(request_ccb); break; @@ -5417,7 +5417,7 @@ xpt_free_ccb(request_ccb); xpt_free_ccb((union ccb *)scan_info->cpi); request_ccb = scan_info->request_ccb; - free(scan_info, M_TEMP); + free(scan_info, M_CAMXPT); request_ccb->ccb_h.status = status; xpt_done(request_ccb); break; @@ -5518,17 +5518,17 @@ } if (request_ccb == NULL) { - request_ccb = malloc(sizeof(union ccb), M_TEMP, M_NOWAIT); + request_ccb = malloc(sizeof(union ccb), M_CAMXPT, M_NOWAIT); if (request_ccb == NULL) { xpt_print(path, "xpt_scan_lun: can't allocate CCB, " "can't continue\n"); return; } - new_path = malloc(sizeof(*new_path), M_TEMP, M_NOWAIT); + new_path = malloc(sizeof(*new_path), M_CAMXPT, M_NOWAIT); if (new_path == NULL) { xpt_print(path, "xpt_scan_lun: can't allocate path, " "can't continue\n"); - free(request_ccb, M_TEMP); + free(request_ccb, M_CAMXPT); return; } status = xpt_compile_path(new_path, xpt_periph, @@ -5539,8 +5539,8 @@ if (status != CAM_REQ_CMP) { xpt_print(path, "xpt_scan_lun: can't compile path, " "can't continue\n"); - free(request_ccb, M_TEMP); - free(new_path, M_TEMP); + free(request_ccb, M_CAMXPT); + free(new_path, M_CAMXPT); return; } xpt_setup_ccb(&request_ccb->ccb_h, new_path, /*priority*/ 1); @@ -5575,8 +5575,8 @@ xptscandone(struct cam_periph *periph, union ccb *done_ccb) { xpt_release_path(done_ccb->ccb_h.path); - free(done_ccb->ccb_h.path, M_TEMP); - free(done_ccb, M_TEMP); + free(done_ccb->ccb_h.path, M_CAMXPT); + free(done_ccb, M_CAMXPT); } static cam_status @@ -5598,7 +5598,7 @@ return(CAM_REQ_CMP_ERR); } - softc = (probe_softc *)malloc(sizeof(*softc), M_TEMP, M_NOWAIT); + softc = (probe_softc *)malloc(sizeof(*softc), M_CAMXPT, M_NOWAIT); if (softc == NULL) { printf("proberegister: Unable to probe new device. " @@ -5751,7 +5751,7 @@ if (softc->action == PROBE_INQUIRY_BASIC_DV1 || softc->action == PROBE_INQUIRY_BASIC_DV2) { - inq_buf = malloc(inquiry_len, M_TEMP, M_NOWAIT); + inq_buf = malloc(inquiry_len, M_CAMXPT, M_NOWAIT); } if (inq_buf == NULL) { xpt_print(periph->path, "malloc failure- skipping Basic" @@ -5785,7 +5785,7 @@ mode_buf_len = sizeof(struct scsi_mode_header_6) + sizeof(struct scsi_mode_blk_desc) + sizeof(struct scsi_control_page); - mode_buf = malloc(mode_buf_len, M_TEMP, M_NOWAIT); + mode_buf = malloc(mode_buf_len, M_CAMXPT, M_NOWAIT); if (mode_buf != NULL) { scsi_mode_sense(csio, /*retries*/4, @@ -5817,7 +5817,7 @@ if ((device->quirk->quirks & CAM_QUIRK_NOSERIAL) == 0) serial_buf = (struct scsi_vpd_unit_serial_number *) - malloc(sizeof(*serial_buf), M_TEMP, + malloc(sizeof(*serial_buf), M_CAMXPT, M_NOWAIT | M_ZERO); if (serial_buf != NULL) { @@ -6107,7 +6107,7 @@ /*count*/1, /*run_queue*/TRUE); } xpt_release_ccb(done_ccb); - free(mode_hdr, M_TEMP); + free(mode_hdr, M_CAMXPT); softc->action = PROBE_SERIAL_NUM; xpt_schedule(periph, priority); return; @@ -6194,7 +6194,7 @@ xpt_async(AC_LOST_DEVICE, path, NULL); } if (serial_buf != NULL) - free(serial_buf, M_TEMP); + free(serial_buf, M_CAMXPT); if (changed != 0) { /* @@ -6283,12 +6283,12 @@ /* give up */ softc->action = PROBE_DV_EXIT; } - free(nbuf, M_TEMP); + free(nbuf, M_CAMXPT); xpt_release_ccb(done_ccb); xpt_schedule(periph, priority); return; } - free(nbuf, M_TEMP); + free(nbuf, M_CAMXPT); if (softc->action == PROBE_INQUIRY_BASIC_DV1) { softc->action = PROBE_INQUIRY_BASIC_DV2; xpt_release_ccb(done_ccb); @@ -6327,7 +6327,7 @@ static void probecleanup(struct cam_periph *periph) { - free(periph->softc, M_TEMP); + free(periph->softc, M_CAMXPT); } static void @@ -6984,7 +6984,7 @@ /* Release our hook so that the boot can continue. */ config_intrhook_disestablish(xsoftc.xpt_config_hook); - free(xsoftc.xpt_config_hook, M_TEMP); + free(xsoftc.xpt_config_hook, M_CAMXPT); xsoftc.xpt_config_hook = NULL; } @@ -7029,6 +7029,39 @@ xpt_free_ccb(done_ccb); } +cam_status +xpt_register_async(int event, ac_callback_t *cbfunc, void *cbarg, + struct cam_path *path) +{ + struct ccb_setasync csa; + cam_status status; + int xptpath = 0; + + if (path == NULL) { + mtx_lock(&xsoftc.xpt_lock); + status = xpt_create_path(&path, /*periph*/NULL, CAM_XPT_PATH_ID, + CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD); + if (status != CAM_REQ_CMP) { + mtx_unlock(&xsoftc.xpt_lock); + return (status); + } + xptpath = 1; + } + + xpt_setup_ccb(&csa.ccb_h, path, /*priority*/5); + csa.ccb_h.func_code = XPT_SASYNC_CB; + csa.event_enable = event; + csa.callback = cbfunc; + csa.callback_arg = cbarg; + xpt_action((union ccb *)&csa); + status = csa.ccb_h.status; + if (xptpath) { + xpt_free_path(path); + mtx_unlock(&xsoftc.xpt_lock); + } + return (status); +} + static void xptaction(struct cam_sim *sim, union ccb *work_ccb) { ==== //depot/projects/arm/src/sys/cam/cam_xpt.h#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_xpt.h,v 1.8 2007/04/15 08:49:09 scottl Exp $ + * $FreeBSD: src/sys/cam/cam_xpt.h,v 1.9 2007/05/16 16:54:23 scottl Exp $ */ #ifndef _CAM_CAM_XPT_H @@ -79,6 +79,8 @@ void xpt_rescan(union ccb *ccb); void xpt_lock_buses(void); void xpt_unlock_buses(void); +cam_status xpt_register_async(int event, ac_callback_t *cbfunc, + void *cbarg, struct cam_path *path); #endif /* _KERNEL */ #endif /* _CAM_CAM_XPT_H */ ==== //depot/projects/arm/src/sys/cam/scsi/scsi_cd.c#8 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.99 2007/04/16 19:41:14 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.101 2007/05/16 16:54:23 scottl Exp $"); #include "opt_cd.h" @@ -329,11 +329,12 @@ static STAILQ_HEAD(changerlist, cdchanger) changerq; static int num_changers; +MALLOC_DEFINE(M_SCSICD, "scsi_cd", "scsi_cd buffers"); + static void cdinit(void) { cam_status status; - struct cam_path *path; mtx_init(&changerq_mtx, "cdchangerq", "SCSI CD Changer List", MTX_DEF); STAILQ_INIT(&changerq); @@ -342,22 +343,8 @@ * Install a global async callback. This callback will * receive async callbacks like "new device found". */ - status = xpt_create_path(&path, /*periph*/NULL, CAM_XPT_PATH_ID, - CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD); - - if (status == CAM_REQ_CMP) { - struct ccb_setasync csa; + status = xpt_register_async(AC_FOUND_DEVICE, cdasync, NULL, NULL); - xpt_setup_ccb(&csa.ccb_h, path, /*priority*/5); - csa.ccb_h.func_code = XPT_SASYNC_CB; - csa.event_enable = AC_FOUND_DEVICE; - csa.callback = cdasync; - csa.callback_arg = NULL; - xpt_action((union ccb *)&csa); - status = csa.ccb_h.status; - xpt_free_path(path); - } - if (status != CAM_REQ_CMP) { printf("cd: Failed to attach master async callback " "due to status 0x%x!\n", status); @@ -368,20 +355,13 @@ cdoninvalidate(struct cam_periph *periph) { struct cd_softc *softc; - struct ccb_setasync csa; softc = (struct cd_softc *)periph->softc; /* * De-register any async callbacks. */ - xpt_setup_ccb(&csa.ccb_h, periph->path, - /* priority */ 5); - csa.ccb_h.func_code = XPT_SASYNC_CB; - csa.event_enable = 0; - csa.callback = cdasync; - csa.callback_arg = periph; - xpt_action((union ccb *)&csa); + xpt_register_async(0, cdasync, periph, periph->path); softc->flags |= CD_FLAG_INVALID; @@ -637,7 +617,6 @@ cdregister(struct cam_periph *periph, void *arg) { struct cd_softc *softc; - struct ccb_setasync csa; struct ccb_pathinq cpi; struct ccb_getdev *cgd; char tmpstr[80]; @@ -749,13 +728,8 @@ * Add an async callback so that we get * notified if this device goes away. */ - xpt_setup_ccb(&csa.ccb_h, periph->path, - /* priority */ 5); - csa.ccb_h.func_code = XPT_SASYNC_CB; - csa.event_enable = AC_SENT_BDR | AC_BUS_RESET | AC_LOST_DEVICE; - csa.callback = cdasync; - csa.callback_arg = periph; - xpt_action((union ccb *)&csa); + xpt_register_async(AC_SENT_BDR | AC_BUS_RESET | AC_LOST_DEVICE, + cdasync, periph, periph->path); /* * If the target lun is greater than 0, we most likely have a CD @@ -1519,7 +1493,7 @@ { rcap = (struct scsi_read_capacity_data *)malloc(sizeof(*rcap), - M_TEMP, + M_SCSICD, M_NOWAIT); if (rcap == NULL) { xpt_print(periph->path, @@ -1778,7 +1752,7 @@ } } } - free(rdcap, M_TEMP); + free(rdcap, M_SCSICD); if (announce_buf[0] != '\0') { xpt_announce_periph(periph, announce_buf); if (softc->flags & CD_FLAG_CHANGER) @@ -1906,7 +1880,7 @@ union cd_pages *page; params.alloc_len = sizeof(union cd_mode_data_6_10); - params.mode_buf = malloc(params.alloc_len, M_TEMP, + params.mode_buf = malloc(params.alloc_len, M_SCSICD, M_WAITOK | M_ZERO); cam_periph_lock(periph); @@ -1915,7 +1889,7 @@ error = cdgetmode(periph, ¶ms, AUDIO_PAGE); if (error) { - free(params.mode_buf, M_TEMP); + free(params.mode_buf, M_SCSICD); cam_periph_unlock(periph); break; } @@ -1924,7 +1898,7 @@ page->audio.flags &= ~CD_PA_SOTC; page->audio.flags |= CD_PA_IMMED; error = cdsetmode(periph, ¶ms); - free(params.mode_buf, M_TEMP); + free(params.mode_buf, M_SCSICD); if (error) { cam_periph_unlock(periph); break; @@ -2001,7 +1975,7 @@ union cd_pages *page; params.alloc_len = sizeof(union cd_mode_data_6_10); - params.mode_buf = malloc(params.alloc_len, M_TEMP, + params.mode_buf = malloc(params.alloc_len, M_SCSICD, M_WAITOK | M_ZERO); cam_periph_lock(periph); @@ -2010,7 +1984,7 @@ error = cdgetmode(periph, ¶ms, AUDIO_PAGE); if (error) { - free(params.mode_buf, M_TEMP); + free(params.mode_buf, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2019,7 +1993,7 @@ page->audio.flags &= ~CD_PA_SOTC; page->audio.flags |= CD_PA_IMMED; error = cdsetmode(periph, ¶ms); - free(params.mode_buf, M_TEMP); + free(params.mode_buf, M_SCSICD); if (error) { cam_periph_unlock(periph); break; @@ -2042,7 +2016,7 @@ union cd_pages *page; params.alloc_len = sizeof(union cd_mode_data_6_10); - params.mode_buf = malloc(params.alloc_len, M_TEMP, + params.mode_buf = malloc(params.alloc_len, M_SCSICD, M_WAITOK | M_ZERO); cam_periph_lock(periph); @@ -2052,7 +2026,7 @@ error = cdgetmode(periph, ¶ms, AUDIO_PAGE); if (error) { - free(params.mode_buf, M_TEMP); + free(params.mode_buf, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2061,7 +2035,7 @@ page->audio.flags &= ~CD_PA_SOTC; page->audio.flags |= CD_PA_IMMED; error = cdsetmode(periph, ¶ms); - free(params.mode_buf, M_TEMP); + free(params.mode_buf, M_SCSICD); if (error) { cam_periph_unlock(periph); break; @@ -2081,7 +2055,7 @@ u_int32_t len = args->data_len; data = malloc(sizeof(struct cd_sub_channel_info), - M_TEMP, M_WAITOK); + M_SCSICD, M_WAITOK); cam_periph_lock(periph); CAM_DEBUG(periph->path, CAM_DEBUG_SUBTRACE, @@ -2094,7 +2068,7 @@ "cdioreadsubchannel: error, len=%d\n", len); error = EINVAL; - free(data, M_TEMP); + free(data, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2106,7 +2080,7 @@ args->data_format, args->track, data, len); if (error) { - free(data, M_TEMP); + free(data, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2124,7 +2098,7 @@ } else { bcopy(data, args->data, len); } - free(data, M_TEMP); + free(data, M_SCSICD); } break; @@ -2132,7 +2106,7 @@ { struct ioc_toc_header *th; - th = malloc(sizeof(struct ioc_toc_header), M_TEMP, + th = malloc(sizeof(struct ioc_toc_header), M_SCSICD, M_WAITOK); cam_periph_lock(periph); @@ -2142,7 +2116,7 @@ error = cdreadtoc(periph, 0, 0, (u_int8_t *)th, sizeof (*th), /*sense_flags*/0); if (error) { - free(th, M_TEMP); + free(th, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2156,7 +2130,7 @@ } th->len = ntohs(th->len); bcopy(th, addr, sizeof(*th)); - free(th, M_TEMP); + free(th, M_SCSICD); cam_periph_unlock(periph); } break; @@ -2170,8 +2144,8 @@ u_int32_t len, readlen, idx, num; u_int32_t starting_track = te->starting_track; - data = malloc(sizeof(*data), M_TEMP, M_WAITOK); - lead = malloc(sizeof(*lead), M_TEMP, M_WAITOK); + data = malloc(sizeof(*data), M_SCSICD, M_WAITOK); + lead = malloc(sizeof(*lead), M_SCSICD, M_WAITOK); cam_periph_lock(periph); CAM_DEBUG(periph->path, CAM_DEBUG_SUBTRACE, @@ -2184,8 +2158,8 @@ error = EINVAL; printf("scsi_cd: error in readtocentries, " "returning EINVAL\n"); - free(data, M_TEMP); - free(lead, M_TEMP); + free(data, M_SCSICD); + free(lead, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2194,8 +2168,8 @@ error = cdreadtoc(periph, 0, 0, (u_int8_t *)th, sizeof (*th), /*sense_flags*/0); if (error) { - free(data, M_TEMP); - free(lead, M_TEMP); + free(data, M_SCSICD); + free(lead, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2217,8 +2191,8 @@ starting_track > th->ending_track + 1) { printf("scsi_cd: error in readtocentries, " "returning EINVAL\n"); - free(data, M_TEMP); - free(lead, M_TEMP); + free(data, M_SCSICD); + free(lead, M_SCSICD); cam_periph_unlock(periph); error = EINVAL; break; @@ -2239,8 +2213,8 @@ printf("scsi_cd: error in readtocentries, " "returning EINVAL\n"); error = EINVAL; - free(data, M_TEMP); - free(lead, M_TEMP); + free(data, M_SCSICD); + free(lead, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2253,8 +2227,8 @@ readlen + sizeof (*th), /*sense_flags*/0); if (error) { - free(data, M_TEMP); - free(lead, M_TEMP); + free(data, M_SCSICD); + free(lead, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2270,8 +2244,8 @@ sizeof(*lead), /*sense_flags*/0); if (error) { - free(data, M_TEMP); - free(lead, M_TEMP); + free(data, M_SCSICD); + free(lead, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2287,8 +2261,8 @@ cam_periph_unlock(periph); error = copyout(data->entries, te->data, len); - free(data, M_TEMP); - free(lead, M_TEMP); + free(data, M_SCSICD); + free(lead, M_SCSICD); } break; case CDIOREADTOCENTRY: @@ -2299,7 +2273,7 @@ struct ioc_toc_header *th; u_int32_t track; - data = malloc(sizeof(*data), M_TEMP, M_WAITOK); + data = malloc(sizeof(*data), M_SCSICD, M_WAITOK); cam_periph_lock(periph); CAM_DEBUG(periph->path, CAM_DEBUG_SUBTRACE, @@ -2309,7 +2283,7 @@ && te->address_format != CD_LBA_FORMAT) { printf("error in readtocentry, " " returning EINVAL\n"); - free(data, M_TEMP); + free(data, M_SCSICD); error = EINVAL; cam_periph_unlock(periph); break; @@ -2319,7 +2293,7 @@ error = cdreadtoc(periph, 0, 0, (u_int8_t *)th, sizeof (*th), /*sense_flags*/0); if (error) { - free(data, M_TEMP); + free(data, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2341,7 +2315,7 @@ track > th->ending_track + 1) { printf("error in readtocentry, " " returning EINVAL\n"); - free(data, M_TEMP); + free(data, M_SCSICD); error = EINVAL; cam_periph_unlock(periph); break; @@ -2351,7 +2325,7 @@ (u_int8_t *)data, sizeof(*data), /*sense_flags*/0); if (error) { - free(data, M_TEMP); + free(data, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2360,7 +2334,7 @@ data->entry.track = bcd2bin(data->entry.track); bcopy(&data->entry, &te->entry, sizeof(struct cd_toc_entry)); - free(data, M_TEMP); + free(data, M_SCSICD); cam_periph_unlock(periph); } break; @@ -2371,7 +2345,7 @@ union cd_pages *page; params.alloc_len = sizeof(union cd_mode_data_6_10); - params.mode_buf = malloc(params.alloc_len, M_TEMP, + params.mode_buf = malloc(params.alloc_len, M_SCSICD, M_WAITOK | M_ZERO); cam_periph_lock(periph); @@ -2380,7 +2354,7 @@ error = cdgetmode(periph, ¶ms, AUDIO_PAGE); if (error) { - free(params.mode_buf, M_TEMP); + free(params.mode_buf, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2393,7 +2367,7 @@ page->audio.port[2].channels = arg->patch[2]; page->audio.port[3].channels = arg->patch[3]; error = cdsetmode(periph, ¶ms); - free(params.mode_buf, M_TEMP); + free(params.mode_buf, M_SCSICD); cam_periph_unlock(periph); } break; @@ -2404,7 +2378,7 @@ union cd_pages *page; params.alloc_len = sizeof(union cd_mode_data_6_10); - params.mode_buf = malloc(params.alloc_len, M_TEMP, + params.mode_buf = malloc(params.alloc_len, M_SCSICD, M_WAITOK | M_ZERO); cam_periph_lock(periph); @@ -2413,7 +2387,7 @@ error = cdgetmode(periph, ¶ms, AUDIO_PAGE); if (error) { - free(params.mode_buf, M_TEMP); + free(params.mode_buf, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2425,7 +2399,7 @@ page->audio.port[RIGHT_PORT].volume; arg->vol[2] = page->audio.port[2].volume; arg->vol[3] = page->audio.port[3].volume; - free(params.mode_buf, M_TEMP); + free(params.mode_buf, M_SCSICD); cam_periph_unlock(periph); } break; @@ -2436,7 +2410,7 @@ union cd_pages *page; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu May 17 14:29:57 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3767216A405; Thu, 17 May 2007 14:29:57 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id EAF0716A403 for ; Thu, 17 May 2007 14:29:56 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D963B13C44B for ; Thu, 17 May 2007 14:29:56 +0000 (UTC) (envelope-from rpaulo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4HETuGC027780 for ; Thu, 17 May 2007 14:29:56 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4HETroI027735 for perforce@freebsd.org; Thu, 17 May 2007 14:29:53 GMT (envelope-from rpaulo@FreeBSD.org) Date: Thu, 17 May 2007 14:29:53 GMT Message-Id: <200705171429.l4HETroI027735@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo To: Perforce Change Reviews Cc: Subject: PERFORCE change 119971 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: Thu, 17 May 2007 14:29:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=119971 Change 119971 by rpaulo@rpaulo_epsilon on 2007/05/17 14:29:48 IFC Affected files ... .. //depot/projects/soc2007/rpaulo-macbook/amd64/linux32/linux32_sysvec.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/cam/cam_periph.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/cam/cam_xpt.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/cam/cam_xpt.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_ch.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_pt.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_sa.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_sg.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_targ_bh.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/Makefile.amd64#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/Makefile.arm#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/Makefile.i386#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/Makefile.ia64#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/Makefile.pc98#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/Makefile.powerpc#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/Makefile.sparc64#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/Makefile.sun4v#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/NOTES#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/files#9 integrate .. //depot/projects/soc2007/rpaulo-macbook/conf/options#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/acpica/acpi.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/acpica/acpivar.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/bce/if_bce.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/bce/if_bcefw.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/bce/if_bcereg.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cardbus/cardbus.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/cardbus/cardbus_cis.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/ciss/ciss.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_80003es2lan.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_80003es2lan.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_82540.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_82541.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_82541.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_82542.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_82543.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_82543.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_82571.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_82571.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_82575.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_82575.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_api.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_api.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_defines.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_hw.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_ich8lan.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_ich8lan.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_mac.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_mac.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_manage.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_manage.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_nvm.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_nvm.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_osdep.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_phy.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_phy.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_regs.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/em/if_em.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/em/if_em.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/isp/isp_freebsd.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mfi/mfi.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mfi/mfi_cam.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/dev/mfi/mfireg.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mfi/mfivar.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mmc/mmc.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mmc/mmcsd.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/mmc/mmcvar.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/pccbb/pccbb.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/pci/pci.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/pci/pci_private.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/pci/pcireg.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/uart/uart_bus_pci.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_axe.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_cue.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_cuereg.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_kue.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_kuereg.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_rue.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_ruereg.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_udav.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/uhid.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ukbd.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ums.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb_mem.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/geom/part/g_part.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/i386/Makefile#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/Make.tags.inc#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/imgact_elf.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_exec.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_exit.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_mib.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_resource.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/kern_timeout.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/uipc_domain.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/uipc_mbuf.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/uipc_sockbuf.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/uipc_socket.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/kern/uipc_syscalls.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/modules/mfi/Makefile#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/modules/mfi/mfip/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/modules/netgraph/Makefile#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/modules/netgraph/car/Makefile#1 branch .. //depot/projects/soc2007/rpaulo-macbook/net/ethernet.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/net/ieee8023ad_lacp.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/net/ieee8023ad_lacp.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/net/if.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/net/if.h#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/net/if_lagg.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/net/if_lagg.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/net/if_var.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netgraph/ng_car.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/netgraph/ng_car.h#1 branch .. //depot/projects/soc2007/rpaulo-macbook/netinet/ip_input.c#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp.h#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_asconf.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_auth.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_constants.h#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_indata.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_input.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_output.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_pcb.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_sysctl.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_timer.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_uio.h#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctp_usrreq.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/sctputil.c#6 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_input.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_reass.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_subr.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_timer.c#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_timer.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_timewait.c#1 branch .. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_var.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet/udp_usrreq.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/ip6_input.c#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/netinet6/sctp6_usrreq.c#5 integrate .. //depot/projects/soc2007/rpaulo-macbook/pc98/conf/GENERIC#3 integrate .. //depot/projects/soc2007/rpaulo-macbook/sparc64/include/profile.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sun4v/include/profile.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/callout.h#2 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/param.h#4 integrate .. //depot/projects/soc2007/rpaulo-macbook/sys/sysent.h#2 integrate Differences ... ==== //depot/projects/soc2007/rpaulo-macbook/amd64/linux32/linux32_sysvec.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.28 2007/04/02 18:38:12 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.29 2007/05/14 22:40:04 jhb Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -121,7 +121,7 @@ static void linux_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask); static void exec_linux_setregs(struct thread *td, u_long entry, u_long stack, u_long ps_strings); -static void linux32_fixlimits(struct proc *p); +static void linux32_fixlimit(struct rlimit *rl, int which); extern LIST_HEAD(futex_list, futex) futex_list; extern struct sx futex_sx; @@ -965,42 +965,36 @@ SYSCTL_ULONG(_compat_linux32, OID_AUTO, maxvmem, CTLFLAG_RW, &linux32_maxvmem, 0, ""); -/* - * XXX copied from ia32_sysvec.c. - */ static void -linux32_fixlimits(struct proc *p) +linux32_fixlimit(struct rlimit *rl, int which) { - struct plimit *oldlim, *newlim; - if (linux32_maxdsiz == 0 && linux32_maxssiz == 0 && - linux32_maxvmem == 0) - return; - newlim = lim_alloc(); - PROC_LOCK(p); - oldlim = p->p_limit; - lim_copy(newlim, oldlim); - if (linux32_maxdsiz != 0) { - if (newlim->pl_rlimit[RLIMIT_DATA].rlim_cur > linux32_maxdsiz) - newlim->pl_rlimit[RLIMIT_DATA].rlim_cur = linux32_maxdsiz; - if (newlim->pl_rlimit[RLIMIT_DATA].rlim_max > linux32_maxdsiz) - newlim->pl_rlimit[RLIMIT_DATA].rlim_max = linux32_maxdsiz; - } - if (linux32_maxssiz != 0) { - if (newlim->pl_rlimit[RLIMIT_STACK].rlim_cur > linux32_maxssiz) - newlim->pl_rlimit[RLIMIT_STACK].rlim_cur = linux32_maxssiz; - if (newlim->pl_rlimit[RLIMIT_STACK].rlim_max > linux32_maxssiz) - newlim->pl_rlimit[RLIMIT_STACK].rlim_max = linux32_maxssiz; - } - if (linux32_maxvmem != 0) { - if (newlim->pl_rlimit[RLIMIT_VMEM].rlim_cur > linux32_maxvmem) - newlim->pl_rlimit[RLIMIT_VMEM].rlim_cur = linux32_maxvmem; - if (newlim->pl_rlimit[RLIMIT_VMEM].rlim_max > linux32_maxvmem) - newlim->pl_rlimit[RLIMIT_VMEM].rlim_max = linux32_maxvmem; + switch (which) { + case RLIMIT_DATA: + if (linux32_maxdsiz != 0) { + if (rl->rlim_cur > linux32_maxdsiz) + rl->rlim_cur = linux32_maxdsiz; + if (rl->rlim_max > linux32_maxdsiz) + rl->rlim_max = linux32_maxdsiz; + } + break; + case RLIMIT_STACK: + if (linux32_maxssiz != 0) { + if (rl->rlim_cur > linux32_maxssiz) + rl->rlim_cur = linux32_maxssiz; + if (rl->rlim_max > linux32_maxssiz) + rl->rlim_max = linux32_maxssiz; + } + break; + case RLIMIT_VMEM: + if (linux32_maxvmem != 0) { + if (rl->rlim_cur > linux32_maxvmem) + rl->rlim_cur = linux32_maxvmem; + if (rl->rlim_max > linux32_maxvmem) + rl->rlim_max = linux32_maxvmem; + } + break; } - p->p_limit = newlim; - PROC_UNLOCK(p); - lim_free(oldlim); } struct sysentvec elf_linux_sysvec = { @@ -1029,7 +1023,7 @@ VM_PROT_ALL, linux_copyout_strings, exec_linux_setregs, - linux32_fixlimits + linux32_fixlimit }; static Elf32_Brandinfo linux_brand = { ==== //depot/projects/soc2007/rpaulo-macbook/cam/cam_periph.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.68 2007/04/19 23:34:51 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.69 2007/05/14 21:48:52 scottl Exp $"); #include #include @@ -102,7 +102,8 @@ int ndrivers; ndrivers = nperiph_drivers + 2; - newdrivers = malloc(sizeof(*newdrivers) * ndrivers, M_TEMP, M_WAITOK); + newdrivers = malloc(sizeof(*newdrivers) * ndrivers, M_CAMPERIPH, + M_WAITOK); if (periph_drivers) bcopy(periph_drivers, newdrivers, sizeof(*newdrivers) * nperiph_drivers); @@ -111,7 +112,7 @@ old = periph_drivers; periph_drivers = newdrivers; if (old) - free(old, M_TEMP); + free(old, M_CAMPERIPH); nperiph_drivers++; } ==== //depot/projects/soc2007/rpaulo-macbook/cam/cam_xpt.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.183 2007/04/27 14:23:05 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.187 2007/05/16 16:57:21 scottl Exp $"); #include #include @@ -1197,6 +1197,7 @@ error = ENOTSUP; break; } + xpt_release_bus(bus); break; } /* @@ -1533,7 +1534,7 @@ */ xsoftc.xpt_config_hook = (struct intr_config_hook *)malloc(sizeof(struct intr_config_hook), - M_TEMP, M_NOWAIT | M_ZERO); + M_CAMXPT, M_NOWAIT | M_ZERO); if (xsoftc.xpt_config_hook == NULL) { printf("xpt_init: Cannot malloc config hook " "- failing attach\n"); @@ -1542,7 +1543,7 @@ xsoftc.xpt_config_hook->ich_func = xpt_config; if (config_intrhook_establish(xsoftc.xpt_config_hook) != 0) { - free (xsoftc.xpt_config_hook, M_TEMP); + free (xsoftc.xpt_config_hook, M_CAMXPT); printf("xpt_init: config_intrhook_establish failed " "- failing attach\n"); } @@ -4139,7 +4140,6 @@ void xpt_print_path(struct cam_path *path) { - mtx_assert(path->bus->sim->mtx, MA_OWNED); if (path == NULL) printf("(nopath): "); @@ -5243,7 +5243,7 @@ /* Save some state for use while we probe for devices */ scan_info = (xpt_scan_bus_info *) - malloc(sizeof(xpt_scan_bus_info), M_TEMP, M_NOWAIT); + malloc(sizeof(xpt_scan_bus_info), M_CAMXPT, M_NOWAIT); scan_info->request_ccb = request_ccb; scan_info->cpi = &work_ccb->cpi; @@ -5277,7 +5277,7 @@ printf("xpt_scan_bus: xpt_create_path failed" " with status %#x, bus scan halted\n", status); - free(scan_info, M_TEMP); + free(scan_info, M_CAMXPT); request_ccb->ccb_h.status = status; xpt_free_ccb(work_ccb); xpt_done(request_ccb); @@ -5285,7 +5285,7 @@ } work_ccb = xpt_alloc_ccb_nowait(); if (work_ccb == NULL) { - free(scan_info, M_TEMP); + free(scan_info, M_CAMXPT); xpt_free_path(path); request_ccb->ccb_h.status = CAM_RESRC_UNAVAIL; xpt_done(request_ccb); @@ -5398,7 +5398,7 @@ xpt_free_ccb(request_ccb); xpt_free_ccb((union ccb *)scan_info->cpi); request_ccb = scan_info->request_ccb; - free(scan_info, M_TEMP); + free(scan_info, M_CAMXPT); request_ccb->ccb_h.status = CAM_REQ_CMP; xpt_done(request_ccb); break; @@ -5417,7 +5417,7 @@ xpt_free_ccb(request_ccb); xpt_free_ccb((union ccb *)scan_info->cpi); request_ccb = scan_info->request_ccb; - free(scan_info, M_TEMP); + free(scan_info, M_CAMXPT); request_ccb->ccb_h.status = status; xpt_done(request_ccb); break; @@ -5518,17 +5518,17 @@ } if (request_ccb == NULL) { - request_ccb = malloc(sizeof(union ccb), M_TEMP, M_NOWAIT); + request_ccb = malloc(sizeof(union ccb), M_CAMXPT, M_NOWAIT); if (request_ccb == NULL) { xpt_print(path, "xpt_scan_lun: can't allocate CCB, " "can't continue\n"); return; } - new_path = malloc(sizeof(*new_path), M_TEMP, M_NOWAIT); + new_path = malloc(sizeof(*new_path), M_CAMXPT, M_NOWAIT); if (new_path == NULL) { xpt_print(path, "xpt_scan_lun: can't allocate path, " "can't continue\n"); - free(request_ccb, M_TEMP); + free(request_ccb, M_CAMXPT); return; } status = xpt_compile_path(new_path, xpt_periph, @@ -5539,8 +5539,8 @@ if (status != CAM_REQ_CMP) { xpt_print(path, "xpt_scan_lun: can't compile path, " "can't continue\n"); - free(request_ccb, M_TEMP); - free(new_path, M_TEMP); + free(request_ccb, M_CAMXPT); + free(new_path, M_CAMXPT); return; } xpt_setup_ccb(&request_ccb->ccb_h, new_path, /*priority*/ 1); @@ -5575,8 +5575,8 @@ xptscandone(struct cam_periph *periph, union ccb *done_ccb) { xpt_release_path(done_ccb->ccb_h.path); - free(done_ccb->ccb_h.path, M_TEMP); - free(done_ccb, M_TEMP); + free(done_ccb->ccb_h.path, M_CAMXPT); + free(done_ccb, M_CAMXPT); } static cam_status @@ -5598,7 +5598,7 @@ return(CAM_REQ_CMP_ERR); } - softc = (probe_softc *)malloc(sizeof(*softc), M_TEMP, M_NOWAIT); + softc = (probe_softc *)malloc(sizeof(*softc), M_CAMXPT, M_NOWAIT); if (softc == NULL) { printf("proberegister: Unable to probe new device. " @@ -5751,7 +5751,7 @@ if (softc->action == PROBE_INQUIRY_BASIC_DV1 || softc->action == PROBE_INQUIRY_BASIC_DV2) { - inq_buf = malloc(inquiry_len, M_TEMP, M_NOWAIT); + inq_buf = malloc(inquiry_len, M_CAMXPT, M_NOWAIT); } if (inq_buf == NULL) { xpt_print(periph->path, "malloc failure- skipping Basic" @@ -5785,7 +5785,7 @@ mode_buf_len = sizeof(struct scsi_mode_header_6) + sizeof(struct scsi_mode_blk_desc) + sizeof(struct scsi_control_page); - mode_buf = malloc(mode_buf_len, M_TEMP, M_NOWAIT); + mode_buf = malloc(mode_buf_len, M_CAMXPT, M_NOWAIT); if (mode_buf != NULL) { scsi_mode_sense(csio, /*retries*/4, @@ -5817,7 +5817,7 @@ if ((device->quirk->quirks & CAM_QUIRK_NOSERIAL) == 0) serial_buf = (struct scsi_vpd_unit_serial_number *) - malloc(sizeof(*serial_buf), M_TEMP, + malloc(sizeof(*serial_buf), M_CAMXPT, M_NOWAIT | M_ZERO); if (serial_buf != NULL) { @@ -6107,7 +6107,7 @@ /*count*/1, /*run_queue*/TRUE); } xpt_release_ccb(done_ccb); - free(mode_hdr, M_TEMP); + free(mode_hdr, M_CAMXPT); softc->action = PROBE_SERIAL_NUM; xpt_schedule(periph, priority); return; @@ -6194,7 +6194,7 @@ xpt_async(AC_LOST_DEVICE, path, NULL); } if (serial_buf != NULL) - free(serial_buf, M_TEMP); + free(serial_buf, M_CAMXPT); if (changed != 0) { /* @@ -6283,12 +6283,12 @@ /* give up */ softc->action = PROBE_DV_EXIT; } - free(nbuf, M_TEMP); + free(nbuf, M_CAMXPT); xpt_release_ccb(done_ccb); xpt_schedule(periph, priority); return; } - free(nbuf, M_TEMP); + free(nbuf, M_CAMXPT); if (softc->action == PROBE_INQUIRY_BASIC_DV1) { softc->action = PROBE_INQUIRY_BASIC_DV2; xpt_release_ccb(done_ccb); @@ -6327,7 +6327,7 @@ static void probecleanup(struct cam_periph *periph) { - free(periph->softc, M_TEMP); + free(periph->softc, M_CAMXPT); } static void @@ -6984,7 +6984,7 @@ /* Release our hook so that the boot can continue. */ config_intrhook_disestablish(xsoftc.xpt_config_hook); - free(xsoftc.xpt_config_hook, M_TEMP); + free(xsoftc.xpt_config_hook, M_CAMXPT); xsoftc.xpt_config_hook = NULL; } @@ -7029,6 +7029,39 @@ xpt_free_ccb(done_ccb); } +cam_status +xpt_register_async(int event, ac_callback_t *cbfunc, void *cbarg, + struct cam_path *path) +{ + struct ccb_setasync csa; + cam_status status; + int xptpath = 0; + + if (path == NULL) { + mtx_lock(&xsoftc.xpt_lock); + status = xpt_create_path(&path, /*periph*/NULL, CAM_XPT_PATH_ID, + CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD); + if (status != CAM_REQ_CMP) { + mtx_unlock(&xsoftc.xpt_lock); + return (status); + } + xptpath = 1; + } + + xpt_setup_ccb(&csa.ccb_h, path, /*priority*/5); + csa.ccb_h.func_code = XPT_SASYNC_CB; + csa.event_enable = event; + csa.callback = cbfunc; + csa.callback_arg = cbarg; + xpt_action((union ccb *)&csa); + status = csa.ccb_h.status; + if (xptpath) { + xpt_free_path(path); + mtx_unlock(&xsoftc.xpt_lock); + } + return (status); +} + static void xptaction(struct cam_sim *sim, union ccb *work_ccb) { ==== //depot/projects/soc2007/rpaulo-macbook/cam/cam_xpt.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_xpt.h,v 1.8 2007/04/15 08:49:09 scottl Exp $ + * $FreeBSD: src/sys/cam/cam_xpt.h,v 1.9 2007/05/16 16:54:23 scottl Exp $ */ #ifndef _CAM_CAM_XPT_H @@ -79,6 +79,8 @@ void xpt_rescan(union ccb *ccb); void xpt_lock_buses(void); void xpt_unlock_buses(void); +cam_status xpt_register_async(int event, ac_callback_t *cbfunc, + void *cbarg, struct cam_path *path); #endif /* _KERNEL */ #endif /* _CAM_CAM_XPT_H */ ==== //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_cd.c#2 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.99 2007/04/16 19:41:14 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.101 2007/05/16 16:54:23 scottl Exp $"); #include "opt_cd.h" @@ -329,11 +329,12 @@ static STAILQ_HEAD(changerlist, cdchanger) changerq; static int num_changers; +MALLOC_DEFINE(M_SCSICD, "scsi_cd", "scsi_cd buffers"); + static void cdinit(void) { cam_status status; - struct cam_path *path; mtx_init(&changerq_mtx, "cdchangerq", "SCSI CD Changer List", MTX_DEF); STAILQ_INIT(&changerq); @@ -342,22 +343,8 @@ * Install a global async callback. This callback will * receive async callbacks like "new device found". */ - status = xpt_create_path(&path, /*periph*/NULL, CAM_XPT_PATH_ID, - CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD); - - if (status == CAM_REQ_CMP) { - struct ccb_setasync csa; + status = xpt_register_async(AC_FOUND_DEVICE, cdasync, NULL, NULL); - xpt_setup_ccb(&csa.ccb_h, path, /*priority*/5); - csa.ccb_h.func_code = XPT_SASYNC_CB; - csa.event_enable = AC_FOUND_DEVICE; - csa.callback = cdasync; - csa.callback_arg = NULL; - xpt_action((union ccb *)&csa); - status = csa.ccb_h.status; - xpt_free_path(path); - } - if (status != CAM_REQ_CMP) { printf("cd: Failed to attach master async callback " "due to status 0x%x!\n", status); @@ -368,20 +355,13 @@ cdoninvalidate(struct cam_periph *periph) { struct cd_softc *softc; - struct ccb_setasync csa; softc = (struct cd_softc *)periph->softc; /* * De-register any async callbacks. */ - xpt_setup_ccb(&csa.ccb_h, periph->path, - /* priority */ 5); - csa.ccb_h.func_code = XPT_SASYNC_CB; - csa.event_enable = 0; - csa.callback = cdasync; - csa.callback_arg = periph; - xpt_action((union ccb *)&csa); + xpt_register_async(0, cdasync, periph, periph->path); softc->flags |= CD_FLAG_INVALID; @@ -637,7 +617,6 @@ cdregister(struct cam_periph *periph, void *arg) { struct cd_softc *softc; - struct ccb_setasync csa; struct ccb_pathinq cpi; struct ccb_getdev *cgd; char tmpstr[80]; @@ -749,13 +728,8 @@ * Add an async callback so that we get * notified if this device goes away. */ - xpt_setup_ccb(&csa.ccb_h, periph->path, - /* priority */ 5); - csa.ccb_h.func_code = XPT_SASYNC_CB; - csa.event_enable = AC_SENT_BDR | AC_BUS_RESET | AC_LOST_DEVICE; - csa.callback = cdasync; - csa.callback_arg = periph; - xpt_action((union ccb *)&csa); + xpt_register_async(AC_SENT_BDR | AC_BUS_RESET | AC_LOST_DEVICE, + cdasync, periph, periph->path); /* * If the target lun is greater than 0, we most likely have a CD @@ -1519,7 +1493,7 @@ { rcap = (struct scsi_read_capacity_data *)malloc(sizeof(*rcap), - M_TEMP, + M_SCSICD, M_NOWAIT); if (rcap == NULL) { xpt_print(periph->path, @@ -1778,7 +1752,7 @@ } } } - free(rdcap, M_TEMP); + free(rdcap, M_SCSICD); if (announce_buf[0] != '\0') { xpt_announce_periph(periph, announce_buf); if (softc->flags & CD_FLAG_CHANGER) @@ -1906,7 +1880,7 @@ union cd_pages *page; params.alloc_len = sizeof(union cd_mode_data_6_10); - params.mode_buf = malloc(params.alloc_len, M_TEMP, + params.mode_buf = malloc(params.alloc_len, M_SCSICD, M_WAITOK | M_ZERO); cam_periph_lock(periph); @@ -1915,7 +1889,7 @@ error = cdgetmode(periph, ¶ms, AUDIO_PAGE); if (error) { - free(params.mode_buf, M_TEMP); + free(params.mode_buf, M_SCSICD); cam_periph_unlock(periph); break; } @@ -1924,7 +1898,7 @@ page->audio.flags &= ~CD_PA_SOTC; page->audio.flags |= CD_PA_IMMED; error = cdsetmode(periph, ¶ms); - free(params.mode_buf, M_TEMP); + free(params.mode_buf, M_SCSICD); if (error) { cam_periph_unlock(periph); break; @@ -2001,7 +1975,7 @@ union cd_pages *page; params.alloc_len = sizeof(union cd_mode_data_6_10); - params.mode_buf = malloc(params.alloc_len, M_TEMP, + params.mode_buf = malloc(params.alloc_len, M_SCSICD, M_WAITOK | M_ZERO); cam_periph_lock(periph); @@ -2010,7 +1984,7 @@ error = cdgetmode(periph, ¶ms, AUDIO_PAGE); if (error) { - free(params.mode_buf, M_TEMP); + free(params.mode_buf, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2019,7 +1993,7 @@ page->audio.flags &= ~CD_PA_SOTC; page->audio.flags |= CD_PA_IMMED; error = cdsetmode(periph, ¶ms); - free(params.mode_buf, M_TEMP); + free(params.mode_buf, M_SCSICD); if (error) { cam_periph_unlock(periph); break; @@ -2042,7 +2016,7 @@ union cd_pages *page; params.alloc_len = sizeof(union cd_mode_data_6_10); - params.mode_buf = malloc(params.alloc_len, M_TEMP, + params.mode_buf = malloc(params.alloc_len, M_SCSICD, M_WAITOK | M_ZERO); cam_periph_lock(periph); @@ -2052,7 +2026,7 @@ error = cdgetmode(periph, ¶ms, AUDIO_PAGE); if (error) { - free(params.mode_buf, M_TEMP); + free(params.mode_buf, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2061,7 +2035,7 @@ page->audio.flags &= ~CD_PA_SOTC; page->audio.flags |= CD_PA_IMMED; error = cdsetmode(periph, ¶ms); - free(params.mode_buf, M_TEMP); + free(params.mode_buf, M_SCSICD); if (error) { cam_periph_unlock(periph); break; @@ -2081,7 +2055,7 @@ u_int32_t len = args->data_len; data = malloc(sizeof(struct cd_sub_channel_info), - M_TEMP, M_WAITOK); + M_SCSICD, M_WAITOK); cam_periph_lock(periph); CAM_DEBUG(periph->path, CAM_DEBUG_SUBTRACE, @@ -2094,7 +2068,7 @@ "cdioreadsubchannel: error, len=%d\n", len); error = EINVAL; - free(data, M_TEMP); + free(data, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2106,7 +2080,7 @@ args->data_format, args->track, data, len); if (error) { - free(data, M_TEMP); + free(data, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2124,7 +2098,7 @@ } else { bcopy(data, args->data, len); } - free(data, M_TEMP); + free(data, M_SCSICD); } break; @@ -2132,7 +2106,7 @@ { struct ioc_toc_header *th; - th = malloc(sizeof(struct ioc_toc_header), M_TEMP, + th = malloc(sizeof(struct ioc_toc_header), M_SCSICD, M_WAITOK); cam_periph_lock(periph); @@ -2142,7 +2116,7 @@ error = cdreadtoc(periph, 0, 0, (u_int8_t *)th, sizeof (*th), /*sense_flags*/0); if (error) { - free(th, M_TEMP); + free(th, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2156,7 +2130,7 @@ } th->len = ntohs(th->len); bcopy(th, addr, sizeof(*th)); - free(th, M_TEMP); + free(th, M_SCSICD); cam_periph_unlock(periph); } break; @@ -2170,8 +2144,8 @@ u_int32_t len, readlen, idx, num; u_int32_t starting_track = te->starting_track; - data = malloc(sizeof(*data), M_TEMP, M_WAITOK); - lead = malloc(sizeof(*lead), M_TEMP, M_WAITOK); + data = malloc(sizeof(*data), M_SCSICD, M_WAITOK); + lead = malloc(sizeof(*lead), M_SCSICD, M_WAITOK); cam_periph_lock(periph); CAM_DEBUG(periph->path, CAM_DEBUG_SUBTRACE, @@ -2184,8 +2158,8 @@ error = EINVAL; printf("scsi_cd: error in readtocentries, " "returning EINVAL\n"); - free(data, M_TEMP); - free(lead, M_TEMP); + free(data, M_SCSICD); + free(lead, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2194,8 +2168,8 @@ error = cdreadtoc(periph, 0, 0, (u_int8_t *)th, sizeof (*th), /*sense_flags*/0); if (error) { - free(data, M_TEMP); - free(lead, M_TEMP); + free(data, M_SCSICD); + free(lead, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2217,8 +2191,8 @@ starting_track > th->ending_track + 1) { printf("scsi_cd: error in readtocentries, " "returning EINVAL\n"); - free(data, M_TEMP); - free(lead, M_TEMP); + free(data, M_SCSICD); + free(lead, M_SCSICD); cam_periph_unlock(periph); error = EINVAL; break; @@ -2239,8 +2213,8 @@ printf("scsi_cd: error in readtocentries, " "returning EINVAL\n"); error = EINVAL; - free(data, M_TEMP); - free(lead, M_TEMP); + free(data, M_SCSICD); + free(lead, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2253,8 +2227,8 @@ readlen + sizeof (*th), /*sense_flags*/0); if (error) { - free(data, M_TEMP); - free(lead, M_TEMP); + free(data, M_SCSICD); + free(lead, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2270,8 +2244,8 @@ sizeof(*lead), /*sense_flags*/0); if (error) { - free(data, M_TEMP); - free(lead, M_TEMP); + free(data, M_SCSICD); + free(lead, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2287,8 +2261,8 @@ cam_periph_unlock(periph); error = copyout(data->entries, te->data, len); - free(data, M_TEMP); - free(lead, M_TEMP); + free(data, M_SCSICD); + free(lead, M_SCSICD); } break; case CDIOREADTOCENTRY: @@ -2299,7 +2273,7 @@ struct ioc_toc_header *th; u_int32_t track; - data = malloc(sizeof(*data), M_TEMP, M_WAITOK); + data = malloc(sizeof(*data), M_SCSICD, M_WAITOK); cam_periph_lock(periph); CAM_DEBUG(periph->path, CAM_DEBUG_SUBTRACE, @@ -2309,7 +2283,7 @@ && te->address_format != CD_LBA_FORMAT) { printf("error in readtocentry, " " returning EINVAL\n"); - free(data, M_TEMP); + free(data, M_SCSICD); error = EINVAL; cam_periph_unlock(periph); break; @@ -2319,7 +2293,7 @@ error = cdreadtoc(periph, 0, 0, (u_int8_t *)th, sizeof (*th), /*sense_flags*/0); if (error) { - free(data, M_TEMP); + free(data, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2341,7 +2315,7 @@ track > th->ending_track + 1) { printf("error in readtocentry, " " returning EINVAL\n"); - free(data, M_TEMP); + free(data, M_SCSICD); error = EINVAL; cam_periph_unlock(periph); break; @@ -2351,7 +2325,7 @@ (u_int8_t *)data, sizeof(*data), /*sense_flags*/0); if (error) { - free(data, M_TEMP); + free(data, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2360,7 +2334,7 @@ data->entry.track = bcd2bin(data->entry.track); bcopy(&data->entry, &te->entry, sizeof(struct cd_toc_entry)); - free(data, M_TEMP); + free(data, M_SCSICD); cam_periph_unlock(periph); } break; @@ -2371,7 +2345,7 @@ union cd_pages *page; params.alloc_len = sizeof(union cd_mode_data_6_10); - params.mode_buf = malloc(params.alloc_len, M_TEMP, + params.mode_buf = malloc(params.alloc_len, M_SCSICD, M_WAITOK | M_ZERO); cam_periph_lock(periph); @@ -2380,7 +2354,7 @@ error = cdgetmode(periph, ¶ms, AUDIO_PAGE); if (error) { - free(params.mode_buf, M_TEMP); + free(params.mode_buf, M_SCSICD); cam_periph_unlock(periph); break; } @@ -2393,7 +2367,7 @@ page->audio.port[2].channels = arg->patch[2]; page->audio.port[3].channels = arg->patch[3]; error = cdsetmode(periph, ¶ms); - free(params.mode_buf, M_TEMP); + free(params.mode_buf, M_SCSICD); cam_periph_unlock(periph); } break; @@ -2404,7 +2378,7 @@ union cd_pages *page; params.alloc_len = sizeof(union cd_mode_data_6_10); - params.mode_buf = malloc(params.alloc_len, M_TEMP, >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu May 17 15:08:50 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7065316A402; Thu, 17 May 2007 15:08:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 2B7BF16A401 for ; Thu, 17 May 2007 15:08:50 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1A71213C44B for ; Thu, 17 May 2007 15:08:50 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4HF8nsW062704 for ; Thu, 17 May 2007 15:08:49 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4HF8lFe062677 for perforce@freebsd.org; Thu, 17 May 2007 15:08:47 GMT (envelope-from jhb@freebsd.org) Date: Thu, 17 May 2007 15:08:47 GMT Message-Id: <200705171508.l4HF8lFe062677@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 119975 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: Thu, 17 May 2007 15:08:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=119975 Change 119975 by jhb@jhb_mutex on 2007/05/17 15:08:33 IFC @119973 Affected files ... .. //depot/projects/smpng/sys/cam/cam_xpt.c#46 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.h#6 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_cd.c#33 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ch.c#17 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#77 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_pass.c#18 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_pt.c#15 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#29 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ses.c#16 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_sg.c#3 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_targ_bh.c#12 integrate .. //depot/projects/smpng/sys/conf/Makefile.amd64#16 integrate .. //depot/projects/smpng/sys/conf/Makefile.arm#26 integrate .. //depot/projects/smpng/sys/conf/Makefile.i386#28 integrate .. //depot/projects/smpng/sys/conf/Makefile.ia64#34 integrate .. //depot/projects/smpng/sys/conf/Makefile.pc98#27 integrate .. //depot/projects/smpng/sys/conf/Makefile.powerpc#35 integrate .. //depot/projects/smpng/sys/conf/Makefile.sparc64#30 integrate .. //depot/projects/smpng/sys/conf/Makefile.sun4v#3 integrate .. //depot/projects/smpng/sys/conf/NOTES#144 integrate .. //depot/projects/smpng/sys/conf/files#208 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_hpet.c#7 integrate .. //depot/projects/smpng/sys/dev/bce/if_bce.c#17 integrate .. //depot/projects/smpng/sys/dev/bce/if_bcefw.h#3 integrate .. //depot/projects/smpng/sys/dev/bce/if_bcereg.h#8 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus.c#32 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus_cis.c#28 integrate .. //depot/projects/smpng/sys/dev/em/e1000_80003es2lan.c#2 integrate .. //depot/projects/smpng/sys/dev/em/e1000_80003es2lan.h#2 integrate .. //depot/projects/smpng/sys/dev/em/e1000_82540.c#2 integrate .. //depot/projects/smpng/sys/dev/em/e1000_82541.c#2 integrate .. //depot/projects/smpng/sys/dev/em/e1000_82541.h#2 integrate .. //depot/projects/smpng/sys/dev/em/e1000_82542.c#2 integrate .. //depot/projects/smpng/sys/dev/em/e1000_82543.c#2 integrate .. //depot/projects/smpng/sys/dev/em/e1000_82543.h#2 integrate .. //depot/projects/smpng/sys/dev/em/e1000_82571.c#2 integrate .. //depot/projects/smpng/sys/dev/em/e1000_82571.h#2 integrate .. //depot/projects/smpng/sys/dev/em/e1000_82575.c#2 integrate .. //depot/projects/smpng/sys/dev/em/e1000_82575.h#2 integrate .. //depot/projects/smpng/sys/dev/em/e1000_api.c#2 integrate .. //depot/projects/smpng/sys/dev/em/e1000_api.h#2 integrate .. //depot/projects/smpng/sys/dev/em/e1000_defines.h#2 integrate .. //depot/projects/smpng/sys/dev/em/e1000_hw.h#2 integrate .. //depot/projects/smpng/sys/dev/em/e1000_ich8lan.c#2 integrate .. //depot/projects/smpng/sys/dev/em/e1000_ich8lan.h#2 integrate .. //depot/projects/smpng/sys/dev/em/e1000_mac.c#2 integrate .. //depot/projects/smpng/sys/dev/em/e1000_mac.h#2 integrate .. //depot/projects/smpng/sys/dev/em/e1000_manage.c#2 integrate .. //depot/projects/smpng/sys/dev/em/e1000_manage.h#2 integrate .. //depot/projects/smpng/sys/dev/em/e1000_nvm.c#2 integrate .. //depot/projects/smpng/sys/dev/em/e1000_nvm.h#2 integrate .. //depot/projects/smpng/sys/dev/em/e1000_osdep.h#2 integrate .. //depot/projects/smpng/sys/dev/em/e1000_phy.c#2 integrate .. //depot/projects/smpng/sys/dev/em/e1000_phy.h#2 integrate .. //depot/projects/smpng/sys/dev/em/e1000_regs.h#2 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#83 integrate .. //depot/projects/smpng/sys/dev/em/if_em.h#41 integrate .. //depot/projects/smpng/sys/dev/mfi/mfi.c#18 integrate .. //depot/projects/smpng/sys/dev/mfi/mfi_cam.c#1 branch .. //depot/projects/smpng/sys/dev/mfi/mfireg.h#7 integrate .. //depot/projects/smpng/sys/dev/mfi/mfivar.h#7 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#65 integrate .. //depot/projects/smpng/sys/dev/pci/pci.c#94 integrate .. //depot/projects/smpng/sys/dev/pci/pci_private.h#22 integrate .. //depot/projects/smpng/sys/dev/pci/pcireg.h#24 integrate .. //depot/projects/smpng/sys/dev/uart/uart_bus_pci.c#9 integrate .. //depot/projects/smpng/sys/geom/part/g_part.c#5 integrate .. //depot/projects/smpng/sys/kern/kern_mib.c#31 integrate .. //depot/projects/smpng/sys/kern/uipc_domain.c#19 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#54 integrate .. //depot/projects/smpng/sys/kern/uipc_sockbuf.c#8 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#106 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#105 integrate .. //depot/projects/smpng/sys/modules/mfi/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/mfi/mfip/Makefile#1 branch .. //depot/projects/smpng/sys/net/ieee8023ad_lacp.c#7 integrate .. //depot/projects/smpng/sys/net/if.c#95 integrate .. //depot/projects/smpng/sys/net/if.h#34 integrate .. //depot/projects/smpng/sys/net/if_lagg.c#6 integrate .. //depot/projects/smpng/sys/net/if_var.h#50 integrate .. //depot/projects/smpng/sys/netgraph/ng_car.c#2 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#85 integrate .. //depot/projects/smpng/sys/netinet/sctp.h#6 integrate .. //depot/projects/smpng/sys/netinet/sctp_asconf.c#10 integrate .. //depot/projects/smpng/sys/netinet/sctp_auth.c#10 integrate .. //depot/projects/smpng/sys/netinet/sctp_constants.h#12 integrate .. //depot/projects/smpng/sys/netinet/sctp_indata.c#14 integrate .. //depot/projects/smpng/sys/netinet/sctp_input.c#14 integrate .. //depot/projects/smpng/sys/netinet/sctp_output.c#14 integrate .. //depot/projects/smpng/sys/netinet/sctp_pcb.c#14 integrate .. //depot/projects/smpng/sys/netinet/sctp_sysctl.c#5 integrate .. //depot/projects/smpng/sys/netinet/sctp_timer.c#11 integrate .. //depot/projects/smpng/sys/netinet/sctp_uio.h#11 integrate .. //depot/projects/smpng/sys/netinet/sctp_usrreq.c#15 integrate .. //depot/projects/smpng/sys/netinet/sctputil.c#16 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#107 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#95 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.c#38 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.h#15 integrate .. //depot/projects/smpng/sys/netinet/tcp_timewait.c#2 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#53 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#79 integrate .. //depot/projects/smpng/sys/netinet6/sctp6_usrreq.c#13 integrate Differences ... ==== //depot/projects/smpng/sys/cam/cam_xpt.c#46 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.184 2007/05/14 21:48:52 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.187 2007/05/16 16:57:21 scottl Exp $"); #include #include @@ -1197,6 +1197,7 @@ error = ENOTSUP; break; } + xpt_release_bus(bus); break; } /* @@ -4139,7 +4140,6 @@ void xpt_print_path(struct cam_path *path) { - mtx_assert(path->bus->sim->mtx, MA_OWNED); if (path == NULL) printf("(nopath): "); @@ -7029,6 +7029,39 @@ xpt_free_ccb(done_ccb); } +cam_status +xpt_register_async(int event, ac_callback_t *cbfunc, void *cbarg, + struct cam_path *path) +{ + struct ccb_setasync csa; + cam_status status; + int xptpath = 0; + + if (path == NULL) { + mtx_lock(&xsoftc.xpt_lock); + status = xpt_create_path(&path, /*periph*/NULL, CAM_XPT_PATH_ID, + CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD); + if (status != CAM_REQ_CMP) { + mtx_unlock(&xsoftc.xpt_lock); + return (status); + } + xptpath = 1; + } + + xpt_setup_ccb(&csa.ccb_h, path, /*priority*/5); + csa.ccb_h.func_code = XPT_SASYNC_CB; + csa.event_enable = event; + csa.callback = cbfunc; + csa.callback_arg = cbarg; + xpt_action((union ccb *)&csa); + status = csa.ccb_h.status; + if (xptpath) { + xpt_free_path(path); + mtx_unlock(&xsoftc.xpt_lock); + } + return (status); +} + static void xptaction(struct cam_sim *sim, union ccb *work_ccb) { ==== //depot/projects/smpng/sys/cam/cam_xpt.h#6 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_xpt.h,v 1.8 2007/04/15 08:49:09 scottl Exp $ + * $FreeBSD: src/sys/cam/cam_xpt.h,v 1.9 2007/05/16 16:54:23 scottl Exp $ */ #ifndef _CAM_CAM_XPT_H @@ -79,6 +79,8 @@ void xpt_rescan(union ccb *ccb); void xpt_lock_buses(void); void xpt_unlock_buses(void); +cam_status xpt_register_async(int event, ac_callback_t *cbfunc, + void *cbarg, struct cam_path *path); #endif /* _KERNEL */ #endif /* _CAM_CAM_XPT_H */ ==== //depot/projects/smpng/sys/cam/scsi/scsi_cd.c#33 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.100 2007/05/14 21:48:53 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.101 2007/05/16 16:54:23 scottl Exp $"); #include "opt_cd.h" @@ -335,7 +335,6 @@ cdinit(void) { cam_status status; - struct cam_path *path; mtx_init(&changerq_mtx, "cdchangerq", "SCSI CD Changer List", MTX_DEF); STAILQ_INIT(&changerq); @@ -344,21 +343,7 @@ * Install a global async callback. This callback will * receive async callbacks like "new device found". */ - status = xpt_create_path(&path, /*periph*/NULL, CAM_XPT_PATH_ID, - CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD); - - if (status == CAM_REQ_CMP) { - struct ccb_setasync csa; - - xpt_setup_ccb(&csa.ccb_h, path, /*priority*/5); - csa.ccb_h.func_code = XPT_SASYNC_CB; - csa.event_enable = AC_FOUND_DEVICE; - csa.callback = cdasync; - csa.callback_arg = NULL; - xpt_action((union ccb *)&csa); - status = csa.ccb_h.status; - xpt_free_path(path); - } + status = xpt_register_async(AC_FOUND_DEVICE, cdasync, NULL, NULL); if (status != CAM_REQ_CMP) { printf("cd: Failed to attach master async callback " @@ -370,20 +355,13 @@ cdoninvalidate(struct cam_periph *periph) { struct cd_softc *softc; - struct ccb_setasync csa; softc = (struct cd_softc *)periph->softc; /* * De-register any async callbacks. */ - xpt_setup_ccb(&csa.ccb_h, periph->path, - /* priority */ 5); - csa.ccb_h.func_code = XPT_SASYNC_CB; - csa.event_enable = 0; - csa.callback = cdasync; - csa.callback_arg = periph; - xpt_action((union ccb *)&csa); + xpt_register_async(0, cdasync, periph, periph->path); softc->flags |= CD_FLAG_INVALID; @@ -639,7 +617,6 @@ cdregister(struct cam_periph *periph, void *arg) { struct cd_softc *softc; - struct ccb_setasync csa; struct ccb_pathinq cpi; struct ccb_getdev *cgd; char tmpstr[80]; @@ -751,13 +728,8 @@ * Add an async callback so that we get * notified if this device goes away. */ - xpt_setup_ccb(&csa.ccb_h, periph->path, - /* priority */ 5); - csa.ccb_h.func_code = XPT_SASYNC_CB; - csa.event_enable = AC_SENT_BDR | AC_BUS_RESET | AC_LOST_DEVICE; - csa.callback = cdasync; - csa.callback_arg = periph; - xpt_action((union ccb *)&csa); + xpt_register_async(AC_SENT_BDR | AC_BUS_RESET | AC_LOST_DEVICE, + cdasync, periph, periph->path); /* * If the target lun is greater than 0, we most likely have a CD ==== //depot/projects/smpng/sys/cam/scsi/scsi_ch.c#17 (text+ko) ==== @@ -68,7 +68,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ch.c,v 1.45 2007/05/14 21:48:53 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ch.c,v 1.46 2007/05/16 16:54:23 scottl Exp $"); #include #include @@ -224,27 +224,12 @@ chinit(void) { cam_status status; - struct cam_path *path; /* * Install a global async callback. This callback will * receive async callbacks like "new device found". */ - status = xpt_create_path(&path, /*periph*/NULL, CAM_XPT_PATH_ID, - CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD); - - if (status == CAM_REQ_CMP) { - struct ccb_setasync csa; - - xpt_setup_ccb(&csa.ccb_h, path, /*priority*/5); - csa.ccb_h.func_code = XPT_SASYNC_CB; - csa.event_enable = AC_FOUND_DEVICE; - csa.callback = chasync; - csa.callback_arg = NULL; - xpt_action((union ccb *)&csa); - status = csa.ccb_h.status; - xpt_free_path(path); - } + status = xpt_register_async(AC_FOUND_DEVICE, chasync, NULL, NULL); if (status != CAM_REQ_CMP) { printf("ch: Failed to attach master async callback " @@ -256,20 +241,13 @@ choninvalidate(struct cam_periph *periph) { struct ch_softc *softc; - struct ccb_setasync csa; softc = (struct ch_softc *)periph->softc; /* * De-register any async callbacks. */ - xpt_setup_ccb(&csa.ccb_h, periph->path, - /* priority */ 5); - csa.ccb_h.func_code = XPT_SASYNC_CB; - csa.event_enable = 0; - csa.callback = chasync; - csa.callback_arg = periph; - xpt_action((union ccb *)&csa); + xpt_register_async(0, chasync, periph, periph->path); softc->flags |= CH_FLAG_INVALID; @@ -338,7 +316,6 @@ chregister(struct cam_periph *periph, void *arg) { struct ch_softc *softc; - struct ccb_setasync csa; struct ccb_getdev *cgd; cgd = (struct ccb_getdev *)arg; @@ -369,6 +346,7 @@ * Changers don't have a blocksize, and obviously don't support * tagged queueing. */ + cam_periph_unlock(periph); softc->device_stats = devstat_new_entry("ch", periph->unit_number, 0, DEVSTAT_NO_BLOCKSIZE | DEVSTAT_NO_ORDERED_TAGS, @@ -376,7 +354,6 @@ DEVSTAT_PRIORITY_OTHER); /* Register the device */ - cam_periph_unlock(periph); softc->dev = make_dev(&ch_cdevsw, periph->unit_number, UID_ROOT, GID_OPERATOR, 0600, "%s%d", periph->periph_name, periph->unit_number); @@ -387,12 +364,7 @@ * Add an async callback so that we get * notified if this device goes away. */ - xpt_setup_ccb(&csa.ccb_h, periph->path, /* priority */ 5); - csa.ccb_h.func_code = XPT_SASYNC_CB; - csa.event_enable = AC_LOST_DEVICE; - csa.callback = chasync; - csa.callback_arg = periph; - xpt_action((union ccb *)&csa); + xpt_register_async(AC_LOST_DEVICE, chasync, periph, periph->path); /* * Lock this periph until we are setup. ==== //depot/projects/smpng/sys/cam/scsi/scsi_da.c#77 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.209 2007/05/14 21:48:53 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.210 2007/05/16 16:54:23 scottl Exp $"); #include @@ -695,8 +695,8 @@ softc->flags &= ~DA_FLAG_OPEN; cam_periph_unhold(periph); + cam_periph_release(periph); cam_periph_unlock(periph); - cam_periph_release(periph); return (0); } @@ -858,28 +858,13 @@ dainit(void) { cam_status status; - struct cam_path *path; /* * Install a global async callback. This callback will * receive async callbacks like "new device found". */ - status = xpt_create_path(&path, /*periph*/NULL, CAM_XPT_PATH_ID, - CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD); - - if (status == CAM_REQ_CMP) { - struct ccb_setasync csa; + status = xpt_register_async(AC_FOUND_DEVICE, daasync, NULL, NULL); - xpt_setup_ccb(&csa.ccb_h, path, /*priority*/5); - csa.ccb_h.func_code = XPT_SASYNC_CB; - csa.event_enable = AC_FOUND_DEVICE; - csa.callback = daasync; - csa.callback_arg = NULL; - xpt_action((union ccb *)&csa); - status = csa.ccb_h.status; - xpt_free_path(path); - } - if (status != CAM_REQ_CMP) { printf("da: Failed to attach master async callback " "due to status 0x%x!\n", status); @@ -896,20 +881,13 @@ daoninvalidate(struct cam_periph *periph) { struct da_softc *softc; - struct ccb_setasync csa; softc = (struct da_softc *)periph->softc; /* * De-register any async callbacks. */ - xpt_setup_ccb(&csa.ccb_h, periph->path, - /* priority */ 5); - csa.ccb_h.func_code = XPT_SASYNC_CB; - csa.event_enable = 0; - csa.callback = daasync; - csa.callback_arg = periph; - xpt_action((union ccb *)&csa); + xpt_register_async(0, daasync, periph, periph->path); softc->flags |= DA_FLAG_PACK_INVALID; @@ -1087,7 +1065,6 @@ daregister(struct cam_periph *periph, void *arg) { struct da_softc *softc; - struct ccb_setasync csa; struct ccb_pathinq cpi; struct ccb_getdev *cgd; char tmpstr[80]; @@ -1202,12 +1179,8 @@ * them and the only alternative would be to * not attach the device on failure. */ - xpt_setup_ccb(&csa.ccb_h, periph->path, /*priority*/5); - csa.ccb_h.func_code = XPT_SASYNC_CB; - csa.event_enable = AC_SENT_BDR | AC_BUS_RESET | AC_LOST_DEVICE; - csa.callback = daasync; - csa.callback_arg = periph; - xpt_action((union ccb *)&csa); + xpt_register_async(AC_SENT_BDR | AC_BUS_RESET | AC_LOST_DEVICE, + daasync, periph, periph->path); /* * Take an exclusive refcount on the periph while dastart is called ==== //depot/projects/smpng/sys/cam/scsi/scsi_pass.c#18 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pass.c,v 1.47 2007/04/18 04:58:52 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pass.c,v 1.48 2007/05/16 16:54:23 scottl Exp $"); #include #include @@ -118,27 +118,12 @@ passinit(void) { cam_status status; - struct cam_path *path; /* * Install a global async callback. This callback will * receive async callbacks like "new device found". */ - status = xpt_create_path(&path, /*periph*/NULL, CAM_XPT_PATH_ID, - CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD); - - if (status == CAM_REQ_CMP) { - struct ccb_setasync csa; - - xpt_setup_ccb(&csa.ccb_h, path, /*priority*/5); - csa.ccb_h.func_code = XPT_SASYNC_CB; - csa.event_enable = AC_FOUND_DEVICE; - csa.callback = passasync; - csa.callback_arg = NULL; - xpt_action((union ccb *)&csa); - status = csa.ccb_h.status; - xpt_free_path(path); - } + status = xpt_register_async(AC_FOUND_DEVICE, passasync, NULL, NULL); if (status != CAM_REQ_CMP) { printf("pass: Failed to attach master async callback " @@ -151,20 +136,13 @@ passoninvalidate(struct cam_periph *periph) { struct pass_softc *softc; - struct ccb_setasync csa; softc = (struct pass_softc *)periph->softc; /* * De-register any async callbacks. */ - xpt_setup_ccb(&csa.ccb_h, periph->path, - /* priority */ 5); - csa.ccb_h.func_code = XPT_SASYNC_CB; - csa.event_enable = 0; - csa.callback = passasync; - csa.callback_arg = periph; - xpt_action((union ccb *)&csa); + xpt_register_async(0, passasync, periph, periph->path); softc->flags |= PASS_FLAG_INVALID; @@ -250,7 +228,6 @@ passregister(struct cam_periph *periph, void *arg) { struct pass_softc *softc; - struct ccb_setasync csa; struct ccb_getdev *cgd; int no_tags; @@ -285,6 +262,7 @@ * know what the blocksize of this device is, if * it even has a blocksize. */ + mtx_unlock(periph->sim->mtx); no_tags = (cgd->inq_data.flags & SID_CmdQue) == 0; softc->device_stats = devstat_new_entry("pass", unit2minor(periph->unit_number), 0, @@ -296,7 +274,6 @@ DEVSTAT_PRIORITY_PASS); /* Register the device */ - mtx_unlock(periph->sim->mtx); softc->dev = make_dev(&pass_cdevsw, unit2minor(periph->unit_number), UID_ROOT, GID_OPERATOR, 0600, "%s%d", periph->periph_name, periph->unit_number); @@ -307,12 +284,7 @@ * Add an async callback so that we get * notified if this device goes away. */ - xpt_setup_ccb(&csa.ccb_h, periph->path, /* priority */ 5); - csa.ccb_h.func_code = XPT_SASYNC_CB; - csa.event_enable = AC_LOST_DEVICE; - csa.callback = passasync; - csa.callback_arg = periph; - xpt_action((union ccb *)&csa); + xpt_register_async(AC_LOST_DEVICE, passasync, periph, periph->path); if (bootverbose) xpt_announce_periph(periph, NULL); ==== //depot/projects/smpng/sys/cam/scsi/scsi_pt.c#15 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pt.c,v 1.46 2007/04/19 18:14:33 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_pt.c,v 1.47 2007/05/16 16:54:23 scottl Exp $"); #include #include @@ -234,27 +234,12 @@ ptinit(void) { cam_status status; - struct cam_path *path; /* * Install a global async callback. This callback will * receive async callbacks like "new device found". */ - status = xpt_create_path(&path, /*periph*/NULL, CAM_XPT_PATH_ID, - CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD); - - if (status == CAM_REQ_CMP) { - struct ccb_setasync csa; - - xpt_setup_ccb(&csa.ccb_h, path, /*priority*/5); - csa.ccb_h.func_code = XPT_SASYNC_CB; - csa.event_enable = AC_FOUND_DEVICE; - csa.callback = ptasync; - csa.callback_arg = NULL; - xpt_action((union ccb *)&csa); - status = csa.ccb_h.status; - xpt_free_path(path); - } + status = xpt_register_async(AC_FOUND_DEVICE, ptasync, NULL, NULL); if (status != CAM_REQ_CMP) { printf("pt: Failed to attach master async callback " @@ -266,7 +251,6 @@ ptctor(struct cam_periph *periph, void *arg) { struct pt_softc *softc; - struct ccb_setasync csa; struct ccb_getdev *cgd; cgd = (struct ccb_getdev *)arg; @@ -297,13 +281,13 @@ periph->softc = softc; + cam_periph_unlock(periph); softc->device_stats = devstat_new_entry("pt", periph->unit_number, 0, DEVSTAT_NO_BLOCKSIZE, SID_TYPE(&cgd->inq_data) | DEVSTAT_TYPE_IF_SCSI, DEVSTAT_PRIORITY_OTHER); - cam_periph_unlock(periph); softc->dev = make_dev(&pt_cdevsw, periph->unit_number, UID_ROOT, GID_OPERATOR, 0600, "%s%d", periph->periph_name, periph->unit_number); @@ -318,12 +302,8 @@ * them and the only alternative would be to * not attach the device on failure. */ - xpt_setup_ccb(&csa.ccb_h, periph->path, /*priority*/5); - csa.ccb_h.func_code = XPT_SASYNC_CB; - csa.event_enable = AC_SENT_BDR | AC_BUS_RESET | AC_LOST_DEVICE; - csa.callback = ptasync; - csa.callback_arg = periph; - xpt_action((union ccb *)&csa); + xpt_register_async(AC_SENT_BDR | AC_BUS_RESET | AC_LOST_DEVICE, + ptasync, periph, periph->path); /* Tell the user we've attached to the device */ xpt_announce_periph(periph, NULL); @@ -335,20 +315,13 @@ ptoninvalidate(struct cam_periph *periph) { struct pt_softc *softc; - struct ccb_setasync csa; softc = (struct pt_softc *)periph->softc; /* * De-register any async callbacks. */ - xpt_setup_ccb(&csa.ccb_h, periph->path, - /* priority */ 5); - csa.ccb_h.func_code = XPT_SASYNC_CB; - csa.event_enable = 0; - csa.callback = ptasync; - csa.callback_arg = periph; - xpt_action((union ccb *)&csa); + xpt_register_async(0, ptasync, periph, periph->path); softc->flags |= PT_FLAG_DEVICE_INVALID; ==== //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#29 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.110 2007/05/14 21:48:53 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.111 2007/05/16 16:54:23 scottl Exp $"); #include #include @@ -1331,30 +1331,12 @@ sainit(void) { cam_status status; - struct cam_path *path; /* * Install a global async callback. */ - status = xpt_create_path(&path, NULL, CAM_XPT_PATH_ID, - CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD); + status = xpt_register_async(AC_FOUND_DEVICE, saasync, NULL, NULL); - if (status == CAM_REQ_CMP) { - /* Register the async callbacks of interrest */ - struct ccb_setasync csa; /* - * This is an immediate CCB, - * so using the stack is OK - */ - xpt_setup_ccb(&csa.ccb_h, path, 5); - csa.ccb_h.func_code = XPT_SASYNC_CB; - csa.event_enable = AC_FOUND_DEVICE; - csa.callback = saasync; - csa.callback_arg = NULL; - xpt_action((union ccb *)&csa); - status = csa.ccb_h.status; - xpt_free_path(path); - } - if (status != CAM_REQ_CMP) { printf("sa: Failed to attach master async callback " "due to status 0x%x!\n", status); @@ -1365,20 +1347,13 @@ saoninvalidate(struct cam_periph *periph) { struct sa_softc *softc; - struct ccb_setasync csa; softc = (struct sa_softc *)periph->softc; /* * De-register any async callbacks. */ - xpt_setup_ccb(&csa.ccb_h, periph->path, - /* priority */ 5); - csa.ccb_h.func_code = XPT_SASYNC_CB; - csa.event_enable = 0; - csa.callback = saasync; - csa.callback_arg = periph; - xpt_action((union ccb *)&csa); + xpt_register_async(0, saasync, periph, periph->path); softc->flags |= SA_FLAG_INVALID; @@ -1462,7 +1437,6 @@ saregister(struct cam_periph *periph, void *arg) { struct sa_softc *softc; - struct ccb_setasync csa; struct ccb_getdev *cgd; caddr_t match; int i; @@ -1517,11 +1491,11 @@ * blocksize until we media is inserted. So, set a flag to * indicate that the blocksize is unavailable right now. */ + cam_periph_unlock(periph); softc->device_stats = devstat_new_entry("sa", periph->unit_number, 0, DEVSTAT_BS_UNAVAILABLE, SID_TYPE(&cgd->inq_data) | DEVSTAT_TYPE_IF_SCSI, DEVSTAT_PRIORITY_TAPE); - cam_periph_unlock(periph); softc->devs.ctl_dev = make_dev(&sa_cdevsw, SAMINOR(SA_CTLDEV, periph->unit_number, 0, SA_ATYPE_R), UID_ROOT, GID_OPERATOR, 0660, "%s%d.ctl", periph->periph_name, periph->unit_number); @@ -1570,12 +1544,7 @@ * Add an async callback so that we get * notified if this device goes away. */ - xpt_setup_ccb(&csa.ccb_h, periph->path, /* priority */ 5); - csa.ccb_h.func_code = XPT_SASYNC_CB; - csa.event_enable = AC_LOST_DEVICE; - csa.callback = saasync; - csa.callback_arg = periph; - xpt_action((union ccb *)&csa); + xpt_register_async(AC_LOST_DEVICE, saasync, periph, periph->path); xpt_announce_periph(periph, NULL); ==== //depot/projects/smpng/sys/cam/scsi/scsi_ses.c#16 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ses.c,v 1.34 2007/04/15 08:49:11 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_ses.c,v 1.35 2007/05/16 16:54:23 scottl Exp $"); #include #include @@ -190,28 +190,13 @@ sesinit(void) { cam_status status; - struct cam_path *path; /* * Install a global async callback. This callback will * receive async callbacks like "new device found". */ - status = xpt_create_path(&path, NULL, CAM_XPT_PATH_ID, - CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD); - - if (status == CAM_REQ_CMP) { - struct ccb_setasync csa; + status = xpt_register_async(AC_FOUND_DEVICE, sesasync, NULL, NULL); - xpt_setup_ccb(&csa.ccb_h, path, 5); - csa.ccb_h.func_code = XPT_SASYNC_CB; - csa.event_enable = AC_FOUND_DEVICE; - csa.callback = sesasync; - csa.callback_arg = NULL; - xpt_action((union ccb *)&csa); - status = csa.ccb_h.status; - xpt_free_path(path); - } - if (status != CAM_REQ_CMP) { printf("ses: Failed to attach master async callback " "due to status 0x%x!\n", status); @@ -222,19 +207,13 @@ sesoninvalidate(struct cam_periph *periph) { struct ses_softc *softc; - struct ccb_setasync csa; softc = (struct ses_softc *)periph->softc; /* * Unregister any async callbacks. */ - xpt_setup_ccb(&csa.ccb_h, periph->path, 5); - csa.ccb_h.func_code = XPT_SASYNC_CB; - csa.event_enable = 0; - csa.callback = sesasync; - csa.callback_arg = periph; - xpt_action((union ccb *)&csa); + xpt_register_async(0, sesasync, periph, periph->path); softc->ses_flags |= SES_FLAG_INVALID; @@ -310,7 +289,6 @@ sesregister(struct cam_periph *periph, void *arg) { struct ses_softc *softc; - struct ccb_setasync csa; struct ccb_getdev *cgd; char *tname; @@ -375,12 +353,7 @@ * Add an async callback so that we get * notified if this device goes away. */ - xpt_setup_ccb(&csa.ccb_h, periph->path, 5); - csa.ccb_h.func_code = XPT_SASYNC_CB; - csa.event_enable = AC_LOST_DEVICE; - csa.callback = sesasync; - csa.callback_arg = periph; - xpt_action((union ccb *)&csa); + xpt_register_async(AC_LOST_DEVICE, sesasync, periph, periph->path); switch (softc->ses_type) { default: ==== //depot/projects/smpng/sys/cam/scsi/scsi_sg.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.8 2007/04/18 04:58:52 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_sg.c,v 1.9 2007/05/16 16:54:23 scottl Exp $"); #include #include @@ -156,27 +156,12 @@ sginit(void) { cam_status status; - struct cam_path *path; /* * Install a global async callback. This callback will receive aync * callbacks like "new device found". */ - status = xpt_create_path(&path, /*periph*/NULL, CAM_XPT_PATH_ID, - CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD); - - if (status == CAM_REQ_CMP) { - struct ccb_setasync csa; - - xpt_setup_ccb(&csa.ccb_h, path, /*priority*/5); - csa.ccb_h.func_code = XPT_SASYNC_CB; - csa.event_enable = AC_FOUND_DEVICE; - csa.callback = sgasync; - csa.callback_arg = NULL; - xpt_action((union ccb *)&csa); - status = csa.ccb_h.status; - xpt_free_path(path); - } + status = xpt_register_async(AC_FOUND_DEVICE, sgasync, NULL, NULL); if (status != CAM_REQ_CMP) { printf("sg: Failed to attach master async callbac " @@ -188,19 +173,13 @@ sgoninvalidate(struct cam_periph *periph) { struct sg_softc *softc; - struct ccb_setasync csa; softc = (struct sg_softc *)periph->softc; /* * Deregister any async callbacks. */ - xpt_setup_ccb(&csa.ccb_h, periph->path, /*priority*/5); - csa.ccb_h.func_code = XPT_SASYNC_CB; - csa.event_enable = 0; - csa.callback = sgasync; - csa.callback_arg = periph; - xpt_action((union ccb *)&csa); + xpt_register_async(0, sgasync, periph, periph->path); softc->flags |= SG_FLAG_INVALID; @@ -274,7 +253,6 @@ sgregister(struct cam_periph *periph, void *arg) { struct sg_softc *softc; - struct ccb_setasync csa; struct ccb_getdev *cgd; int no_tags; @@ -306,6 +284,7 @@ * We pass in 0 for all blocksize, since we don't know what the * blocksize of the device is, if it even has a blocksize. */ + cam_periph_unlock(periph); no_tags = (cgd->inq_data.flags & SID_CmdQue) == 0; softc->device_stats = devstat_new_entry("sg", unit2minor(periph->unit_number), 0, @@ -317,7 +296,6 @@ DEVSTAT_PRIORITY_PASS); /* Register the device */ - cam_periph_unlock(periph); softc->dev = make_dev(&sg_cdevsw, unit2minor(periph->unit_number), UID_ROOT, GID_OPERATOR, 0600, "%s%d", periph->periph_name, periph->unit_number); @@ -329,12 +307,7 @@ * Add as async callback so that we get * notified if this device goes away. */ - xpt_setup_ccb(&csa.ccb_h, periph->path, /*priority*/5); - csa.ccb_h.func_code = XPT_SASYNC_CB; - csa.event_enable = AC_LOST_DEVICE; - csa.callback = sgasync; - csa.callback_arg = periph; - xpt_action((union ccb *)&csa); + xpt_register_async(AC_LOST_DEVICE, sgasync, periph, periph->path); if (bootverbose) xpt_announce_periph(periph, NULL); ==== //depot/projects/smpng/sys/cam/scsi/scsi_targ_bh.c#12 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_targ_bh.c,v 1.24 2007/04/15 08:49:11 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_targ_bh.c,v 1.25 2007/05/16 16:54:23 scottl Exp $"); #include #include @@ -156,27 +156,13 @@ targbhinit(void) { cam_status status; - struct cam_path *path; /* * Install a global async callback. This callback will * receive async callbacks like "new path registered". */ - status = xpt_create_path(&path, /*periph*/NULL, CAM_XPT_PATH_ID, - CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD); - >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri May 18 06:17:53 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1A88F16A404; Fri, 18 May 2007 06:17:53 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BE04716A402 for ; Fri, 18 May 2007 06:17:52 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id ACCEF13C458 for ; Fri, 18 May 2007 06:17:52 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4I6HqMw053818 for ; Fri, 18 May 2007 06:17:52 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4I6HiV1053718 for perforce@freebsd.org; Fri, 18 May 2007 06:17:44 GMT (envelope-from mjacob@freebsd.org) Date: Fri, 18 May 2007 06:17:44 GMT Message-Id: <200705180617.l4I6HiV1053718@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 119983 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 May 2007 06:17:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=119983 Change 119983 by mjacob@mjexp on 2007/05/18 06:17:33 IFC Affected files ... .. //depot/projects/mjexp/Makefile.inc1#9 integrate .. //depot/projects/mjexp/UPDATING#15 integrate .. //depot/projects/mjexp/lib/libc/Makefile#3 integrate .. //depot/projects/mjexp/lib/libc/amd64/Symbol.map#3 integrate .. //depot/projects/mjexp/lib/libc/arm/Symbol.map#3 integrate .. //depot/projects/mjexp/lib/libc/gmon/Symbol.map#3 integrate .. //depot/projects/mjexp/lib/libc/i386/Symbol.map#4 integrate .. //depot/projects/mjexp/lib/libc/net/Symbol.map#4 integrate .. //depot/projects/mjexp/lib/libc/net/ether_addr.c#3 integrate .. //depot/projects/mjexp/lib/libc/net/ethers.3#2 integrate .. //depot/projects/mjexp/lib/libc/powerpc/Symbol.map#3 integrate .. //depot/projects/mjexp/lib/libc_r/Makefile#2 integrate .. //depot/projects/mjexp/lib/libpthread/Makefile#2 integrate .. //depot/projects/mjexp/lib/libpthread/pthread.map#3 integrate .. //depot/projects/mjexp/lib/libpthread/thread/thr_private.h#4 integrate .. //depot/projects/mjexp/lib/librt/Makefile#3 integrate .. //depot/projects/mjexp/lib/libthr/Makefile#3 integrate .. //depot/projects/mjexp/lib/libthr/pthread.map#3 integrate .. //depot/projects/mjexp/lib/libthread_db/Makefile#3 integrate .. //depot/projects/mjexp/lib/msun/Makefile#3 integrate .. //depot/projects/mjexp/libexec/rtld-elf/Makefile#5 integrate .. //depot/projects/mjexp/share/mk/bsd.lib.mk#4 integrate .. //depot/projects/mjexp/share/mk/bsd.libnames.mk#5 integrate .. //depot/projects/mjexp/share/mk/bsd.own.mk#5 integrate .. //depot/projects/mjexp/share/mk/bsd.symver.mk#3 integrate .. //depot/projects/mjexp/sys/amd64/linux32/linux32_sysvec.c#6 integrate .. //depot/projects/mjexp/sys/cam/cam_periph.c#6 integrate .. //depot/projects/mjexp/sys/cam/cam_xpt.c#11 integrate .. //depot/projects/mjexp/sys/cam/cam_xpt.h#6 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_cd.c#5 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_ch.c#4 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_da.c#10 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_pass.c#5 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_pt.c#5 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_sa.c#5 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_ses.c#4 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_sg.c#5 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_targ_bh.c#4 integrate .. //depot/projects/mjexp/sys/compat/ia32/ia32_sysvec.c#3 integrate .. //depot/projects/mjexp/sys/conf/Makefile.amd64#3 integrate .. //depot/projects/mjexp/sys/conf/Makefile.arm#3 integrate .. //depot/projects/mjexp/sys/conf/Makefile.i386#3 integrate .. //depot/projects/mjexp/sys/conf/Makefile.ia64#3 integrate .. //depot/projects/mjexp/sys/conf/Makefile.pc98#3 integrate .. //depot/projects/mjexp/sys/conf/Makefile.powerpc#3 integrate .. //depot/projects/mjexp/sys/conf/Makefile.sparc64#3 integrate .. //depot/projects/mjexp/sys/conf/Makefile.sun4v#3 integrate .. //depot/projects/mjexp/sys/conf/NOTES#21 integrate .. //depot/projects/mjexp/sys/conf/files#24 integrate .. //depot/projects/mjexp/sys/conf/options#18 integrate .. //depot/projects/mjexp/sys/dev/acpica/acpi.c#7 integrate .. //depot/projects/mjexp/sys/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/mjexp/sys/dev/acpica/acpivar.h#4 integrate .. //depot/projects/mjexp/sys/dev/bce/if_bce.c#13 integrate .. //depot/projects/mjexp/sys/dev/bce/if_bcefw.h#3 integrate .. //depot/projects/mjexp/sys/dev/bce/if_bcereg.h#7 integrate .. //depot/projects/mjexp/sys/dev/cardbus/cardbus.c#3 integrate .. //depot/projects/mjexp/sys/dev/cardbus/cardbus_cis.c#2 integrate .. //depot/projects/mjexp/sys/dev/ciss/ciss.c#8 integrate .. //depot/projects/mjexp/sys/dev/em/e1000_80003es2lan.c#2 integrate .. //depot/projects/mjexp/sys/dev/em/e1000_80003es2lan.h#2 integrate .. //depot/projects/mjexp/sys/dev/em/e1000_82540.c#2 integrate .. //depot/projects/mjexp/sys/dev/em/e1000_82541.c#2 integrate .. //depot/projects/mjexp/sys/dev/em/e1000_82541.h#2 integrate .. //depot/projects/mjexp/sys/dev/em/e1000_82542.c#2 integrate .. //depot/projects/mjexp/sys/dev/em/e1000_82543.c#2 integrate .. //depot/projects/mjexp/sys/dev/em/e1000_82543.h#2 integrate .. //depot/projects/mjexp/sys/dev/em/e1000_82571.c#2 integrate .. //depot/projects/mjexp/sys/dev/em/e1000_82571.h#2 integrate .. //depot/projects/mjexp/sys/dev/em/e1000_82575.c#2 integrate .. //depot/projects/mjexp/sys/dev/em/e1000_82575.h#2 integrate .. //depot/projects/mjexp/sys/dev/em/e1000_api.c#2 integrate .. //depot/projects/mjexp/sys/dev/em/e1000_api.h#2 integrate .. //depot/projects/mjexp/sys/dev/em/e1000_defines.h#2 integrate .. //depot/projects/mjexp/sys/dev/em/e1000_hw.h#2 integrate .. //depot/projects/mjexp/sys/dev/em/e1000_ich8lan.c#2 integrate .. //depot/projects/mjexp/sys/dev/em/e1000_ich8lan.h#2 integrate .. //depot/projects/mjexp/sys/dev/em/e1000_mac.c#2 integrate .. //depot/projects/mjexp/sys/dev/em/e1000_mac.h#2 integrate .. //depot/projects/mjexp/sys/dev/em/e1000_manage.c#2 integrate .. //depot/projects/mjexp/sys/dev/em/e1000_manage.h#2 integrate .. //depot/projects/mjexp/sys/dev/em/e1000_nvm.c#2 integrate .. //depot/projects/mjexp/sys/dev/em/e1000_nvm.h#2 integrate .. //depot/projects/mjexp/sys/dev/em/e1000_osdep.h#2 integrate .. //depot/projects/mjexp/sys/dev/em/e1000_phy.c#2 integrate .. //depot/projects/mjexp/sys/dev/em/e1000_phy.h#2 integrate .. //depot/projects/mjexp/sys/dev/em/e1000_regs.h#2 integrate .. //depot/projects/mjexp/sys/dev/em/if_em.c#7 integrate .. //depot/projects/mjexp/sys/dev/em/if_em.h#5 integrate .. //depot/projects/mjexp/sys/dev/isp/isp_freebsd.c#27 integrate .. //depot/projects/mjexp/sys/dev/mfi/mfi.c#9 integrate .. //depot/projects/mjexp/sys/dev/mfi/mfi_cam.c#1 branch .. //depot/projects/mjexp/sys/dev/mfi/mfireg.h#4 integrate .. //depot/projects/mjexp/sys/dev/mfi/mfivar.h#4 integrate .. //depot/projects/mjexp/sys/dev/mmc/mmc.c#2 integrate .. //depot/projects/mjexp/sys/dev/mmc/mmcsd.c#2 integrate .. //depot/projects/mjexp/sys/dev/mmc/mmcvar.h#2 integrate .. //depot/projects/mjexp/sys/dev/pccbb/pccbb.c#7 integrate .. //depot/projects/mjexp/sys/dev/pci/pci.c#17 integrate .. //depot/projects/mjexp/sys/dev/pci/pci_private.h#7 integrate .. //depot/projects/mjexp/sys/dev/pci/pcireg.h#10 integrate .. //depot/projects/mjexp/sys/dev/uart/uart_bus_pci.c#3 integrate .. //depot/projects/mjexp/sys/geom/part/g_part.c#4 integrate .. //depot/projects/mjexp/sys/i386/Makefile#2 integrate .. //depot/projects/mjexp/sys/kern/Make.tags.inc#4 integrate .. //depot/projects/mjexp/sys/kern/imgact_elf.c#4 integrate .. //depot/projects/mjexp/sys/kern/kern_exec.c#7 integrate .. //depot/projects/mjexp/sys/kern/kern_exit.c#6 integrate .. //depot/projects/mjexp/sys/kern/kern_mib.c#4 integrate .. //depot/projects/mjexp/sys/kern/kern_resource.c#10 integrate .. //depot/projects/mjexp/sys/kern/uipc_domain.c#2 integrate .. //depot/projects/mjexp/sys/kern/uipc_mbuf.c#7 integrate .. //depot/projects/mjexp/sys/kern/uipc_sockbuf.c#4 integrate .. //depot/projects/mjexp/sys/kern/uipc_socket.c#12 integrate .. //depot/projects/mjexp/sys/kern/uipc_syscalls.c#11 integrate .. //depot/projects/mjexp/sys/kern/vfs_vnops.c#5 integrate .. //depot/projects/mjexp/sys/modules/mfi/Makefile#2 integrate .. //depot/projects/mjexp/sys/modules/mfi/mfip/Makefile#1 branch .. //depot/projects/mjexp/sys/modules/netgraph/Makefile#3 integrate .. //depot/projects/mjexp/sys/modules/netgraph/car/Makefile#1 branch .. //depot/projects/mjexp/sys/net/ieee8023ad_lacp.c#4 integrate .. //depot/projects/mjexp/sys/net/ieee8023ad_lacp.h#4 integrate .. //depot/projects/mjexp/sys/net/if.c#9 integrate .. //depot/projects/mjexp/sys/net/if.h#3 integrate .. //depot/projects/mjexp/sys/net/if_lagg.c#3 integrate .. //depot/projects/mjexp/sys/net/if_lagg.h#3 integrate .. //depot/projects/mjexp/sys/net/if_var.h#5 integrate .. //depot/projects/mjexp/sys/netgraph/ng_car.c#1 branch .. //depot/projects/mjexp/sys/netgraph/ng_car.h#1 branch .. //depot/projects/mjexp/sys/netinet/ip_input.c#6 integrate .. //depot/projects/mjexp/sys/netinet/sctp.h#5 integrate .. //depot/projects/mjexp/sys/netinet/sctp_asconf.c#9 integrate .. //depot/projects/mjexp/sys/netinet/sctp_auth.c#8 integrate .. //depot/projects/mjexp/sys/netinet/sctp_constants.h#9 integrate .. //depot/projects/mjexp/sys/netinet/sctp_indata.c#12 integrate .. //depot/projects/mjexp/sys/netinet/sctp_input.c#12 integrate .. //depot/projects/mjexp/sys/netinet/sctp_output.c#13 integrate .. //depot/projects/mjexp/sys/netinet/sctp_pcb.c#12 integrate .. //depot/projects/mjexp/sys/netinet/sctp_sysctl.c#4 integrate .. //depot/projects/mjexp/sys/netinet/sctp_timer.c#10 integrate .. //depot/projects/mjexp/sys/netinet/sctp_uio.h#12 integrate .. //depot/projects/mjexp/sys/netinet/sctp_usrreq.c#12 integrate .. //depot/projects/mjexp/sys/netinet/sctputil.c#12 integrate .. //depot/projects/mjexp/sys/netinet/tcp_input.c#14 integrate .. //depot/projects/mjexp/sys/netinet/tcp_reass.c#2 integrate .. //depot/projects/mjexp/sys/netinet/tcp_subr.c#11 integrate .. //depot/projects/mjexp/sys/netinet/tcp_timer.c#7 integrate .. //depot/projects/mjexp/sys/netinet/tcp_timer.h#4 integrate .. //depot/projects/mjexp/sys/netinet/tcp_timewait.c#2 integrate .. //depot/projects/mjexp/sys/netinet/tcp_var.h#8 integrate .. //depot/projects/mjexp/sys/netinet/udp_usrreq.c#10 integrate .. //depot/projects/mjexp/sys/netinet6/ip6_input.c#4 integrate .. //depot/projects/mjexp/sys/netinet6/sctp6_usrreq.c#10 integrate .. //depot/projects/mjexp/sys/sys/lockf.h#2 integrate .. //depot/projects/mjexp/sys/sys/sysent.h#4 integrate .. //depot/projects/mjexp/tools/regression/lib/libc/net/Makefile#2 integrate .. //depot/projects/mjexp/tools/regression/lib/libc/net/test-ether.c#1 branch .. //depot/projects/mjexp/tools/regression/lib/libc/net/test-ether.t#1 branch .. //depot/projects/mjexp/usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.8#3 integrate Differences ... ==== //depot/projects/mjexp/Makefile.inc1#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.572 2007/04/17 15:52:36 pjd Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.574 2007/05/13 18:15:50 des Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -1016,7 +1016,7 @@ ${_lib_libgssapi} ${_lib_libipx} \ lib/libkiconv lib/libkvm lib/libmd \ lib/ncurses/ncurses lib/ncurses/ncursesw \ - lib/libopie lib/libpam lib/libpthread \ + lib/libopie lib/libpam lib/${DEFAULT_THREAD_LIB} \ lib/libradius lib/libsbuf lib/libtacplus lib/libutil \ ${_lib_libypclnt} lib/libz lib/msun \ ${_secure_lib_libcrypto} ${_secure_lib_libssh} \ @@ -1135,18 +1135,14 @@ delete-old-files: @echo ">>> Removing old files (only deletes safe to delete libs)" -.for file in ${OLD_FILES} # Ask for every old file if the user really wants to remove it. # It's annoying, but better safe than sorry. - @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ - rm ${RM_I} "${DESTDIR}/${file}" || true; \ - if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then\ - echo "Removing schg flag on ${DESTDIR}/${file}"; \ - chflags noschg "${DESTDIR}/${file}"; \ - rm ${RM_I} "${DESTDIR}/${file}"; \ + @(cd ${DESTDIR}/ && for file in ${OLD_FILES}; do \ + if [ -f "./$${file}" -o -L "./$${file}" ]; then \ + chflags noschg "./$${file}" 2>/dev/null || true; \ + rm ${RM_I} "${DESTDIR}/$${file}" || true; \ fi; \ - fi -.endfor + done) # Remove catpages without corresponding manpages. @3<&0; \ find ${DESTDIR}/usr/share/man/cat* ! -type d | \ @@ -1161,11 +1157,11 @@ check-old-files: @echo ">>> Checking for old files" -.for file in ${OLD_FILES} - @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ - echo "${DESTDIR}/${file}"; \ - fi -.endfor + @(cd ${DESTDIR}/ && for file in ${OLD_FILES}; do \ + if [ -f "./$${file}" -o -L "./$${file}" ]; then \ + echo "${DESTDIR}/$${file}"; \ + fi; \ + done) # Check for catpages without corresponding manpages. @find ${DESTDIR}/usr/share/man/cat* ! -type d | \ sed -ep -e's:${DESTDIR}/usr/share/man/cat:${DESTDIR}/usr/share/man/man:' | \ @@ -1179,25 +1175,21 @@ delete-old-libs: @echo ">>> Removing old libraries" @echo "${OLD_LIBS_MESSAGE}" | fmt -.for file in ${OLD_LIBS} - @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ - rm ${RM_I} "${DESTDIR}/${file}" || true; \ - if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then\ - echo "Removing schg flag on ${DESTDIR}/${file}"; \ - chflags noschg "${DESTDIR}/${file}"; \ - rm ${RM_I} "${DESTDIR}/${file}"; \ + @(cd ${DESTDIR}/ && for file in ${OLD_LIBS}; do \ + if [ -f "./$${file}" -o -L "./$${file}" ]; then \ + chflags noschg "./$${file}" 2>/dev/null || true; \ + rm ${RM_I} "${DESTDIR}/$${file}" || true; \ fi; \ - fi -.endfor + done) @echo ">>> Old libraries removed" check-old-libs: @echo ">>> Checking for old libraries" -.for file in ${OLD_LIBS} - @if [ -f "${DESTDIR}/${file}" -o -L "${DESTDIR}/${file}" ]; then \ - echo "${DESTDIR}/${file}"; \ - fi -.endfor + @(cd ${DESTDIR}/ && for file in ${OLD_LIBS}; do \ + if [ -f "./$${file}" -o -L "./$${file}" ]; then \ + echo "${DESTDIR}/$${file}"; \ + fi; \ + done) delete-old-dirs: @echo ">>> Removing old directories" ==== //depot/projects/mjexp/UPDATING#15 (text+ko) ==== @@ -21,6 +21,19 @@ developers choose to disable these features on build machines to maximize performance. +20070513: + Symbol versioning is enabled by default. To disable it, use + option WITHOUT_SYMVER. It is not advisable to attempt to + disable symbol versioning once it is enabled; your installworld + will break because a symbol version-less libc will get installed + before the install tools. As a result, the old install tools, + which previously had symbol dependencies to FBSD_1.0, will fail + because the freshly installed libc will not have them. + + The default threading library has been changed to libthr. If + you wish to have libpthread as your default, use option + DEFAULT_THREAD_LIB=libpthread for the buildworld. + 20070423: The ABI breakage in sendmail(8)'s libmilter has been repaired so it is no longer necessary to recompile mail filters (aka, @@ -773,4 +786,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.489 2007/04/23 22:15:07 gshapiro Exp $ +$FreeBSD: src/UPDATING,v 1.490 2007/05/13 14:41:48 deischen Exp $ ==== //depot/projects/mjexp/lib/libc/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 2/3/94 -# $FreeBSD: src/lib/libc/Makefile,v 1.69 2007/03/04 12:25:03 simon Exp $ +# $FreeBSD: src/lib/libc/Makefile,v 1.70 2007/05/13 14:12:38 deischen Exp $ SHLIBDIR?= /lib @@ -76,11 +76,9 @@ CFLAGS+=-D_FREEFALL_CONFIG .endif -.if defined(SYMVER_ENABLED) VERSION_DEF=${.CURDIR}/Versions.def SYMBOL_MAPS=${SYM_MAPS} CFLAGS+= -DSYMBOL_VERSIONING -.endif # If there are no machine dependent sources, append all the # machine-independent sources: ==== //depot/projects/mjexp/lib/libc/amd64/Symbol.map#3 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/amd64/Symbol.map,v 1.2 2007/04/29 14:05:15 deischen Exp $ + * $FreeBSD: src/lib/libc/amd64/Symbol.map,v 1.3 2007/05/13 14:16:54 deischen Exp $ */ /* @@ -11,6 +11,7 @@ /* PSEUDO syscalls */ _exit; + .mcount; _setjmp; _longjmp; fabs; ==== //depot/projects/mjexp/lib/libc/arm/Symbol.map#3 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/arm/Symbol.map,v 1.2 2007/04/29 14:05:15 deischen Exp $ + * $FreeBSD: src/lib/libc/arm/Symbol.map,v 1.3 2007/05/13 14:16:54 deischen Exp $ */ /* @@ -11,6 +11,7 @@ /* PSEUDO syscalls */ _exit; + _mcount; _setjmp; _longjmp; alloca; @@ -22,7 +23,7 @@ setjmp; longjmp; sigsetjmp; - siglongjmp + siglongjmp; htonl; __htonl; htons; @@ -65,4 +66,26 @@ __sys_fork; _fork; _sbrk; + + /* softfloat */ + __addsf3; + __adddf3; + __subsf3; + __subdf3; + __mulsf3; + __muldf3; + __divsf3; + __divdf3; + __floatsisf; + __floatsidf; + __floatdisf; + __floatdidf; + __fixsfsi; + __fixdfsi; + __fixsfdi; + __fixdfdi; + __fixunssfsi; + __fixunsdfsi; + __extendsfdf2; + __truncdfsf2; }; ==== //depot/projects/mjexp/lib/libc/gmon/Symbol.map#3 (text) ==== @@ -1,9 +1,8 @@ /* - * $FreeBSD: src/lib/libc/gmon/Symbol.map,v 1.2 2007/04/29 14:05:16 deischen Exp $ + * $FreeBSD: src/lib/libc/gmon/Symbol.map,v 1.3 2007/05/13 14:16:55 deischen Exp $ */ FBSD_1.0 { - .mcount; _mcleanup; monstartup; moncontrol; ==== //depot/projects/mjexp/lib/libc/i386/Symbol.map#4 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/i386/Symbol.map,v 1.3 2007/04/29 14:05:16 deischen Exp $ + * $FreeBSD: src/lib/libc/i386/Symbol.map,v 1.4 2007/05/13 14:16:55 deischen Exp $ */ /* @@ -11,6 +11,7 @@ /* PSEUDO syscalls */ _exit; + .mcount; _setjmp; _longjmp; alloca; ==== //depot/projects/mjexp/lib/libc/net/Symbol.map#4 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/net/Symbol.map,v 1.8 2007/04/29 14:05:17 deischen Exp $ + * $FreeBSD: src/lib/libc/net/Symbol.map,v 1.9 2007/05/13 15:01:25 rwatson Exp $ */ FBSD_1.0 { @@ -7,7 +7,9 @@ __b64_pton; ether_line; ether_aton; + ether_aton_r; ether_ntoa; + ether_ntoa_r; ether_ntohost; ether_hostton; eui64_aton; ==== //depot/projects/mjexp/lib/libc/net/ether_addr.c#3 (text+ko) ==== @@ -1,5 +1,6 @@ /* * Copyright (c) 1995 Bill Paul . + * Copyright (c) 2007 Robert N. M. Watson * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -37,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libc/net/ether_addr.c,v 1.16 2007/05/13 12:04:06 rwatson Exp $"); +__FBSDID("$FreeBSD: src/lib/libc/net/ether_addr.c,v 1.17 2007/05/13 13:57:44 rwatson Exp $"); #include #include @@ -67,53 +68,67 @@ int ether_line(const char *l, struct ether_addr *e, char *hostname) { - int i, o[6]; + int i, o[6]; - i = sscanf(l, "%x:%x:%x:%x:%x:%x %s", &o[0], &o[1], &o[2], &o[3], + i = sscanf(l, "%x:%x:%x:%x:%x:%x %s", &o[0], &o[1], &o[2], &o[3], &o[4], &o[5], hostname); if (i != 7) - return (i); - for (i=0; i<6; i++) - e->octet[i] = o[i]; - return (0); + return (i); + for (i=0; i<6; i++) + e->octet[i] = o[i]; + return (0); } /* * Convert an ASCII representation of an ethernet address to binary form. */ struct ether_addr * +ether_aton_r(const char *a, struct ether_addr *e) +{ + int i; + unsigned int o0, o1, o2, o3, o4, o5; + + i = sscanf(a, "%x:%x:%x:%x:%x:%x", &o0, &o1, &o2, &o3, &o4, &o5); + if (i != 6) + return (NULL); + e->octet[0]=o0; + e->octet[1]=o1; + e->octet[2]=o2; + e->octet[3]=o3; + e->octet[4]=o4; + e->octet[5]=o5; + return (e); +} + +struct ether_addr * ether_aton(const char *a) { - int i; - static struct ether_addr o; - unsigned int o0, o1, o2, o3, o4, o5; + static struct ether_addr e; - i = sscanf(a, "%x:%x:%x:%x:%x:%x", &o0, &o1, &o2, &o3, &o4, &o5); - if (i != 6) - return (NULL); - o.octet[0]=o0; - o.octet[1]=o1; - o.octet[2]=o2; - o.octet[3]=o3; - o.octet[4]=o4; - o.octet[5]=o5; - return ((struct ether_addr *)&o); + return (ether_aton_r(a, &e)); } /* * Convert a binary representation of an ethernet address to an ASCII string. */ char * +ether_ntoa_r(const struct ether_addr *n, char *a) +{ + int i; + + i = sprintf(a, "%02x:%02x:%02x:%02x:%02x:%02x", n->octet[0], + n->octet[1], n->octet[2], n->octet[3], n->octet[4], n->octet[5]); + if (i < 17) + return (NULL); + return (a); +} + +char * ether_ntoa(const struct ether_addr *n) { - int i; static char a[18]; - i = sprintf(a, "%02x:%02x:%02x:%02x:%02x:%02x", n->octet[0], - n->octet[1], n->octet[2], n->octet[3], n->octet[4], n->octet[5]); - if (i < 17) - return (NULL); - return ((char *)&a); + return (ether_ntoa_r(n, a)); } /* ==== //depot/projects/mjexp/lib/libc/net/ethers.3#2 (text+ko) ==== @@ -1,5 +1,6 @@ -.\" Copyright (c) 1995 -.\" Bill Paul . All rights reserved. +.\" Copyright (c) 1995 Bill Paul . +.\" Copyright (c) 2007 Robert N. M. Watson +.\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without .\" modification, are permitted provided that the following conditions @@ -28,16 +29,18 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libc/net/ethers.3,v 1.23 2005/01/20 09:17:03 ru Exp $ +.\" $FreeBSD: src/lib/libc/net/ethers.3,v 1.24 2007/05/13 13:57:45 rwatson Exp $ .\" -.Dd April 12, 1995 +.Dd May 13, 2007 .Dt ETHERS 3 .Os .Sh NAME .Nm ethers , .Nm ether_line , .Nm ether_aton , +.Nm ether_aton_r , .Nm ether_ntoa , +.Nm ether_ntoa_r , .Nm ether_ntohost , .Nm ether_hostton .Nd Ethernet address conversion and lookup routines @@ -51,8 +54,12 @@ .Fn ether_line "const char *l" "struct ether_addr *e" "char *hostname" .Ft struct ether_addr * .Fn ether_aton "const char *a" +.Ft struct ether_addr * +.Fn ether_aton_r "const char *a" "struct ether_addr *e" .Ft char * .Fn ether_ntoa "const struct ether_addr *n" +.Ft char * +.Fn ether_ntoa_r "const struct ether_addr *n" "char *buf" .Ft int .Fn ether_ntohost "char *hostname" "const struct ether_addr *e" .Ft int @@ -95,18 +102,23 @@ .Pp The .Fn ether_aton -function converts an +and +.Fn ether_aton_r +functions convert .Tn ASCII -representation of an ethernet address into an +representation of ethernet addresses into .Vt ether_addr -structure. -Likewise, +structures. +Likewise, the .Fn ether_ntoa -converts an ethernet address specified as an +and +.Fn ether_ntoa_r +functions +convert ethernet addresses specified as .Vt ether_addr -structure into an +structures into .Tn ASCII -string. +strings. .Pp The .Fn ether_ntohost @@ -138,7 +150,9 @@ .Pp On success, .Fn ether_ntoa -returns a pointer to a string containing an +and +.Fn ether_ntoa_r +functions return a pointer to a string containing an .Tn ASCII representation of an ethernet address. If it is unable to convert @@ -147,13 +161,25 @@ structure, it returns a .Dv NULL pointer. +.Fn ether_ntoa +stores the result in a static buffer; +.Fn ether_ntoa_r +stores the result in a user-passed buffer. +.Pp + Likewise, .Fn ether_aton -returns a pointer to an +and +.Fn ether_aton_r +return a pointer to an .Vt ether_addr structure on success and a .Dv NULL pointer on failure. +.Fn ether_aton +stores the result in a static buffer; +.Fn ether_aton_r +stores the result in a user-passed buffer. .Pp The .Fn ether_ntohost @@ -192,6 +218,8 @@ .Nm library functions were written for and first appeared in .Fx 2.1 . +Thread-safe function variants first appeared in +.Fx 7.0 . .Sh BUGS The .Fn ether_aton @@ -199,3 +227,8 @@ .Fn ether_ntoa functions returns values that are stored in static memory areas which may be overwritten the next time they are called. +.Pp +.Fn ether_ntoa_r +accepts a character buffer pointer, but not a buffer length. +The caller must ensure adequate space is available in the buffer in order to +avoid a buffer overflow. ==== //depot/projects/mjexp/lib/libc/powerpc/Symbol.map#3 (text) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/lib/libc/powerpc/Symbol.map,v 1.2 2007/04/29 14:05:18 deischen Exp $ + * $FreeBSD: src/lib/libc/powerpc/Symbol.map,v 1.3 2007/05/13 14:16:55 deischen Exp $ */ /* @@ -11,6 +11,7 @@ /* PSEUDO syscalls */ _exit; + _mcount; _setjmp; _longjmp; fabs; ==== //depot/projects/mjexp/lib/libc_r/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libc_r/Makefile,v 1.45 2006/08/22 07:51:07 ru Exp $ +# $FreeBSD: src/lib/libc_r/Makefile,v 1.46 2007/05/13 14:12:39 deischen Exp $ # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does @@ -7,6 +7,13 @@ # To included legacy CSRG sccsid strings, add -DLIBC_SCCS and -DSYSLIBC_SCCS # (for system call stubs) to CFLAGS below. -DSYSLIBC_SCCS affects just the # system call stubs. + +.if defined(DEFAULT_THREAD_LIB) && (${DEFAULT_THREAD_LIB} == "libc_r") +SHLIBDIR?= /lib +.endif + +.include + LIB=c_r SHLIB_MAJOR= 6 CFLAGS+=-DPTHREAD_KERNEL @@ -25,7 +32,7 @@ .include "${.CURDIR}/uthread/Makefile.inc" .include "${.CURDIR}/sys/Makefile.inc" -.if ${MACHINE_ARCH} == "sparc64" +.if ${DEFAULT_THREAD_LIB} == "libc_r" SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a .if !defined(NO_PIC) SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so ==== //depot/projects/mjexp/lib/libpthread/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/lib/libpthread/Makefile,v 1.59 2006/08/22 07:51:07 ru Exp $ +# $FreeBSD: src/lib/libpthread/Makefile,v 1.60 2007/05/13 14:12:39 deischen Exp $ # # All library objects contain FreeBSD revision strings by default; they may be # excluded as a space-saving measure. To produce a library that does @@ -7,12 +7,14 @@ # To included legacy CSRG sccsid strings, add -DLIBC_SCCS and -DSYSLIBC_SCCS # (for system call stubs) to CFLAGS below. -DSYSLIBC_SCCS affects just the # system call stubs. -.if ${MACHINE_ARCH} == "sparc64" -LIB=kse -.else -LIB=pthread + +.if defined(DEFAULT_THREAD_LIB) && (${DEFAULT_THREAD_LIB} == "libpthread") SHLIBDIR?= /lib .endif + +.include + +LIB=kse SHLIB_MAJOR= 2 CFLAGS+=-DPTHREAD_KERNEL CFLAGS+=-I${.CURDIR}/../libc/include -I${.CURDIR}/thread \ @@ -37,13 +39,6 @@ VERSION_MAP=${.CURDIR}/pthread.map -.if defined(SYMVER_ENABLED) -# Remove this if library version is bumped and LIBPTHREAD_1_0 -# compatability hacks are removed (see thread/thr_private.h). -LDFLAGS+=-Wl,-zmuldefs -CFLAGS+=-DSYMBOL_VERSIONING -.endif - PRECIOUSLIB= .include "${.CURDIR}/arch/${MACHINE_ARCH}/Makefile.inc" @@ -51,4 +46,14 @@ .include "${.CURDIR}/sys/Makefile.inc" .include "${.CURDIR}/thread/Makefile.inc" +.if ${DEFAULT_THREAD_LIB} == "libpthread" +SYMLINKS+=lib${LIB}.a ${LIBDIR}/libpthread.a +.if !defined(NO_PIC) +SYMLINKS+=lib${LIB}.so ${LIBDIR}/libpthread.so +.endif +.if ${MK_PROFILE} != "no" +SYMLINKS+=lib${LIB}_p.a ${LIBDIR}/libpthread_p.a +.endif +.endif + .include ==== //depot/projects/mjexp/lib/libpthread/pthread.map#3 (text+ko) ==== @@ -1,374 +1,6 @@ /* - * $FreeBSD: src/lib/libpthread/pthread.map,v 1.19 2007/04/29 14:05:15 deischen Exp $ - */ - -/* - * Hack. libpthread had versioning before libc, but we need to - * reside in the same namespace as libc if we want to override - * libc functions. Use this so we don't break older applications - * that require symbols from "LIBTHREAD_1_0". - * - * From now on, use the same naming scheme as libc. + * $FreeBSD: src/lib/libpthread/pthread.map,v 1.20 2007/05/13 14:12:39 deischen Exp $ */ -LIBTHREAD_1_0 { -global: - ___creat; - __accept; - __close; - __connect; - __error; - __fcntl; - __fsync; - __msync; - __nanosleep; - __open; - __poll; - __pthread_cond_timedwait; - __pthread_cond_wait; - __pthread_mutex_init; - __pthread_mutex_lock; - __pthread_mutex_trylock; - __pthread_mutex_timedlock; - __read; - __readv; - __select; - __sigsuspend; - __sigtimedwait; - __sigwait; - __sigwaitinfo; - __wait4; - __write; - __writev; - _aio_suspend; - _execve; - _fork; - _nanosleep; - _pause; - _pselect; - _pthread_atfork; - _pthread_barrier_destroy; - _pthread_barrier_init; - _pthread_barrier_wait; - _pthread_barrierattr_destroy; - _pthread_barrierattr_getpshared; - _pthread_barrierattr_init; - _pthread_barrierattr_setpshared; - _pthread_attr_destroy; - _pthread_attr_get_np; - _pthread_attr_getdetachstate; - _pthread_attr_getguardsize; - _pthread_attr_getinheritsched; - _pthread_attr_getschedparam; - _pthread_attr_getschedpolicy; - _pthread_attr_getscope; - _pthread_attr_getstack; - _pthread_attr_getstackaddr; - _pthread_attr_getstacksize; - _pthread_attr_init; - _pthread_attr_setcreatesuspend_np; - _pthread_attr_setdetachstate; - _pthread_attr_setguardsize; - _pthread_attr_setinheritsched; - _pthread_attr_setschedparam; - _pthread_attr_setschedpolicy; - _pthread_attr_setscope; - _pthread_attr_setstack; - _pthread_attr_setstackaddr; - _pthread_attr_setstacksize; - _pthread_cancel; - _pthread_cleanup_pop; - _pthread_cleanup_push; - _pthread_cond_broadcast; - _pthread_cond_destroy; - _pthread_cond_init; - _pthread_cond_signal; - _pthread_cond_timedwait; - _pthread_cond_wait; - _pthread_condattr_default; - _pthread_condattr_destroy; - _pthread_condattr_getpshared; - _pthread_condattr_init; - _pthread_condattr_setpshared; - _pthread_create; - _pthread_detach; - _pthread_equal; - _pthread_exit; - _pthread_getconcurrency; - _pthread_getprio; - _pthread_getschedparam; - _pthread_getspecific; - _pthread_join; - _pthread_key_create; - _pthread_key_delete; - _pthread_kill; - _pthread_main_np; - _pthread_multi_np; - _pthread_mutex_destroy; - _pthread_mutex_getprioceiling; - _pthread_mutex_init; - _pthread_mutex_lock; - _pthread_mutex_setprioceiling; - _pthread_mutex_timedlock; - _pthread_mutex_trylock; - _pthread_mutex_unlock; - _pthread_mutexattr_default; - _pthread_mutexattr_destroy; - _pthread_mutexattr_getkind_np; - _pthread_mutexattr_getprioceiling; - _pthread_mutexattr_getprotocol; - _pthread_mutexattr_getpshared; - _pthread_mutexattr_gettype; - _pthread_mutexattr_init; - _pthread_mutexattr_setkind_np; - _pthread_mutexattr_setprioceiling; - _pthread_mutexattr_setprotocol; - _pthread_mutexattr_setpshared; - _pthread_mutexattr_settype; - _pthread_once; - _pthread_resume_all_np; - _pthread_resume_np; - _pthread_rwlock_destroy; - _pthread_rwlock_init; - _pthread_rwlock_rdlock; - _pthread_rwlock_timedrdlock; - _pthread_rwlock_timedwrlock; - _pthread_rwlock_tryrdlock; - _pthread_rwlock_trywrlock; - _pthread_rwlock_unlock; - _pthread_rwlock_wrlock; - _pthread_rwlockattr_destroy; - _pthread_rwlockattr_getpshared; - _pthread_rwlockattr_init; - _pthread_rwlockattr_setpshared; - _pthread_self; - _pthread_set_name_np; - _pthread_setcancelstate; - _pthread_setcanceltype; - _pthread_setconcurrency; - _pthread_setprio; - _pthread_setschedparam; - _pthread_setspecific; - _pthread_sigmask; - _pthread_single_np; - _pthread_spin_destroy; - _pthread_spin_init; - _pthread_spin_lock; - _pthread_spin_trylock; - _pthread_spin_unlock; - _pthread_suspend_all_np; - _pthread_suspend_np; - _pthread_switch_add_np; - _pthread_switch_delete_np; - _pthread_testcancel; - _pthread_yield; - _raise; - _sched_yield; - _sem_init; - _sem_post; - _sem_timedwait; - _sem_wait; - _sigaction; - _sigaltstack; - _sigpending; - _sigprocmask; - _sigsuspend; - _sigtimedwait; - _sigwait; - _sigwaitinfo; - _sleep; - _spinlock; - _spinlock_debug; - _spinunlock; - _system; - _tcdrain; - _usleep; - _vfork; - _wait; - _waitpid; - accept; - aio_suspend; - close; - connect; - creat; - execve; - fcntl; - fork; - fsync; - msync; - nanosleep; - open; - pause; - poll; - pselect; - pthread_atfork; - pthread_barrier_destroy; - pthread_barrier_init; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri May 18 06:19:56 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 44ECF16A404; Fri, 18 May 2007 06:19:56 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DE24E16A403 for ; Fri, 18 May 2007 06:19:55 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CEE5613C459 for ; Fri, 18 May 2007 06:19:55 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4I6JtBT055379 for ; Fri, 18 May 2007 06:19:55 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4I6Jt61055373 for perforce@freebsd.org; Fri, 18 May 2007 06:19:55 GMT (envelope-from mjacob@freebsd.org) Date: Fri, 18 May 2007 06:19:55 GMT Message-Id: <200705180619.l4I6Jt61055373@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 119984 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 May 2007 06:19:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=119984 Change 119984 by mjacob@mjexp on 2007/05/18 06:19:27 IFC driblets Affected files ... .. //depot/projects/mjexp/sys/netinet/icmp6.h#2 integrate .. //depot/projects/mjexp/sys/netinet6/icmp6.c#5 integrate .. //depot/projects/mjexp/sys/netinet6/in6_proto.c#6 integrate Differences ... ==== //depot/projects/mjexp/sys/netinet/icmp6.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet/icmp6.h,v 1.20 2005/10/21 16:23:00 suz Exp $ */ +/* $FreeBSD: src/sys/netinet/icmp6.h,v 1.21 2007/05/17 21:20:23 jinmei Exp $ */ /* $KAME: icmp6.h,v 1.46 2001/04/27 15:09:48 itojun Exp $ */ /*- @@ -709,6 +709,11 @@ extern int icmp6_rediraccept; /* accept/process redirects */ extern int icmp6_redirtimeout; /* cache time for redirect routes */ + +#define ICMP6_NODEINFO_FQDNOK 0x1 +#define ICMP6_NODEINFO_NODEADDROK 0x2 +#define ICMP6_NODEINFO_TMPADDROK 0x4 +#define ICMP6_NODEINFO_GLOBALOK 0x8 #endif /* _KERNEL */ #endif /* not _NETINET_ICMP6_H_ */ ==== //depot/projects/mjexp/sys/netinet6/icmp6.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/icmp6.c,v 1.75 2007/02/10 12:25:19 bms Exp $ */ +/* $FreeBSD: src/sys/netinet6/icmp6.c,v 1.76 2007/05/17 21:20:23 jinmei Exp $ */ /* $KAME: icmp6.c,v 1.211 2001/04/04 05:56:20 itojun Exp $ */ /*- @@ -666,6 +666,10 @@ u_char *p; int maxlen, maxhlen; + /* + * XXX: this combination of flags is pointless, + * but should we keep this for compatibility? + */ if ((icmp6_nodeinfo & 5) != 5) break; @@ -1184,12 +1188,30 @@ #endif /* + * Validate IPv6 source address. + * The default configuration MUST be to refuse answering queries from + * global-scope addresses according to RFC4602. + * Notes: + * - it's not very clear what "refuse" means; this implementation + * simply drops it. + * - it's not very easy to identify global-scope (unicast) addresses + * since there are many prefixes for them. It should be safer + * and in practice sufficient to check "all" but loopback and + * link-local (note that site-local unicast was deprecated and + * ULA is defined as global scope-wise) + */ + if ((icmp6_nodeinfo & ICMP6_NODEINFO_GLOBALOK) == 0 && + !IN6_IS_ADDR_LOOPBACK(&ip6->ip6_src) && + !IN6_IS_ADDR_LINKLOCAL(&ip6->ip6_src)) + goto bad; + + /* * Validate IPv6 destination address. * * The Responder must discard the Query without further processing * unless it is one of the Responder's unicast or anycast addresses, or * a link-local scope multicast address which the Responder has joined. - * [icmp-name-lookups-08, Section 4.] + * [RFC4602, Section 5.] */ if (IN6_IS_ADDR_MULTICAST(&ip6->ip6_dst)) { if (!IN6_IS_ADDR_MC_LINKLOCAL(&ip6->ip6_dst)) @@ -1200,7 +1222,7 @@ goto bad; /* XXX impossible */ if ((ia6->ia6_flags & IN6_IFF_TEMPORARY) && - !(icmp6_nodeinfo & 4)) { + !(icmp6_nodeinfo & ICMP6_NODEINFO_TMPADDROK)) { nd6log((LOG_DEBUG, "ni6_input: ignore node info to " "a temporary address in %s:%d", __FILE__, __LINE__)); @@ -1315,12 +1337,12 @@ /* refuse based on configuration. XXX ICMP6_NI_REFUSED? */ switch (qtype) { case NI_QTYPE_FQDN: - if ((icmp6_nodeinfo & 1) == 0) + if ((icmp6_nodeinfo & ICMP6_NODEINFO_FQDNOK) == 0) goto bad; break; case NI_QTYPE_NODEADDR: case NI_QTYPE_IPV4ADDR: - if ((icmp6_nodeinfo & 2) == 0) + if ((icmp6_nodeinfo & ICMP6_NODEINFO_NODEADDROK) == 0) goto bad; break; } @@ -1698,7 +1720,7 @@ (niflags & NI_NODEADDR_FLAG_ANYCAST) == 0) continue; /* we need only unicast addresses */ if ((ifa6->ia6_flags & IN6_IFF_TEMPORARY) != 0 && - (icmp6_nodeinfo & 4) == 0) { + (icmp6_nodeinfo & ICMP6_NODEINFO_TMPADDROK) == 0) { continue; } addrsofif++; /* count the address */ @@ -1786,7 +1808,7 @@ (niflags & NI_NODEADDR_FLAG_ANYCAST) == 0) continue; if ((ifa6->ia6_flags & IN6_IFF_TEMPORARY) != 0 && - (icmp6_nodeinfo & 4) == 0) { + (icmp6_nodeinfo & ICMP6_NODEINFO_TMPADDROK) == 0) { continue; } ==== //depot/projects/mjexp/sys/netinet6/in6_proto.c#6 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/netinet6/in6_proto.c,v 1.42 2007/05/08 20:11:36 gnn Exp $ */ +/* $FreeBSD: src/sys/netinet6/in6_proto.c,v 1.43 2007/05/17 21:20:24 jinmei Exp $ */ /* $KAME: in6_proto.c,v 1.91 2001/05/27 13:28:35 itojun Exp $ */ /*- @@ -443,7 +443,8 @@ int icmp6_rediraccept = 1; /* accept and process redirects */ int icmp6_redirtimeout = 10 * 60; /* 10 minutes */ int icmp6errppslim = 100; /* 100pps */ -int icmp6_nodeinfo = 3; /* enable/disable NI response */ +/* control how to respond to NI queries */ +int icmp6_nodeinfo = (ICMP6_NODEINFO_FQDNOK|ICMP6_NODEINFO_NODEADDROK); /* UDP on IP6 parameters */ int udp6_sendspace = 9216; /* really max datagram size */ From owner-p4-projects@FreeBSD.ORG Fri May 18 10:45:55 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7404716A402; Fri, 18 May 2007 10:45:55 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 079CE16A400 for ; Fri, 18 May 2007 10:45:55 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id EBE4013C459 for ; Fri, 18 May 2007 10:45:54 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4IAjsCM014398 for ; Fri, 18 May 2007 10:45:54 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4IAjsFD014389 for perforce@freebsd.org; Fri, 18 May 2007 10:45:54 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 18 May 2007 10:45:54 GMT Message-Id: <200705181045.l4IAjsFD014389@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 119988 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 May 2007 10:45:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=119988 Change 119988 by hselasky@hselasky_mini_itx on 2007/05/18 10:45:10 Submit the Linux USB compatibility layer for our new USB stack. Remove unused USBD_CUSTOM_CLEARSTALL flag. Fix a comment. Affected files ... .. //depot/projects/usb/src/sys/conf/files#16 edit .. //depot/projects/usb/src/sys/dev/usb/README#13 edit .. //depot/projects/usb/src/sys/dev/usb/usb.h#9 edit .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#1 add .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.h#1 add .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#35 edit .. //depot/projects/usb/src/sys/dev/usb/usb_subr.h#38 edit .. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#24 edit .. //depot/projects/usb/src/sys/modules/usb/Makefile#3 edit Differences ... ==== //depot/projects/usb/src/sys/conf/files#16 (text+ko) ==== @@ -1084,6 +1084,7 @@ dev/usb/usb_requests.c optional usb dev/usb/usb_subr.c optional usb dev/usb/usb_transfer.c optional usb +dev/usb/usb_compat_linux.c optional usb dev/usb/uscanner.c optional uscanner dev/usb/uvisor.c optional uvisor dev/usb/uvscom.c optional uvscom ==== //depot/projects/usb/src/sys/dev/usb/README#13 (text+ko) ==== @@ -223,8 +223,6 @@ This flag allows the transfer length, "xfer->actlen" to be less than "xfer->length", upon completion of a transfer. - USBD_CUSTOM_CLEARSTALL - USBD_USE_POLLING This flag can be used with any callback and will cause the "usbd_transfer_start()" function to wait, using "DELAY()", ==== //depot/projects/usb/src/sys/dev/usb/usb.h#9 (text+ko) ==== @@ -72,7 +72,7 @@ #define USB_START_ADDR 0 #define USB_CONTROL_ENDPOINT 0 -#define USB_MAX_ENDPOINTS 16 +#define USB_MAX_ENDPOINTS (2*16) #define USB_FRAMES_PER_SECOND 1000 @@ -662,6 +662,7 @@ #define USB_SPEED_LOW 1 #define USB_SPEED_FULL 2 #define USB_SPEED_HIGH 3 +#define USB_SPEED_VARIABLE 4 int udi_power; /* power consumption in mA, 0 if selfpowered */ int udi_nports; char udi_devnames[USB_MAX_DEVNAMES][USB_MAX_DEVNAMELEN]; ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#35 (text+ko) ==== @@ -1495,6 +1495,12 @@ __FUNCTION__); } + /* free Linux compat device if any */ + if (udev->linux_dev) { + usb_linux_free_usb_device(udev->linux_dev); + udev->linux_dev = NULL; + } + /* free device */ free(udev, M_USB); up->device = 0; ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.h#38 (text+ko) ==== @@ -83,6 +83,7 @@ struct malloc_type; struct proc; struct usb_hid_descriptor; +struct usb_device; /* Linux compat */ typedef uint8_t usbd_status; @@ -232,6 +233,7 @@ struct usbd_hub *hub; /* only if this is a hub */ device_t subdevs[USB_MAX_ENDPOINTS]; /* array of all sub-devices */ device_t subdevs_end[0]; + struct usb_device *linux_dev; usb_event_cookie_t cookie; /* unique connection id */ @@ -279,10 +281,7 @@ * flag is also exported by usb.h */ #endif -#define USBD_CUSTOM_CLEARSTALL 0x0008 /* used to disable automatic clear-stall - * when a device reset request is needed - * in addition to the clear stall request - */ +#define USBD_UNUSED_3 0x0008 #define USBD_DEV_OPEN 0x0010 #define USBD_DEV_RECURSED_1 0x0020 #define USBD_DEV_RECURSED_2 0x0040 @@ -333,7 +332,7 @@ struct usbd_pipe *pipe; struct usbd_device *udev; - struct usbd_xfer *clearstall_xfer; + struct usbd_xfer *clearstall_xfer; struct mtx *priv_mtx; struct mtx *usb_mtx; /* used by HC driver */ struct usbd_memory_info *usb_root; /* used by HC driver */ @@ -806,4 +805,7 @@ uint8_t sc_first_open; /* set when first device is being opened */ }; +/* prototypes from "usb_compat_linux.c" */ +void usb_linux_free_usb_device(struct usb_device *dev); + #endif /* _USB_SUBR_H_ */ ==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#24 (text+ko) ==== @@ -165,7 +165,7 @@ udev, iface_index, setup->endpoint, setup->type, setup->direction, setup->index)); - /* NOTE: pipes should be searched from the beginning */ + /* NOTE: pipes are searched from the beginning */ for (pipe = udev->pipes; ((pipe >= udev->pipes) && @@ -284,7 +284,6 @@ (~(USBD_SYNCHRONOUS| USBD_FORCE_SHORT_XFER| USBD_SHORT_XFER_OK| - USBD_CUSTOM_CLEARSTALL| USBD_USE_POLLING| USBD_USE_DMA))) { ==== //depot/projects/usb/src/sys/modules/usb/Makefile#3 (text+ko) ==== @@ -16,6 +16,7 @@ usb_requests.c \ usb_subr.c usb_subr.h \ usb_transfer.c \ + usb_compat_linux.c \ SRCS+= uhci_pci.c uhci.c uhci.h SRCS+= ohci_pci.c ohci.c ohci.h From owner-p4-projects@FreeBSD.ORG Fri May 18 12:25:57 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A08AB16A52C; Fri, 18 May 2007 12:25:57 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6E68316A409 for ; Fri, 18 May 2007 12:25:57 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5227513C43E for ; Fri, 18 May 2007 12:25:57 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4ICPvEI011070 for ; Fri, 18 May 2007 12:25:57 GMT (envelope-from ivoras@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4ICPuLU011058 for perforce@freebsd.org; Fri, 18 May 2007 12:25:56 GMT (envelope-from ivoras@FreeBSD.org) Date: Fri, 18 May 2007 12:25:56 GMT Message-Id: <200705181225.l4ICPuLU011058@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ivoras@FreeBSD.org using -f From: Ivan Voras To: Perforce Change Reviews Cc: Subject: PERFORCE change 119989 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 May 2007 12:25:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=119989 Change 119989 by ivoras@ivoras_beastie on 2007/05/18 12:25:03 * Implement almost all of the remaining GTK infrastructure (the "next" / "previous" wizard), * Add add a new tile: ndisks (novice disks choser), which is not yet functional. * Add logging infrasructure Affected files ... .. //depot/projects/soc2007/ivoras_finstall/installer/finstall.py#5 edit .. //depot/projects/soc2007/ivoras_finstall/installer/glade/mainwin.glade#4 edit .. //depot/projects/soc2007/ivoras_finstall/installer/glade/ndisks.glade#1 add .. //depot/projects/soc2007/ivoras_finstall/installer/text/intro.txt#3 edit .. //depot/projects/soc2007/ivoras_finstall/installer/text/ndisks.txt#1 add Differences ... ==== //depot/projects/soc2007/ivoras_finstall/installer/finstall.py#5 (text+ko) ==== @@ -1,22 +1,42 @@ +import logging from types import MethodType import gtk, gtk.gdk, gtk.glade class MainWin: + + # Configured tracks + Steps_Novice = [ + { "tile" : "intro" }, + { "tile" : "ndisks" } + ] + + def __init__(self): + self.tile_xml = None # will be used for tiles self.xml = gtk.glade.XML("glade/mainwin.glade") self.window = self.xml.get_widget("mainwin") - self.xml.signal_autoconnect(self._get_event_handlers()) + self.xml.signal_autoconnect(self._get_event_handlers(None)) self["img_logo"].set_from_file("img/logo.jpg") # img_logo stretches the window vertically, so calling window.set_position() has no affect - self._center_window(self.window) - self["label2"].set_text(self._load_label("intro.txt")) - self["label2"].set_use_markup(True) + self._center_window(self.window) + self.step_current = 0 + self.step_track = MainWin.Steps_Novice + self._load_tile_nr(self.step_current) - def __getitem__(self,key): - """Make convenient shortcut to window widgets.""" - return self.xml.get_widget(key) + def __getitem__(self, key): + """Make convenient shortcut to window widgets. This is actually not + easy as it seems, since we use different Glade XML files for different + tiles of the wizard dialog.""" + if self.tile_xml: + w = self.tile_xml.get_widget(key) + if w == None: + return self.xml.get_widget(key) + else: + return w + else: + return self.xml.get_widget(key) def _center_window(self, window): @@ -25,29 +45,126 @@ window.move((gtk.gdk.screen_width() - ws[0]) / 2, (gtk.gdk.screen_height() - ws[1]) / 2) - def _get_event_handlers(self): + def _get_event_handlers(self, prefix): """Returns a dictionary of form {'on_method' : self.on_method} for all methods of self begining with "on_". This is useful for binding signal handlers.""" dict = {} + if prefix != None: + prefix2 = "%s_on_" % prefix + else: + prefix2 = "on_" for name in dir(self): - if not name.startswith("on_"): + if not name.startswith(prefix2): continue attr = getattr(self, name) if isinstance(attr, MethodType): - dict[name] = attr + dict[name[len(prefix2)-3:]] = attr return dict + def _load_label(self, file_name): + """Returns the content of a text/* file with formatting replacements + so it looks decent when Pango renders it""" return file("text/%s" % file_name).read().replace("\n", " ").replace("
", "\n").replace("\n ", "\n") - def on_button_next_clicked(self, obj): - print "clicked!", obj - gtk.main_quit() + + def _clear_container(self, cont): + for child in cont.get_children(): + cont.remove(child) + + + def _load_tile(self, tile_name): + """Loads a tile by it's name and integrates it in the wizard window""" + self._clear_container(self.xml.get_widget("vbox_container")) + self.tile_xml = gtk.glade.XML("glade/%s.glade" % tile_name) + self.tile_handlers = self._get_event_handlers(tile_name) + self.tile_xml.signal_autoconnect(self.tile_handlers) + w = self.tile_xml.get_widget("vbox_container").get_children()[0] + w.reparent(self.xml.get_widget("vbox_container")) + self.xml.get_widget("vbox_container").resize_children() + if "on_load" in self.tile_handlers: + try: + if not self.tile_handlers["on_load"](): + logging.error("On_Load refused by %s, but it's not implemented" % tile_name) + except: + logging.exception("Error executing on_load handler for %s" % tile_name) + + + def _load_tile_nr(self, tile_nr): + """Loads a (numerated) tile from the current step_track""" + self._load_tile(self.step_track[tile_nr]["tile"]) + + # Handlers for the main window elements (the window itself, Next/Previous + # buttons, etc. def on_mainwin_delete_event(self, obj, data): gtk.main_quit() + + def on_button_next_clicked(self, obj): + """'Next' button clicked - tries to load the next tile in current + step track""" + if "on_next" in self.tile_handlers: + try: + if not self.tile_handlers["on_next"](): + logging.debug("On_next denied for %s" % self.step_track[self.step_current]["tile"]) + return + except: + logging.exception("Error executing on_next handler in %s" % self.step_track[self.step_current]["tile"]) + return + self.step_current += 1 + if self.step_current >= len(self.step_track): + self.step_current = 0 # XXX: Fix by disabling next/previous + self._load_tile_nr(self.step_current) + + + def on_button_previous_clicked(self, obj): + """'Previous' button clicked - tries to load the previous tile + in current step track.""" + if "on_previous" in self.tile_handlers: + try: + if not self.tile_handlers["on_previous"](): + logging.debug("On_previous denied for %s" % self.step_track[self.step_current]["tile"]) + return + except: + logging.exception("Error executing on_previous in %s" % self.step_track[self.step_current]["tile"]) + return + self.step_current -= 1 + if self.step_current < 0: + self.step_current = len(self.step_track)-1 # XXX: fix by disabling next/previous + self._load_tile_nr(self.step_current) + + + # Handlers for "intro" tile + def intro_on_load(self): + self["label2"].set_text(self._load_label("intro.txt")) + self["label2"].set_use_markup(True) + return True + + + def intro_on_next(self): + if self["radio_novice"].get_active(): + pass # The default track is already Novice + elif self["radio_standard"].get_active(): + print "standard" + elif self["radio_expert"].get_active(): + print "expert" + return True + + + # Handlers for "ndisks" + def ndisks_on_load(self): + self["label2"].set_text(self._load_label("ndisks.txt")) + self["label2"].set_use_markup(True) + return True + + + # Handlers for "win1" + def win1_on_button1_clicked(self, obj): + print "clicked" + +logging.basicConfig(level=logging.DEBUG) w = MainWin() gtk.main() ==== //depot/projects/soc2007/ivoras_finstall/installer/glade/mainwin.glade#4 (text+ko) ==== @@ -3,6 +3,7 @@ + 450 True 1 FreeBSD Installer @@ -173,6 +174,7 @@ True gtk-media-previous True + 1 ==== //depot/projects/soc2007/ivoras_finstall/installer/text/intro.txt#3 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Fri May 18 16:45:29 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7A7D516A405; Fri, 18 May 2007 16:45:29 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 432AE16A401 for ; Fri, 18 May 2007 16:45:29 +0000 (UTC) (envelope-from smilicic@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 1B88F13C448 for ; Fri, 18 May 2007 16:45:29 +0000 (UTC) (envelope-from smilicic@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4IGjSDh054762 for ; Fri, 18 May 2007 16:45:28 GMT (envelope-from smilicic@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4IGjStE054753 for perforce@freebsd.org; Fri, 18 May 2007 16:45:28 GMT (envelope-from smilicic@FreeBSD.org) Date: Fri, 18 May 2007 16:45:28 GMT Message-Id: <200705181645.l4IGjStE054753@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to smilicic@FreeBSD.org using -f From: Sonja Milicic To: Perforce Change Reviews Cc: Subject: PERFORCE change 120013 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 May 2007 16:45:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=120013 Change 120013 by smilicic@tanarri_marilith on 2007/05/18 16:44:47 File operations for geom_log Affected files ... .. //depot/projects/soc2007/smilicic_gsafetynet/glog_fileops.c#1 add Differences ... From owner-p4-projects@FreeBSD.ORG Fri May 18 19:22:43 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB62916A406; Fri, 18 May 2007 19:22:43 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5F02316A404 for ; Fri, 18 May 2007 19:22:43 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4FDAC13C448 for ; Fri, 18 May 2007 19:22:43 +0000 (UTC) (envelope-from csjp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4IJMhUY012666 for ; Fri, 18 May 2007 19:22:43 GMT (envelope-from csjp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4IJMgKb012659 for perforce@freebsd.org; Fri, 18 May 2007 19:22:42 GMT (envelope-from csjp@freebsd.org) Date: Fri, 18 May 2007 19:22:42 GMT Message-Id: <200705181922.l4IJMgKb012659@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to csjp@freebsd.org using -f From: "Christian S.J. Peron" To: Perforce Change Reviews Cc: Subject: PERFORCE change 120015 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 May 2007 19:22:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=120015 Change 120015 by csjp@csjp_push on 2007/05/18 19:22:30 Man page fixups Submitted by: Samuel Reed Affected files ... .. //depot/projects/trustedbsd/openbsm/libbsm/au_control.3#9 edit .. //depot/projects/trustedbsd/openbsm/libbsm/au_event.3#8 edit .. //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#12 edit Differences ... ==== //depot/projects/trustedbsd/openbsm/libbsm/au_control.3#9 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_control.3#8 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_control.3#9 $ .\" .Dd April 19, 2005 .Dt AU_CONTROL 3 @@ -77,7 +77,7 @@ section for more information. .Pp The -.Fn sendac +.Fn endac function closes the .Xr audit_control 5 ==== //depot/projects/trustedbsd/openbsm/libbsm/au_event.3#8 (text+ko) ==== @@ -23,7 +23,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_event.3#7 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/au_event.3#8 $ .\" .Dd April 19, 2005 .Dt AU_EVENT 3 @@ -131,7 +131,7 @@ .Fn getauevnum , .Fn getauevnum_r , and -.Fn getauevnuam +.Fn getauevnonam will return a reference to a .Vt "struct au_event_ent" or ==== //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#12 (text+ko) ==== @@ -27,7 +27,7 @@ .\" IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE .\" POSSIBILITY OF SUCH DAMAGE. .\" -.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#11 $ +.\" $P4: //depot/projects/trustedbsd/openbsm/libbsm/audit_submit.3#12 $ .\" .Dd May 29, 2006 .Dt audit_submit 3 @@ -54,7 +54,7 @@ .Fa au_event . The subject token will be generated based on .Fa au_ctx . -The return token is dependant on the +The return token is dependent on the .Fa status and .Fa reterr From owner-p4-projects@FreeBSD.ORG Fri May 18 20:19:55 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 417CE16A407; Fri, 18 May 2007 20:19:55 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 14F1B16A402 for ; Fri, 18 May 2007 20:19:55 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 039CB13C457 for ; Fri, 18 May 2007 20:19:55 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4IKJsFR071031 for ; Fri, 18 May 2007 20:19:54 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4IKJs94071021 for perforce@freebsd.org; Fri, 18 May 2007 20:19:54 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 18 May 2007 20:19:54 GMT Message-Id: <200705182019.l4IKJs94071021@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 120019 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 May 2007 20:19:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=120019 Change 120019 by hselasky@hselasky_mini_itx on 2007/05/18 20:19:29 Fix isochronous support in the Linux USB compat layer. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#2 edit .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.h#2 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#2 (text+ko) ==== @@ -64,6 +64,7 @@ static usb_complete_t usb_linux_wait_complete; +static uint16_t usb_max_isoc_frames(struct usb_device *dev); static int32_t usb_start_wait_urb(struct urb *urb, uint32_t timeout, uint32_t *p_actlen); static const struct usb_device_id * usb_linux_lookup_id(struct usb_driver *udrv, struct usb_attach_arg *uaa); static struct usb_driver * usb_linux_get_usb_driver(struct usb_linux_softc *sc); @@ -347,6 +348,14 @@ /*------------------------------------------------------------------------* * Linux emulation layer *------------------------------------------------------------------------*/ + +static uint16_t +usb_max_isoc_frames(struct usb_device *dev) +{ + return ((usbd_get_speed(dev->bsd_udev) == USB_SPEED_HIGH) ? + USB_MAX_HIGH_SPEED_ISOC_FRAMES : USB_MAX_FULL_SPEED_ISOC_FRAMES); +} + int32_t usb_submit_urb(struct urb *urb, gfp_t mem_flags) { @@ -669,6 +678,7 @@ cfg[0].direction = addr & (UE_DIR_OUT|UE_DIR_IN); cfg[0].callback = &usb_linux_isoc_callback; cfg[0].bufsize = 0; /* use wMaxPacketSize */ + cfg[0].frames = usb_max_isoc_frames(dev); bcopy(cfg + 0, cfg + 1, sizeof(*cfg)); @@ -1189,6 +1199,12 @@ TAILQ_REMOVE(&(uhe->bsd_urb_list), urb, bsd_urb_list); urb->bsd_urb_list.tqe_prev = NULL; + x = usb_max_isoc_frames(urb->dev); + if (urb->number_of_packets > x) { + /* XXX simply truncate the transfer */ + urb->number_of_packets = x; + } + } else { /* already got a transfer (should not happen) */ ==== //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.h#2 (text+ko) ==== @@ -49,6 +49,9 @@ typedef void (usb_complete_t)(struct urb *, struct pt_regs *); typedef uint32_t gfp_t; +#define USB_MAX_FULL_SPEED_ISOC_FRAMES (60 * 1) +#define USB_MAX_HIGH_SPEED_ISOC_FRAMES (60 * 8) + /* * Linux compatible USB device drivers put their device information * into the "usb_device_id" structure using the "USB_DEVICE()" macro. From owner-p4-projects@FreeBSD.ORG Fri May 18 20:24:01 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EA1FB16A401; Fri, 18 May 2007 20:24:00 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9264B16A402 for ; Fri, 18 May 2007 20:24:00 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 821DC13C455 for ; Fri, 18 May 2007 20:24:00 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4IKO0uC075538 for ; Fri, 18 May 2007 20:24:00 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4IKO0fL075528 for perforce@freebsd.org; Fri, 18 May 2007 20:24:00 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 18 May 2007 20:24:00 GMT Message-Id: <200705182024.l4IKO0fL075528@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 120020 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 May 2007 20:24:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=120020 Change 120020 by hselasky@hselasky_mini_itx on 2007/05/18 20:23:09 Style changes only: Convert spaces into tabs and tab after "#define". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#3 edit .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.h#3 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#3 (text+ko) ==== @@ -79,21 +79,21 @@ static LIST_HEAD(,usb_linux_softc) usb_linux_attached_list; static device_method_t usb_linux_methods[] = { - /* Device interface */ - DEVMETHOD(device_probe, usb_linux_probe), - DEVMETHOD(device_attach, usb_linux_attach), + /* Device interface */ + DEVMETHOD(device_probe, usb_linux_probe), + DEVMETHOD(device_attach, usb_linux_attach), DEVMETHOD(device_detach, usb_linux_detach), DEVMETHOD(device_suspend, usb_linux_suspend), DEVMETHOD(device_resume, usb_linux_resume), - DEVMETHOD(device_shutdown, usb_linux_shutdown), + DEVMETHOD(device_shutdown, usb_linux_shutdown), - { 0, 0 } + { 0, 0 } }; static driver_t usb_linux_driver = { - .name = "usb_linux", - .methods = usb_linux_methods, - .size = sizeof(struct usb_linux_softc), + .name = "usb_linux", + .methods = usb_linux_methods, + .size = sizeof(struct usb_linux_softc), }; static devclass_t usb_linux_devclass; @@ -255,7 +255,7 @@ if (p_dev == NULL) { p_dev = usb_linux_create_usb_device(uaa->device, dev); if (p_dev == NULL) { - return ENOMEM; + return ENOMEM; } uaa->device->linux_dev = p_dev; } @@ -272,7 +272,7 @@ if (udrv->probe) { if ((udrv->probe)(sc->sc_ui, id)) { - return ENXIO; + return ENXIO; } } @@ -419,11 +419,11 @@ urb->actual_length = 0; for (x = 0; x < urb->number_of_packets; x++) { - urb->iso_frame_desc[x].actual_length = 0; + urb->iso_frame_desc[x].actual_length = 0; } if (urb->complete) { - (urb->complete)(urb, NULL); + (urb->complete)(urb, NULL); } } else { @@ -431,14 +431,14 @@ if (uhe->bsd_xfer[0] && (uhe->bsd_xfer[0]->priv_fifo == (void *)urb)) { - usbd_transfer_stop(uhe->bsd_xfer[0]); + usbd_transfer_stop(uhe->bsd_xfer[0]); usbd_transfer_start(uhe->bsd_xfer[0]); } if (uhe->bsd_xfer[1] && (uhe->bsd_xfer[1]->priv_fifo == (void *)urb)) { - usbd_transfer_stop(uhe->bsd_xfer[1]); + usbd_transfer_stop(uhe->bsd_xfer[1]); usbd_transfer_start(uhe->bsd_xfer[1]); } } @@ -450,13 +450,13 @@ { struct usbd_config cfg[1]; struct usbd_pipe *pipe; - uint8_t type; - uint8_t addr; + uint8_t type; + uint8_t addr; if (uhe == NULL) return -EINVAL; - type = uhe->desc.bmAttributes & UE_XFERTYPE; - addr = uhe->desc.bEndpointAddress; + type = uhe->desc.bmAttributes & UE_XFERTYPE; + addr = uhe->desc.bEndpointAddress; bzero(cfg, sizeof(cfg)); @@ -542,19 +542,19 @@ uhe_read = NULL; } else { if (type == UE_ISOCHRONOUS) { - return -EINVAL; + return -EINVAL; } uhe_write = usb_find_host_endpoint(dev, type, addr | UE_DIR_OUT); if (uhe_write == NULL) { - return -EINVAL; + return -EINVAL; } if (requesttype & UT_READ) { - uhe_read = usb_find_host_endpoint(dev, type, addr | UE_DIR_IN); + uhe_read = usb_find_host_endpoint(dev, type, addr | UE_DIR_IN); if (uhe_read == NULL) { return -EINVAL; } } else { - uhe_read = NULL; + uhe_read = NULL; } } @@ -571,11 +571,11 @@ req = (void *)(urb->setup_packet); - req->bmRequestType = requesttype; - req->bRequest = request; - USETW(req->wValue, value); - USETW(req->wIndex, index); - USETW(req->wLength, size); + req->bmRequestType = requesttype; + req->bRequest = request; + USETW(req->wValue, value); + USETW(req->wIndex, index); + USETW(req->wLength, size); if (size && (req->bmRequestType & UT_WRITE)) { /* move the data to a real buffer */ @@ -592,17 +592,17 @@ err = usb_start_wait_urb(urb, 1000, &actlen); if (err) { - goto done; + goto done; } if (actlen < sizeof(*req)) { - err = -EPIPE; + err = -EPIPE; actlen = 0; goto done; } if (size) { - if (req->bmRequestType & UT_READ) { + if (req->bmRequestType & UT_READ) { urb->pipe = uhe_read; } urb->transfer_buffer = req->bData; @@ -618,11 +618,11 @@ done: if (req->bmRequestType & UT_READ) { if (actlen < size) { - /* we don't like returning random data */ - bzero(((uint8_t *)data) + actlen, size - actlen); + /* we don't like returning random data */ + bzero(((uint8_t *)data) + actlen, size - actlen); } if (actlen) { - bcopy(req->bData, data, actlen); + bcopy(req->bData, data, actlen); } } @@ -649,75 +649,75 @@ int32_t usb_setup_endpoint(struct usb_device *dev, struct usb_host_endpoint *uhe, uint32_t bufsize) { - struct usbd_config cfg[2]; - uint16_t mfs = usbd_get_max_frame_size((usb_endpoint_descriptor_t *)&(uhe->desc)); - uint8_t type = uhe->desc.bmAttributes & UE_XFERTYPE; - uint8_t addr = uhe->desc.bEndpointAddress; + struct usbd_config cfg[2]; + uint16_t mfs = usbd_get_max_frame_size((usb_endpoint_descriptor_t *)&(uhe->desc)); + uint8_t type = uhe->desc.bmAttributes & UE_XFERTYPE; + uint8_t addr = uhe->desc.bEndpointAddress; if (uhe->fbsd_buf_size == bufsize) { /* optimize */ return 0; } - usbd_transfer_unsetup(uhe->bsd_xfer, 2); + usbd_transfer_unsetup(uhe->bsd_xfer, 2); uhe->fbsd_buf_size = bufsize; - if (bufsize == 0) { - return 0; - } + if (bufsize == 0) { + return 0; + } - bzero(cfg, sizeof(cfg)); + bzero(cfg, sizeof(cfg)); - if (type == UE_ISOCHRONOUS) { + if (type == UE_ISOCHRONOUS) { - /* Isochronous is special */ + /* Isochronous is special */ - cfg[0].type = type; - cfg[0].endpoint = addr & UE_ADDR; - cfg[0].direction = addr & (UE_DIR_OUT|UE_DIR_IN); - cfg[0].callback = &usb_linux_isoc_callback; - cfg[0].bufsize = 0; /* use wMaxPacketSize */ + cfg[0].type = type; + cfg[0].endpoint = addr & UE_ADDR; + cfg[0].direction = addr & (UE_DIR_OUT|UE_DIR_IN); + cfg[0].callback = &usb_linux_isoc_callback; + cfg[0].bufsize = 0; /* use wMaxPacketSize */ cfg[0].frames = usb_max_isoc_frames(dev); - bcopy(cfg + 0, cfg + 1, sizeof(*cfg)); + bcopy(cfg + 0, cfg + 1, sizeof(*cfg)); - if (usbd_transfer_setup(dev->bsd_udev, uhe->bsd_iface_index, - uhe->bsd_xfer, cfg, 2, uhe, - &usb_global_lock)) - { - return -EINVAL; - } - } else { - if (bufsize > (1 << 22)) { - /* limit buffer size */ - bufsize = (1 << 22); - } + if (usbd_transfer_setup(dev->bsd_udev, uhe->bsd_iface_index, + uhe->bsd_xfer, cfg, 2, uhe, + &usb_global_lock)) + { + return -EINVAL; + } + } else { + if (bufsize > (1 << 22)) { + /* limit buffer size */ + bufsize = (1 << 22); + } /* we need enough room for the control header */ if (bufsize < sizeof(usb_device_request_t)) { - bufsize = sizeof(usb_device_request_t); + bufsize = sizeof(usb_device_request_t); } - if (bufsize < mfs) { - /* we need to be able to hold at least one frame! */ - bufsize = mfs; - } + if (bufsize < mfs) { + /* we need to be able to hold at least one frame! */ + bufsize = mfs; + } - cfg[0].type = type; - cfg[0].endpoint = addr & UE_ADDR; - cfg[0].direction = addr & (UE_DIR_OUT|UE_DIR_IN); - cfg[0].callback = &usb_linux_non_isoc_callback; - cfg[0].bufsize = bufsize; + cfg[0].type = type; + cfg[0].endpoint = addr & UE_ADDR; + cfg[0].direction = addr & (UE_DIR_OUT|UE_DIR_IN); + cfg[0].callback = &usb_linux_non_isoc_callback; + cfg[0].bufsize = bufsize; - if (usbd_transfer_setup(dev->bsd_udev, uhe->bsd_iface_index, - uhe->bsd_xfer, cfg, 1, uhe, - &usb_global_lock)) - { - return -EINVAL; - } - } - return 0; + if (usbd_transfer_setup(dev->bsd_udev, uhe->bsd_iface_index, + uhe->bsd_xfer, cfg, 1, uhe, + &usb_global_lock)) + { + return -EINVAL; + } + } + return 0; } static struct usb_device * @@ -750,12 +750,12 @@ while ((desc = usbd_desc_foreach(cd, desc))) { - switch (desc->bDescriptorType) { + switch (desc->bDescriptorType) { case UDESC_DEVICE: dd = (void *)desc; if (dd->bLength < sizeof(*dd)) break; if (p_ud) { - bcopy(dd, &(p_ud->descriptor), sizeof(p_ud->descriptor)); + bcopy(dd, &(p_ud->descriptor), sizeof(p_ud->descriptor)); } break; @@ -764,12 +764,12 @@ if ((ed->bLength < sizeof(*ed)) || (iface_index == 0)) break; if (p_uhe) { - bcopy(ed, &(p_uhe->desc), sizeof(p_uhe->desc)); + bcopy(ed, &(p_uhe->desc), sizeof(p_uhe->desc)); p_uhe->bsd_iface_index = iface_index-1; p_uhe++; } if (p_uhi) { - (p_uhi-1)->desc.bNumEndpoints++; + (p_uhi-1)->desc.bNumEndpoints++; } nedesc ++; break; @@ -778,7 +778,7 @@ id = (void *)desc; if (id->bLength < sizeof(*id)) break; if (p_uhi) { - bcopy(id, &(p_uhi->desc), sizeof(p_uhi->desc)); + bcopy(id, &(p_uhi->desc), sizeof(p_uhi->desc)); p_uhi->desc.bNumEndpoints = 0; p_uhi->endpoint = p_uhe; p_uhi->string = ""; @@ -787,7 +787,7 @@ iface_no = id->bInterfaceNumber; niface_total ++; if (iface_no_curr != iface_no) { - if (p_ui) { + if (p_ui) { p_ui->altsetting = p_uhi-1; p_ui->cur_altsetting = p_uhi-1; p_ui->num_altsetting = 1; @@ -795,10 +795,10 @@ p_ui->linux_udev = p_ud; p_ui++; } - iface_no_curr = iface_no; + iface_no_curr = iface_no; iface_index ++; } else { - if (p_ui) { + if (p_ui) { (p_ui-1)->num_altsetting ++; } } @@ -864,12 +864,12 @@ urb = malloc(size, M_USBDEV, M_WAITOK | M_ZERO); if (urb) { if (iso_packets == 0xFFFF) { - urb->setup_packet = (void *)(urb + 1); + urb->setup_packet = (void *)(urb + 1); urb->transfer_buffer = (void *)(urb->setup_packet + sizeof(usb_device_request_t)); urb->transfer_buffer_length = mem_flags; } else { - urb->number_of_packets = iso_packets; + urb->number_of_packets = iso_packets; } } return urb; @@ -903,7 +903,7 @@ ui++) { uhi = ui->cur_altsetting; if (uhi) { - uhe_end = uhi->endpoint + uhi->desc.bNumEndpoints; + uhe_end = uhi->endpoint + uhi->desc.bNumEndpoints; for (uhe = uhi->endpoint; uhe != uhe_end; uhe++) { @@ -913,7 +913,7 @@ if (((ea & mask) == ep) && ((at & UE_XFERTYPE) == type)) { - return uhe; + return uhe; } } } @@ -982,11 +982,11 @@ repeat: mtx_lock(&usb_global_lock); - LIST_FOREACH(sc, &usb_linux_attached_list, sc_attached_list) + LIST_FOREACH(sc, &usb_linux_attached_list, sc_attached_list) { if (sc->sc_udrv == drv) { - mtx_unlock(&usb_global_lock); + mtx_unlock(&usb_global_lock); device_detach(sc->sc_fbsd_dev); goto repeat; } @@ -1077,8 +1077,8 @@ uhe = uhi->endpoint; uhe_end = uhi->endpoint + uhi->desc.bNumEndpoints; while (uhe != uhe_end) { - err = usb_setup_endpoint(dev, uhe, 0); - uhe++; + err = usb_setup_endpoint(dev, uhe, 0); + uhe++; } uhi++; } @@ -1118,7 +1118,7 @@ struct usb_host_endpoint *uhe = xfer->priv_sc; struct usb_iso_packet_descriptor *uipd; - USBD_CHECK_STATUS(xfer); + USBD_CHECK_STATUS(xfer); tr_error: if (xfer->error == USBD_CANCELLED) { @@ -1151,17 +1151,17 @@ offset = 0; for (x = 0; x < urb->number_of_packets; x++) { - uipd = urb->iso_frame_desc + x; + uipd = urb->iso_frame_desc + x; uipd->actual_length = xfer->frlengths[x]; uipd->status = 0; - usbd_copy_out(&(xfer->buf_data), offset, + usbd_copy_out(&(xfer->buf_data), offset, ((uint8_t *)(urb->transfer_buffer)) + uipd->offset, uipd->actual_length); offset += max_frame; } } else { for (x = 0; x < urb->number_of_packets; x++) { - uipd = urb->iso_frame_desc + x; + uipd = urb->iso_frame_desc + x; uipd->actual_length = xfer->frlengths[x]; uipd->status = 0; } @@ -1173,9 +1173,9 @@ if (xfer->actlen < xfer->length) { /* short transfer */ if (urb->transfer_flags & URB_SHORT_NOT_OK) { - urb->status = -EPIPE; /* XXX should be EREMOTEIO */ + urb->status = -EPIPE; /* XXX should be EREMOTEIO */ } else { - urb->status = 0; + urb->status = 0; } } else { /* success */ @@ -1192,8 +1192,8 @@ /* get next transfer */ urb = TAILQ_FIRST(&(uhe->bsd_urb_list)); if (urb == NULL) { - /* nothing to do */ - return; + /* nothing to do */ + return; } TAILQ_REMOVE(&(uhe->bsd_urb_list), urb, bsd_urb_list); @@ -1201,8 +1201,8 @@ x = usb_max_isoc_frames(urb->dev); if (urb->number_of_packets > x) { - /* XXX simply truncate the transfer */ - urb->number_of_packets = x; + /* XXX simply truncate the transfer */ + urb->number_of_packets = x; } } else { @@ -1218,7 +1218,7 @@ offset = 0; for (x = 0; x < urb->number_of_packets; x++) { - uipd = urb->iso_frame_desc + x; + uipd = urb->iso_frame_desc + x; xfer->frlengths[x] = uipd->length; usbd_copy_in(&(xfer->buf_data), offset, ((uint8_t *)(urb->transfer_buffer)) + uipd->offset, @@ -1230,7 +1230,7 @@ offset = urb->number_of_packets * max_frame; for (x = 0; x < urb->number_of_packets; x++) { - uipd = urb->iso_frame_desc + x; + uipd = urb->iso_frame_desc + x; xfer->frlengths[x] = max_frame; } } @@ -1252,7 +1252,7 @@ uint32_t max_bulk = (uhe->fbsd_buf_size - (uhe->fbsd_buf_size % xfer->max_packet_size)); - USBD_CHECK_STATUS(xfer); + USBD_CHECK_STATUS(xfer); tr_error: if (xfer->error == USBD_CANCELLED) { @@ -1290,15 +1290,15 @@ /* short transfer */ if (urb->transfer_flags & URB_SHORT_NOT_OK) { - urb->status = -EPIPE; + urb->status = -EPIPE; } else { - urb->status = 0; + urb->status = 0; } } else { /* check remainder */ if (urb->bsd_length_rem) { - goto setup_bulk; + goto setup_bulk; } /* success */ @@ -1357,7 +1357,7 @@ if (max_bulk == urb->bsd_length_rem) { if (urb->transfer_flags & URB_ZERO_PACKET) { - xfer->flags |= USBD_FORCE_SHORT_XFER; + xfer->flags |= USBD_FORCE_SHORT_XFER; } } ==== //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #ifndef _USB_COMPAT_LINUX_H -#define _USB_COMPAT_LINUX_H +#define _USB_COMPAT_LINUX_H #include #include @@ -49,8 +49,8 @@ typedef void (usb_complete_t)(struct urb *, struct pt_regs *); typedef uint32_t gfp_t; -#define USB_MAX_FULL_SPEED_ISOC_FRAMES (60 * 1) -#define USB_MAX_HIGH_SPEED_ISOC_FRAMES (60 * 8) +#define USB_MAX_FULL_SPEED_ISOC_FRAMES (60 * 1) +#define USB_MAX_HIGH_SPEED_ISOC_FRAMES (60 * 8) /* * Linux compatible USB device drivers put their device information @@ -61,16 +61,16 @@ struct usb_device_id { /* which fields to match against */ uint16_t match_flags; -#define USB_DEVICE_ID_MATCH_VENDOR 0x0001 -#define USB_DEVICE_ID_MATCH_PRODUCT 0x0002 -#define USB_DEVICE_ID_MATCH_DEV_LO 0x0004 -#define USB_DEVICE_ID_MATCH_DEV_HI 0x0008 -#define USB_DEVICE_ID_MATCH_DEV_CLASS 0x0010 -#define USB_DEVICE_ID_MATCH_DEV_SUBCLASS 0x0020 -#define USB_DEVICE_ID_MATCH_DEV_PROTOCOL 0x0040 -#define USB_DEVICE_ID_MATCH_INT_CLASS 0x0080 -#define USB_DEVICE_ID_MATCH_INT_SUBCLASS 0x0100 -#define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200 +#define USB_DEVICE_ID_MATCH_VENDOR 0x0001 +#define USB_DEVICE_ID_MATCH_PRODUCT 0x0002 +#define USB_DEVICE_ID_MATCH_DEV_LO 0x0004 +#define USB_DEVICE_ID_MATCH_DEV_HI 0x0008 +#define USB_DEVICE_ID_MATCH_DEV_CLASS 0x0010 +#define USB_DEVICE_ID_MATCH_DEV_SUBCLASS 0x0020 +#define USB_DEVICE_ID_MATCH_DEV_PROTOCOL 0x0040 +#define USB_DEVICE_ID_MATCH_INT_CLASS 0x0080 +#define USB_DEVICE_ID_MATCH_INT_SUBCLASS 0x0100 +#define USB_DEVICE_ID_MATCH_INT_PROTOCOL 0x0200 /* Used for product specific matches; the BCD range is inclusive */ uint16_t idVendor; @@ -92,10 +92,10 @@ unsigned long driver_info; }; -#define USB_DEVICE_ID_MATCH_DEVICE \ +#define USB_DEVICE_ID_MATCH_DEVICE \ (USB_DEVICE_ID_MATCH_VENDOR | USB_DEVICE_ID_MATCH_PRODUCT) -#define USB_DEVICE(vend,prod) \ +#define USB_DEVICE(vend,prod) \ .match_flags = USB_DEVICE_ID_MATCH_DEVICE, .idVendor = (vend), \ .idProduct = (prod) @@ -120,7 +120,7 @@ LIST_ENTRY(usb_driver) linux_driver_list; }; -#define USB_DRIVER_EXPORT(id,p_usb_drv) \ +#define USB_DRIVER_EXPORT(id,p_usb_drv) \ SYSINIT(id,SI_SUB_KLD,SI_ORDER_FIRST,usb_linux_register,p_usb_drv); \ SYSUNINIT(id,SI_SUB_KLD,SI_ORDER_ANY,usb_linux_deregister,p_usb_drv) @@ -181,21 +181,21 @@ uint8_t bSynchAddress; } __packed; -#define USB_DT_ENDPOINT_SIZE 7 -#define USB_DT_ENDPOINT_AUDIO_SIZE 9 +#define USB_DT_ENDPOINT_SIZE 7 +#define USB_DT_ENDPOINT_AUDIO_SIZE 9 /* * Endpoints */ -#define USB_ENDPOINT_NUMBER_MASK 0x0f /* in bEndpointAddress */ -#define USB_ENDPOINT_DIR_MASK 0x80 +#define USB_ENDPOINT_NUMBER_MASK 0x0f /* in bEndpointAddress */ +#define USB_ENDPOINT_DIR_MASK 0x80 -#define USB_ENDPOINT_XFERTYPE_MASK 0x03 /* in bmAttributes */ -#define USB_ENDPOINT_XFER_CONTROL 0 -#define USB_ENDPOINT_XFER_ISOC 1 -#define USB_ENDPOINT_XFER_BULK 2 -#define USB_ENDPOINT_XFER_INT 3 -#define USB_ENDPOINT_MAX_ADJUSTABLE 0x80 +#define USB_ENDPOINT_XFERTYPE_MASK 0x03 /* in bmAttributes */ +#define USB_ENDPOINT_XFER_CONTROL 0 +#define USB_ENDPOINT_XFER_ISOC 1 +#define USB_ENDPOINT_XFER_BULK 2 +#define USB_ENDPOINT_XFER_INT 3 +#define USB_ENDPOINT_MAX_ADJUSTABLE 0x80 /* CONTROL REQUEST SUPPORT */ @@ -204,101 +204,101 @@ * "bEndpointAddress" and "bRequestType": */ #define USB_DIR_MASK 0x80 -#define USB_DIR_OUT 0x00 /* write to USB device */ -#define USB_DIR_IN 0x80 /* read from USB device */ +#define USB_DIR_OUT 0x00 /* write to USB device */ +#define USB_DIR_IN 0x80 /* read from USB device */ /* * Definition of type mask for * "bRequestType": */ -#define USB_TYPE_MASK (0x03 << 5) -#define USB_TYPE_STANDARD (0x00 << 5) -#define USB_TYPE_CLASS (0x01 << 5) -#define USB_TYPE_VENDOR (0x02 << 5) -#define USB_TYPE_RESERVED (0x03 << 5) +#define USB_TYPE_MASK (0x03 << 5) +#define USB_TYPE_STANDARD (0x00 << 5) +#define USB_TYPE_CLASS (0x01 << 5) +#define USB_TYPE_VENDOR (0x02 << 5) +#define USB_TYPE_RESERVED (0x03 << 5) /* * Definition of receiver mask for * "bRequestType": */ -#define USB_RECIP_MASK 0x1f -#define USB_RECIP_DEVICE 0x00 -#define USB_RECIP_INTERFACE 0x01 -#define USB_RECIP_ENDPOINT 0x02 -#define USB_RECIP_OTHER 0x03 +#define USB_RECIP_MASK 0x1f +#define USB_RECIP_DEVICE 0x00 +#define USB_RECIP_INTERFACE 0x01 +#define USB_RECIP_ENDPOINT 0x02 +#define USB_RECIP_OTHER 0x03 /* * Definition of standard request values for * "bRequest": */ -#define USB_REQ_GET_STATUS 0x00 -#define USB_REQ_CLEAR_FEATURE 0x01 -#define USB_REQ_SET_FEATURE 0x03 -#define USB_REQ_SET_ADDRESS 0x05 -#define USB_REQ_GET_DESCRIPTOR 0x06 -#define USB_REQ_SET_DESCRIPTOR 0x07 -#define USB_REQ_GET_CONFIGURATION 0x08 -#define USB_REQ_SET_CONFIGURATION 0x09 -#define USB_REQ_GET_INTERFACE 0x0A -#define USB_REQ_SET_INTERFACE 0x0B -#define USB_REQ_SYNCH_FRAME 0x0C +#define USB_REQ_GET_STATUS 0x00 +#define USB_REQ_CLEAR_FEATURE 0x01 +#define USB_REQ_SET_FEATURE 0x03 +#define USB_REQ_SET_ADDRESS 0x05 +#define USB_REQ_GET_DESCRIPTOR 0x06 +#define USB_REQ_SET_DESCRIPTOR 0x07 +#define USB_REQ_GET_CONFIGURATION 0x08 +#define USB_REQ_SET_CONFIGURATION 0x09 +#define USB_REQ_GET_INTERFACE 0x0A +#define USB_REQ_SET_INTERFACE 0x0B +#define USB_REQ_SYNCH_FRAME 0x0C -#define USB_REQ_SET_ENCRYPTION 0x0D /* Wireless USB */ -#define USB_REQ_GET_ENCRYPTION 0x0E -#define USB_REQ_SET_HANDSHAKE 0x0F -#define USB_REQ_GET_HANDSHAKE 0x10 -#define USB_REQ_SET_CONNECTION 0x11 -#define USB_REQ_SET_SECURITY_DATA 0x12 -#define USB_REQ_GET_SECURITY_DATA 0x13 -#define USB_REQ_SET_WUSB_DATA 0x14 -#define USB_REQ_LOOPBACK_DATA_WRITE 0x15 -#define USB_REQ_LOOPBACK_DATA_READ 0x16 -#define USB_REQ_SET_INTERFACE_DS 0x17 +#define USB_REQ_SET_ENCRYPTION 0x0D /* Wireless USB */ +#define USB_REQ_GET_ENCRYPTION 0x0E +#define USB_REQ_SET_HANDSHAKE 0x0F +#define USB_REQ_GET_HANDSHAKE 0x10 +#define USB_REQ_SET_CONNECTION 0x11 +#define USB_REQ_SET_SECURITY_DATA 0x12 +#define USB_REQ_GET_SECURITY_DATA 0x13 +#define USB_REQ_SET_WUSB_DATA 0x14 +#define USB_REQ_LOOPBACK_DATA_WRITE 0x15 +#define USB_REQ_LOOPBACK_DATA_READ 0x16 +#define USB_REQ_SET_INTERFACE_DS 0x17 /* * USB feature flags are written using USB_REQ_{CLEAR,SET}_FEATURE, and * are read as a bit array returned by USB_REQ_GET_STATUS. (So there * are at most sixteen features of each type.) */ -#define USB_DEVICE_SELF_POWERED 0 /* (read only) */ -#define USB_DEVICE_REMOTE_WAKEUP 1 /* dev may initiate wakeup */ -#define USB_DEVICE_TEST_MODE 2 /* (wired high speed only) */ -#define USB_DEVICE_BATTERY 2 /* (wireless) */ -#define USB_DEVICE_B_HNP_ENABLE 3 /* (otg) dev may initiate HNP */ -#define USB_DEVICE_WUSB_DEVICE 3 /* (wireless)*/ -#define USB_DEVICE_A_HNP_SUPPORT 4 /* (otg) RH port supports HNP */ -#define USB_DEVICE_A_ALT_HNP_SUPPORT 5 /* (otg) other RH port does */ -#define USB_DEVICE_DEBUG_MODE 6 /* (special devices only) */ +#define USB_DEVICE_SELF_POWERED 0 /* (read only) */ +#define USB_DEVICE_REMOTE_WAKEUP 1 /* dev may initiate wakeup */ +#define USB_DEVICE_TEST_MODE 2 /* (wired high speed only) */ +#define USB_DEVICE_BATTERY 2 /* (wireless) */ +#define USB_DEVICE_B_HNP_ENABLE 3 /* (otg) dev may initiate HNP */ +#define USB_DEVICE_WUSB_DEVICE 3 /* (wireless)*/ +#define USB_DEVICE_A_HNP_SUPPORT 4 /* (otg) RH port supports HNP */ +#define USB_DEVICE_A_ALT_HNP_SUPPORT 5 /* (otg) other RH port does */ +#define USB_DEVICE_DEBUG_MODE 6 /* (special devices only) */ -#define USB_ENDPOINT_HALT 0 /* IN/OUT will STALL */ +#define USB_ENDPOINT_HALT 0 /* IN/OUT will STALL */ -#define PIPE_ISOCHRONOUS UE_ISOCHRONOUS -#define PIPE_INTERRUPT UE_INTERRUPT -#define PIPE_CONTROL UE_CONTROL -#define PIPE_BULK UE_BULK +#define PIPE_ISOCHRONOUS UE_ISOCHRONOUS +#define PIPE_INTERRUPT UE_INTERRUPT +#define PIPE_CONTROL UE_CONTROL +#define PIPE_BULK UE_BULK -#define usb_sndctrlpipe(dev,endpoint) \ +#define usb_sndctrlpipe(dev,endpoint) \ usb_find_host_endpoint(dev, PIPE_CONTROL, (endpoint) | USB_DIR_OUT) -#define usb_rcvctrlpipe(dev,endpoint) \ +#define usb_rcvctrlpipe(dev,endpoint) \ usb_find_host_endpoint(dev, PIPE_CONTROL, (endpoint) | USB_DIR_IN) -#define usb_sndisocpipe(dev,endpoint) \ +#define usb_sndisocpipe(dev,endpoint) \ usb_find_host_endpoint(dev, PIPE_ISOCHRONOUS, (endpoint) | USB_DIR_OUT) -#define usb_rcvisocpipe(dev,endpoint) \ +#define usb_rcvisocpipe(dev,endpoint) \ usb_find_host_endpoint(dev, PIPE_ISOCHRONOUS, (endpoint) | USB_DIR_IN) -#define usb_sndbulkpipe(dev,endpoint) \ +#define usb_sndbulkpipe(dev,endpoint) \ usb_find_host_endpoint(dev, PIPE_BULK, (endpoint) | USB_DIR_OUT) -#define usb_rcvbulkpipe(dev,endpoint) \ +#define usb_rcvbulkpipe(dev,endpoint) \ usb_find_host_endpoint(dev, PIPE_BULK, (endpoint) | USB_DIR_IN) -#define usb_sndintpipe(dev,endpoint) \ +#define usb_sndintpipe(dev,endpoint) \ usb_find_host_endpoint(dev, PIPE_INTERRUPT, (endpoint) | USB_DIR_OUT) -#define usb_rcvintpipe(dev,endpoint) \ +#define usb_rcvintpipe(dev,endpoint) \ usb_find_host_endpoint(dev, PIPE_INTERRUPT, (endpoint) | USB_DIR_IN) struct usb_host_endpoint { @@ -387,10 +387,10 @@ uint32_t timeout; /* FreeBSD specific */ uint16_t transfer_flags; /* (in) */ -#define URB_SHORT_NOT_OK 0x0001 /* report short transfers like errors */ -#define URB_ISO_ASAP 0x0002 /* ignore "start_frame" field */ -#define URB_ZERO_PACKET 0x0004 /* the USB transfer ends with a short packet */ -#define URB_NO_TRANSFER_DMA_MAP 0x0008 /* "transfer_dma" is valid on submit */ +#define URB_SHORT_NOT_OK 0x0001 /* report short transfers like errors */ +#define URB_ISO_ASAP 0x0002 /* ignore "start_frame" field */ +#define URB_ZERO_PACKET 0x0004 /* the USB transfer ends with a short packet */ +#define URB_NO_TRANSFER_DMA_MAP 0x0008 /* "transfer_dma" is valid on submit */ #define URB_WAIT_WAKEUP 0x0010 /* custom flags */ #define URB_IS_SLEEPING 0x0020 /* custom flags */ @@ -432,6 +432,6 @@ void usb_linux_register(void *arg); void usb_linux_deregister(void *arg); -#define interface_to_usbdev(intf) (intf)->linux_udev +#define interface_to_usbdev(intf) (intf)->linux_udev #endif /* _USB_COMPAT_LINUX_H */ From owner-p4-projects@FreeBSD.ORG Fri May 18 21:57:59 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A5C4316A406; Fri, 18 May 2007 21:57:59 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 5A7BC16A402 for ; Fri, 18 May 2007 21:57:59 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 4B4F913C457 for ; Fri, 18 May 2007 21:57:59 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4ILvxPK084781 for ; Fri, 18 May 2007 21:57:59 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4ILvxP6084769 for perforce@freebsd.org; Fri, 18 May 2007 21:57:59 GMT (envelope-from mjacob@freebsd.org) Date: Fri, 18 May 2007 21:57:59 GMT Message-Id: <200705182157.l4ILvxP6084769@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 120026 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 May 2007 21:58:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=120026 Change 120026 by mjacob@mjexp on 2007/05/18 21:57:35 Zero scsi_readcapacity allocations so we can really tell if there has been data returned (for some broken residual checking points). Affected files ... .. //depot/projects/mjexp/sys/cam/scsi/scsi_da.c#11 edit Differences ... ==== //depot/projects/mjexp/sys/cam/scsi/scsi_da.c#11 (text+ko) ==== @@ -1303,9 +1303,8 @@ struct ccb_scsiio *csio; struct scsi_read_capacity_data *rcap; - rcap = (struct scsi_read_capacity_data *)malloc(sizeof(*rcap), - M_SCSIDA, - M_NOWAIT); + rcap = (struct scsi_read_capacity_data *) + malloc(sizeof(*rcap), M_SCSIDA, M_NOWAIT|M_ZERO); if (rcap == NULL) { printf("dastart: Couldn't malloc read_capacity data\n"); /* da_free_periph??? */ @@ -1330,7 +1329,7 @@ struct scsi_read_capacity_data_long *rcaplong; rcaplong = (struct scsi_read_capacity_data_long *) - malloc(sizeof(*rcaplong), M_SCSIDA, M_NOWAIT); + malloc(sizeof(*rcaplong), M_SCSIDA, M_NOWAIT|M_ZERO); if (rcaplong == NULL) { printf("dastart: Couldn't malloc read_capacity data\n"); /* da_free_periph??? */ From owner-p4-projects@FreeBSD.ORG Sat May 19 04:06:55 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9405816A405; Sat, 19 May 2007 04:06:55 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4ACED16A400 for ; Sat, 19 May 2007 04:06:55 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 390B713C448 for ; Sat, 19 May 2007 04:06:55 +0000 (UTC) (envelope-from zec@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4J46tiN033480 for ; Sat, 19 May 2007 04:06:55 GMT (envelope-from zec@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4J46e4U033335 for perforce@freebsd.org; Sat, 19 May 2007 04:06:40 GMT (envelope-from zec@FreeBSD.org) Date: Sat, 19 May 2007 04:06:40 GMT Message-Id: <200705190406.l4J46e4U033335@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@FreeBSD.org using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 120030 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: Sat, 19 May 2007 04:06:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=120030 Change 120030 by zec@zec_tpx32 on 2007/05/19 04:06:28 IFC Affected files ... .. //depot/projects/vimage/src/sys/amd64/acpica/madt.c#3 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/intr_machdep.c#4 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/io_apic.c#3 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/local_apic.c#5 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/mp_machdep.c#4 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/mptable.c#3 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/msi.c#4 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/nexus.c#5 integrate .. //depot/projects/vimage/src/sys/amd64/conf/GENERIC#6 integrate .. //depot/projects/vimage/src/sys/amd64/conf/NOTES#3 integrate .. //depot/projects/vimage/src/sys/amd64/include/apicvar.h#4 integrate .. //depot/projects/vimage/src/sys/amd64/include/intr_machdep.h#5 integrate .. //depot/projects/vimage/src/sys/amd64/isa/atpic.c#3 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_machdep.c#8 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_sysvec.c#4 integrate .. //depot/projects/vimage/src/sys/boot/common/loader.8#4 integrate .. //depot/projects/vimage/src/sys/cam/cam_periph.c#4 integrate .. //depot/projects/vimage/src/sys/cam/cam_xpt.c#7 integrate .. //depot/projects/vimage/src/sys/cam/cam_xpt.h#5 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_cd.c#4 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_ch.c#4 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_da.c#7 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_pass.c#4 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_pt.c#4 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_sa.c#4 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_ses.c#4 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_sg.c#2 integrate .. //depot/projects/vimage/src/sys/cam/scsi/scsi_targ_bh.c#4 integrate .. //depot/projects/vimage/src/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/vimage/src/sys/conf/Makefile.amd64#2 integrate .. //depot/projects/vimage/src/sys/conf/Makefile.arm#2 integrate .. //depot/projects/vimage/src/sys/conf/Makefile.i386#2 integrate .. //depot/projects/vimage/src/sys/conf/Makefile.ia64#2 integrate .. //depot/projects/vimage/src/sys/conf/Makefile.pc98#2 integrate .. //depot/projects/vimage/src/sys/conf/Makefile.powerpc#2 integrate .. //depot/projects/vimage/src/sys/conf/Makefile.sparc64#2 integrate .. //depot/projects/vimage/src/sys/conf/Makefile.sun4v#2 integrate .. //depot/projects/vimage/src/sys/conf/NOTES#8 integrate .. //depot/projects/vimage/src/sys/conf/files#9 integrate .. //depot/projects/vimage/src/sys/conf/options#10 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#3 integrate .. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#3 integrate .. //depot/projects/vimage/src/sys/crypto/camellia/camellia-api.c#1 branch .. //depot/projects/vimage/src/sys/crypto/camellia/camellia.c#1 branch .. //depot/projects/vimage/src/sys/crypto/camellia/camellia.h#1 branch .. //depot/projects/vimage/src/sys/dev/acpica/acpi.c#5 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpivar.h#4 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-disk.c#4 integrate .. //depot/projects/vimage/src/sys/dev/bce/if_bce.c#7 integrate .. //depot/projects/vimage/src/sys/dev/bce/if_bcefw.h#3 integrate .. //depot/projects/vimage/src/sys/dev/bce/if_bcereg.h#4 integrate .. //depot/projects/vimage/src/sys/dev/cardbus/cardbus.c#3 integrate .. //depot/projects/vimage/src/sys/dev/cardbus/cardbus_cis.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ciss/ciss.c#5 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_80003es2lan.c#2 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_80003es2lan.h#2 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_82540.c#2 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_82541.c#2 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_82541.h#2 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_82542.c#2 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_82543.c#2 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_82543.h#2 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_82571.c#2 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_82571.h#2 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_82575.c#2 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_82575.h#2 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_api.c#2 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_api.h#2 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_defines.h#2 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_hw.h#2 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_ich8lan.c#2 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_ich8lan.h#2 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_mac.c#2 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_mac.h#2 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_manage.c#2 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_manage.h#2 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_nvm.c#2 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_nvm.h#2 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_osdep.h#2 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_phy.c#2 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_phy.h#2 integrate .. //depot/projects/vimage/src/sys/dev/em/e1000_regs.h#2 integrate .. //depot/projects/vimage/src/sys/dev/em/if_em.c#4 integrate .. //depot/projects/vimage/src/sys/dev/em/if_em.h#3 integrate .. //depot/projects/vimage/src/sys/dev/firewire/sbp_targ.c#5 integrate .. //depot/projects/vimage/src/sys/dev/hptiop/hptiop.c#1 branch .. //depot/projects/vimage/src/sys/dev/hptiop/hptiop.h#1 branch .. //depot/projects/vimage/src/sys/dev/isp/isp_freebsd.c#8 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_pci.c#7 integrate .. //depot/projects/vimage/src/sys/dev/isp/isp_sbus.c#7 integrate .. //depot/projects/vimage/src/sys/dev/mfi/mfi.c#5 integrate .. //depot/projects/vimage/src/sys/dev/mfi/mfi_cam.c#1 branch .. //depot/projects/vimage/src/sys/dev/mfi/mfi_disk.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mfi/mfi_ioctl.h#3 integrate .. //depot/projects/vimage/src/sys/dev/mfi/mfi_pci.c#4 integrate .. //depot/projects/vimage/src/sys/dev/mfi/mfireg.h#3 integrate .. //depot/projects/vimage/src/sys/dev/mfi/mfivar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmc.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmcsd.c#2 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmcvar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/mxge/eth_z8e.dat.gz.uu#3 integrate .. //depot/projects/vimage/src/sys/dev/mxge/ethp_z8e.dat.gz.uu#3 integrate .. //depot/projects/vimage/src/sys/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/vimage/src/sys/dev/mxge/mxge_mcp.h#2 integrate .. //depot/projects/vimage/src/sys/dev/nve/if_nve.c#3 integrate .. //depot/projects/vimage/src/sys/dev/pccbb/pccbb.c#3 integrate .. //depot/projects/vimage/src/sys/dev/pci/pci.c#8 integrate .. //depot/projects/vimage/src/sys/dev/pci/pci_private.h#5 integrate .. //depot/projects/vimage/src/sys/dev/pci/pcireg.h#6 integrate .. //depot/projects/vimage/src/sys/dev/sk/if_sk.c#5 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/hda/hdac.c#9 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/buffer.h#4 integrate .. //depot/projects/vimage/src/sys/dev/sound/pcm/sound.h#4 integrate .. //depot/projects/vimage/src/sys/dev/twa/tw_cl.h#2 integrate .. //depot/projects/vimage/src/sys/dev/twa/tw_cl_externs.h#2 integrate .. //depot/projects/vimage/src/sys/dev/twa/tw_cl_fwif.h#2 integrate .. //depot/projects/vimage/src/sys/dev/twa/tw_cl_fwimg.c#2 delete .. //depot/projects/vimage/src/sys/dev/twa/tw_cl_init.c#2 integrate .. //depot/projects/vimage/src/sys/dev/twa/tw_cl_intr.c#2 integrate .. //depot/projects/vimage/src/sys/dev/twa/tw_cl_io.c#2 integrate .. //depot/projects/vimage/src/sys/dev/twa/tw_cl_ioctl.h#2 integrate .. //depot/projects/vimage/src/sys/dev/twa/tw_cl_misc.c#2 integrate .. //depot/projects/vimage/src/sys/dev/twa/tw_cl_share.h#2 integrate .. //depot/projects/vimage/src/sys/dev/twa/tw_osl.h#2 integrate .. //depot/projects/vimage/src/sys/dev/twa/tw_osl_cam.c#3 integrate .. //depot/projects/vimage/src/sys/dev/twa/tw_osl_externs.h#2 integrate .. //depot/projects/vimage/src/sys/dev/twa/tw_osl_freebsd.c#4 integrate .. //depot/projects/vimage/src/sys/dev/twa/tw_osl_includes.h#2 integrate .. //depot/projects/vimage/src/sys/dev/twa/tw_osl_inline.h#2 integrate .. //depot/projects/vimage/src/sys/dev/twa/tw_osl_ioctl.h#2 integrate .. //depot/projects/vimage/src/sys/dev/twa/tw_osl_share.h#2 integrate .. //depot/projects/vimage/src/sys/dev/twa/tw_osl_types.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_axe.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_cue.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_cuereg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_kue.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_kuereg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_rue.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_ruereg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_rum.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb/if_rumreg.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/if_rumvar.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/if_udav.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_ural.c#5 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_uralvar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/rt2573_ucode.h#1 branch .. //depot/projects/vimage/src/sys/dev/usb/ubsa.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/uhid.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/ukbd.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/ums.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_mem.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/usb_subr.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbdevs#5 integrate .. //depot/projects/vimage/src/sys/geom/eli/g_eli_ctl.c#3 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part.c#3 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part.h#2 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_apm.c#2 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_gpt.c#2 integrate .. //depot/projects/vimage/src/sys/i386/Makefile#2 integrate .. //depot/projects/vimage/src/sys/i386/acpica/madt.c#3 integrate .. //depot/projects/vimage/src/sys/i386/conf/GENERIC#8 integrate .. //depot/projects/vimage/src/sys/i386/conf/NOTES#8 integrate .. //depot/projects/vimage/src/sys/i386/conf/PAE#5 integrate .. //depot/projects/vimage/src/sys/i386/i386/intr_machdep.c#4 integrate .. //depot/projects/vimage/src/sys/i386/i386/io_apic.c#3 integrate .. //depot/projects/vimage/src/sys/i386/i386/local_apic.c#5 integrate .. //depot/projects/vimage/src/sys/i386/i386/mp_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/i386/i386/mptable.c#3 integrate .. //depot/projects/vimage/src/sys/i386/i386/msi.c#4 integrate .. //depot/projects/vimage/src/sys/i386/i386/nexus.c#5 integrate .. //depot/projects/vimage/src/sys/i386/include/apicvar.h#4 integrate .. //depot/projects/vimage/src/sys/i386/include/intr_machdep.h#5 integrate .. //depot/projects/vimage/src/sys/i386/isa/atpic.c#3 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/kern/Make.tags.inc#3 integrate .. //depot/projects/vimage/src/sys/kern/imgact_elf.c#3 integrate .. //depot/projects/vimage/src/sys/kern/kern_condvar.c#4 integrate .. //depot/projects/vimage/src/sys/kern/kern_exec.c#3 integrate .. //depot/projects/vimage/src/sys/kern/kern_exit.c#4 integrate .. //depot/projects/vimage/src/sys/kern/kern_intr.c#6 integrate .. //depot/projects/vimage/src/sys/kern/kern_mib.c#4 integrate .. //depot/projects/vimage/src/sys/kern/kern_mutex.c#5 integrate .. //depot/projects/vimage/src/sys/kern/kern_resource.c#6 integrate .. //depot/projects/vimage/src/sys/kern/kern_rwlock.c#3 integrate .. //depot/projects/vimage/src/sys/kern/kern_sx.c#4 integrate .. //depot/projects/vimage/src/sys/kern/kern_synch.c#8 integrate .. //depot/projects/vimage/src/sys/kern/kern_timeout.c#3 integrate .. //depot/projects/vimage/src/sys/kern/uipc_domain.c#2 integrate .. //depot/projects/vimage/src/sys/kern/uipc_mbuf.c#5 integrate .. //depot/projects/vimage/src/sys/kern/uipc_sockbuf.c#4 integrate .. //depot/projects/vimage/src/sys/kern/uipc_socket.c#11 integrate .. //depot/projects/vimage/src/sys/kern/uipc_syscalls.c#9 integrate .. //depot/projects/vimage/src/sys/kern/uipc_usrreq.c#6 integrate .. //depot/projects/vimage/src/sys/modules/Makefile#6 integrate .. //depot/projects/vimage/src/sys/modules/crypto/Makefile#3 integrate .. //depot/projects/vimage/src/sys/modules/em/Makefile#3 integrate .. //depot/projects/vimage/src/sys/modules/hptiop/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/mfi/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/mfi/mfip/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/netgraph/Makefile#3 integrate .. //depot/projects/vimage/src/sys/modules/netgraph/car/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/rum/Makefile#1 branch .. //depot/projects/vimage/src/sys/modules/twa/Makefile#2 integrate .. //depot/projects/vimage/src/sys/net/ethernet.h#4 integrate .. //depot/projects/vimage/src/sys/net/ieee8023ad_lacp.c#3 integrate .. //depot/projects/vimage/src/sys/net/ieee8023ad_lacp.h#2 integrate .. //depot/projects/vimage/src/sys/net/if.c#13 integrate .. //depot/projects/vimage/src/sys/net/if.h#3 integrate .. //depot/projects/vimage/src/sys/net/if_lagg.c#3 integrate .. //depot/projects/vimage/src/sys/net/if_lagg.h#3 integrate .. //depot/projects/vimage/src/sys/net/if_var.h#9 integrate .. //depot/projects/vimage/src/sys/net/pfkeyv2.h#2 integrate .. //depot/projects/vimage/src/sys/netatalk/ddp_usrreq.c#3 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_car.c#1 branch .. //depot/projects/vimage/src/sys/netgraph/ng_car.h#1 branch .. //depot/projects/vimage/src/sys/netgraph/ng_mppc.c#3 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_socket.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/if_ether.c#10 integrate .. //depot/projects/vimage/src/sys/netinet/in.c#7 integrate .. //depot/projects/vimage/src/sys/netinet/in_cksum.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/in_gif.c#6 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#10 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.h#8 integrate .. //depot/projects/vimage/src/sys/netinet/in_rmx.c#7 integrate .. //depot/projects/vimage/src/sys/netinet/ip.h#3 integrate .. //depot/projects/vimage/src/sys/netinet/ip_divert.c#5 integrate .. //depot/projects/vimage/src/sys/netinet/ip_dummynet.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/ip_ecn.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/ip_encap.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#14 integrate .. //depot/projects/vimage/src/sys/netinet/ip_icmp.c#5 integrate .. //depot/projects/vimage/src/sys/netinet/ip_id.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/ip_input.c#13 integrate .. //depot/projects/vimage/src/sys/netinet/ip_ipsec.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#4 integrate .. //depot/projects/vimage/src/sys/netinet/ip_options.c#5 integrate .. //depot/projects/vimage/src/sys/netinet/ip_options.h#2 integrate .. //depot/projects/vimage/src/sys/netinet/ip_output.c#7 integrate .. //depot/projects/vimage/src/sys/netinet/raw_ip.c#9 integrate .. //depot/projects/vimage/src/sys/netinet/sctp.h#4 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_asconf.c#7 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_asconf.h#5 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_auth.c#6 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_auth.h#3 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_bsd_addr.c#6 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_bsd_addr.h#4 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_constants.h#8 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_crc32.c#5 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_crc32.h#3 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_header.h#4 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_indata.c#9 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_indata.h#5 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_input.c#9 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_input.h#3 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_lock_bsd.h#5 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_os.h#5 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_os_bsd.h#8 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_output.c#9 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_output.h#5 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_pcb.c#9 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_pcb.h#8 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_peeloff.c#7 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_peeloff.h#3 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_structs.h#9 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_sysctl.c#2 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_sysctl.h#2 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_timer.c#7 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_timer.h#3 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_uio.h#7 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_usrreq.c#9 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_var.h#7 integrate .. //depot/projects/vimage/src/sys/netinet/sctputil.c#9 integrate .. //depot/projects/vimage/src/sys/netinet/sctputil.h#8 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_debug.c#3 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_fsm.h#2 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_input.c#11 edit .. //depot/projects/vimage/src/sys/netinet/tcp_output.c#8 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_reass.c#1 add .. //depot/projects/vimage/src/sys/netinet/tcp_sack.c#7 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#15 edit .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#9 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_timer.c#10 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_timer.h#4 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_timewait.c#1 add .. //depot/projects/vimage/src/sys/netinet/tcp_usrreq.c#9 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_var.h#9 integrate .. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#10 integrate .. //depot/projects/vimage/src/sys/netinet6/esp_camellia.c#1 branch .. //depot/projects/vimage/src/sys/netinet6/esp_camellia.h#1 branch .. //depot/projects/vimage/src/sys/netinet6/esp_core.c#2 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_pcb.c#8 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_pcb.h#2 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_proto.c#5 integrate .. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#10 integrate .. //depot/projects/vimage/src/sys/netinet6/raw_ip6.c#8 integrate .. //depot/projects/vimage/src/sys/netinet6/sctp6_usrreq.c#9 integrate .. //depot/projects/vimage/src/sys/netinet6/sctp6_var.h#4 integrate .. //depot/projects/vimage/src/sys/netipsec/xform_esp.c#2 integrate .. //depot/projects/vimage/src/sys/netipx/ipx.c#3 integrate .. //depot/projects/vimage/src/sys/netipx/ipx.h#3 integrate .. //depot/projects/vimage/src/sys/netipx/ipx_cksum.c#3 integrate .. //depot/projects/vimage/src/sys/netipx/ipx_if.h#3 integrate .. //depot/projects/vimage/src/sys/netipx/ipx_input.c#3 integrate .. //depot/projects/vimage/src/sys/netipx/ipx_outputfl.c#3 integrate .. //depot/projects/vimage/src/sys/netipx/ipx_pcb.c#3 integrate .. //depot/projects/vimage/src/sys/netipx/ipx_pcb.h#3 integrate .. //depot/projects/vimage/src/sys/netipx/ipx_usrreq.c#3 integrate .. //depot/projects/vimage/src/sys/netipx/ipx_var.h#3 integrate .. //depot/projects/vimage/src/sys/netipx/spx_debug.c#3 integrate .. //depot/projects/vimage/src/sys/netipx/spx_debug.h#3 integrate .. //depot/projects/vimage/src/sys/opencrypto/cryptodev.c#4 integrate .. //depot/projects/vimage/src/sys/opencrypto/cryptodev.h#3 integrate .. //depot/projects/vimage/src/sys/opencrypto/cryptosoft.c#3 integrate .. //depot/projects/vimage/src/sys/opencrypto/xform.c#2 integrate .. //depot/projects/vimage/src/sys/opencrypto/xform.h#2 integrate .. //depot/projects/vimage/src/sys/pc98/conf/GENERIC#4 integrate .. //depot/projects/vimage/src/sys/pci/if_tl.c#3 integrate .. //depot/projects/vimage/src/sys/sparc64/include/profile.h#2 integrate .. //depot/projects/vimage/src/sys/sun4v/include/profile.h#2 integrate .. //depot/projects/vimage/src/sys/sys/callout.h#2 integrate .. //depot/projects/vimage/src/sys/sys/interrupt.h#5 integrate .. //depot/projects/vimage/src/sys/sys/param.h#6 integrate .. //depot/projects/vimage/src/sys/sys/rwlock.h#3 integrate .. //depot/projects/vimage/src/sys/sys/sx.h#4 integrate .. //depot/projects/vimage/src/sys/sys/sysent.h#4 integrate .. //depot/projects/vimage/src/sys/vm/uma_int.h#2 integrate Differences ... ==== //depot/projects/vimage/src/sys/amd64/acpica/madt.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.23 2007/03/22 18:16:38 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.24 2007/05/08 22:01:02 jhb Exp $"); #include #include @@ -53,21 +53,18 @@ #include #include -#define NIOAPICS 32 /* Max number of I/O APICs */ -#define NLAPICS 32 /* Max number of local APICs */ - typedef void madt_entry_handler(ACPI_SUBTABLE_HEADER *entry, void *arg); /* These two arrays are indexed by APIC IDs. */ struct ioapic_info { void *io_apic; UINT32 io_vector; -} ioapics[NIOAPICS]; +} ioapics[MAX_APIC_ID + 1]; struct lapic_info { u_int la_enabled:1; u_int la_acpi_id:8; -} lapics[NLAPICS]; +} lapics[MAX_APIC_ID + 1]; static int madt_found_sci_override; static ACPI_TABLE_MADT *madt; @@ -393,7 +390,7 @@ } /* Third, we register all the I/O APIC's. */ - for (i = 0; i < NIOAPICS; i++) + for (i = 0; i <= MAX_APIC_ID; i++) if (ioapics[i].io_apic != NULL) ioapic_register(ioapics[i].io_apic); @@ -450,7 +447,7 @@ "enabled" : "disabled"); if (!(proc->LapicFlags & ACPI_MADT_ENABLED)) break; - if (proc->Id >= NLAPICS) + if (proc->Id > MAX_APIC_ID) panic("%s: CPU ID %u too high", __func__, proc->Id); la = &lapics[proc->Id]; KASSERT(la->la_enabled == 0, @@ -479,7 +476,7 @@ "MADT: Found IO APIC ID %u, Interrupt %u at %p\n", apic->Id, apic->GlobalIrqBase, (void *)(uintptr_t)apic->Address); - if (apic->Id >= NIOAPICS) + if (apic->Id > MAX_APIC_ID) panic("%s: I/O APIC ID %u too high", __func__, apic->Id); if (ioapics[apic->Id].io_apic != NULL) @@ -545,7 +542,7 @@ { int i; - for (i = 0; i < NLAPICS; i++) { + for (i = 0; i <= MAX_APIC_ID; i++) { if (!lapics[i].la_enabled) continue; if (lapics[i].la_acpi_id != acpi_id) @@ -566,7 +563,7 @@ int i, best; best = -1; - for (i = 0; i < NIOAPICS; i++) { + for (i = 0; i <= MAX_APIC_ID; i++) { if (ioapics[i].io_apic == NULL || ioapics[i].io_vector > intr) continue; ==== //depot/projects/vimage/src/sys/amd64/amd64/intr_machdep.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.30 2007/03/06 17:16:46 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.32 2007/05/08 21:29:12 jhb Exp $ */ /* @@ -43,13 +43,14 @@ #include #include #include -#include #include #include +#include #include #include #include #include +#include #include #include #include @@ -71,9 +72,16 @@ static int intrcnt_index; static struct intsrc *interrupt_sources[NUM_IO_INTS]; -static struct mtx intr_table_lock; +static struct sx intr_table_lock; +static struct mtx intrcnt_lock; static STAILQ_HEAD(, pic) pics; +#ifdef INTR_FILTER +static void intr_eoi_src(void *arg); +static void intr_disab_eoi_src(void *arg); +static void intr_event_stray(void *cookie); +#endif + #ifdef SMP static int assign_cpu; @@ -109,14 +117,14 @@ { int error; - mtx_lock_spin(&intr_table_lock); + sx_xlock(&intr_table_lock); if (intr_pic_registered(pic)) error = EBUSY; else { STAILQ_INSERT_TAIL(&pics, pic, pics); error = 0; } - mtx_unlock_spin(&intr_table_lock); + sx_xunlock(&intr_table_lock); return (error); } @@ -134,20 +142,26 @@ vector = isrc->is_pic->pic_vector(isrc); if (interrupt_sources[vector] != NULL) return (EEXIST); +#ifdef INTR_FILTER error = intr_event_create(&isrc->is_event, isrc, 0, + (mask_fn)isrc->is_pic->pic_enable_source, + intr_eoi_src, intr_disab_eoi_src, "irq%d:", vector); +#else + error = intr_event_create(&isrc->is_event, isrc, 0, (mask_fn)isrc->is_pic->pic_enable_source, "irq%d:", vector); +#endif if (error) return (error); - mtx_lock_spin(&intr_table_lock); + sx_xlock(&intr_table_lock); if (interrupt_sources[vector] != NULL) { - mtx_unlock_spin(&intr_table_lock); + sx_xunlock(&intr_table_lock); intr_event_destroy(isrc->is_event); return (EEXIST); } intrcnt_register(isrc); interrupt_sources[vector] = isrc; - isrc->is_enabled = 0; - mtx_unlock_spin(&intr_table_lock); + isrc->is_handlers = 0; + sx_xunlock(&intr_table_lock); return (0); } @@ -171,19 +185,18 @@ error = intr_event_add_handler(isrc->is_event, name, filter, handler, arg, intr_priority(flags), flags, cookiep); if (error == 0) { + sx_xlock(&intr_table_lock); intrcnt_updatename(isrc); - mtx_lock_spin(&intr_table_lock); - if (!isrc->is_enabled) { - isrc->is_enabled = 1; + isrc->is_handlers++; + if (isrc->is_handlers == 1) { #ifdef SMP if (assign_cpu) intr_assign_next_cpu(isrc); #endif - mtx_unlock_spin(&intr_table_lock); isrc->is_pic->pic_enable_intr(isrc); - } else - mtx_unlock_spin(&intr_table_lock); - isrc->is_pic->pic_enable_source(isrc); + isrc->is_pic->pic_enable_source(isrc); + } + sx_xunlock(&intr_table_lock); } return (error); } @@ -196,8 +209,16 @@ isrc = intr_handler_source(cookie); error = intr_event_remove_handler(cookie); - if (error == 0) + if (error == 0) { + sx_xlock(&intr_table_lock); + isrc->is_handlers--; + if (isrc->is_handlers == 0) { + isrc->is_pic->pic_disable_source(isrc, PIC_NO_EOI); + isrc->is_pic->pic_disable_intr(isrc); + } intrcnt_updatename(isrc); + sx_xunlock(&intr_table_lock); + } return (error); } @@ -212,11 +233,82 @@ return (isrc->is_pic->pic_config_intr(isrc, trig, pol)); } +#ifdef INTR_FILTER void intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame) { struct thread *td; struct intr_event *ie; + int vector; + + td = curthread; + + /* + * We count software interrupts when we process them. The + * code here follows previous practice, but there's an + * argument for counting hardware interrupts when they're + * processed too. + */ + (*isrc->is_count)++; + PCPU_LAZY_INC(cnt.v_intr); + + ie = isrc->is_event; + + /* + * XXX: We assume that IRQ 0 is only used for the ISA timer + * device (clk). + */ + vector = isrc->is_pic->pic_vector(isrc); + if (vector == 0) + clkintr_pending = 1; + + if (intr_event_handle(ie, frame) != 0) + intr_event_stray(isrc); +} + +static void +intr_event_stray(void *cookie) +{ + struct intsrc *isrc; + + isrc = cookie; + /* + * For stray interrupts, mask and EOI the source, bump the + * stray count, and log the condition. + */ + isrc->is_pic->pic_disable_source(isrc, PIC_EOI); + (*isrc->is_straycount)++; + if (*isrc->is_straycount < MAX_STRAY_LOG) + log(LOG_ERR, "stray irq%d\n", isrc->is_pic->pic_vector(isrc)); + else if (*isrc->is_straycount == MAX_STRAY_LOG) + log(LOG_CRIT, + "too many stray irq %d's: not logging anymore\n", + isrc->is_pic->pic_vector(isrc)); +} + +static void +intr_eoi_src(void *arg) +{ + struct intsrc *isrc; + + isrc = arg; + isrc->is_pic->pic_eoi_source(isrc); +} + +static void +intr_disab_eoi_src(void *arg) +{ + struct intsrc *isrc; + + isrc = arg; + isrc->is_pic->pic_disable_source(isrc, PIC_EOI); +} +#else +void +intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame) +{ + struct thread *td; + struct intr_event *ie; struct intr_handler *ih; int error, vector, thread; @@ -298,6 +390,7 @@ } td->td_intr_nesting_level--; } +#endif void intr_resume(void) @@ -307,12 +400,12 @@ #ifndef DEV_ATPIC atpic_reset(); #endif - mtx_lock_spin(&intr_table_lock); + sx_xlock(&intr_table_lock); STAILQ_FOREACH(pic, &pics, pics) { if (pic->pic_resume != NULL) pic->pic_resume(pic); } - mtx_unlock_spin(&intr_table_lock); + sx_xunlock(&intr_table_lock); } void @@ -320,12 +413,12 @@ { struct pic *pic; - mtx_lock_spin(&intr_table_lock); + sx_xlock(&intr_table_lock); STAILQ_FOREACH(pic, &pics, pics) { if (pic->pic_suspend != NULL) pic->pic_suspend(pic); } - mtx_unlock_spin(&intr_table_lock); + sx_xunlock(&intr_table_lock); } static void @@ -348,8 +441,8 @@ { char straystr[MAXCOMLEN + 1]; - /* mtx_assert(&intr_table_lock, MA_OWNED); */ KASSERT(is->is_event != NULL, ("%s: isrc with no event", __func__)); + mtx_lock_spin(&intrcnt_lock); is->is_index = intrcnt_index; intrcnt_index += 2; snprintf(straystr, MAXCOMLEN + 1, "stray irq%d", @@ -358,17 +451,18 @@ is->is_count = &intrcnt[is->is_index]; intrcnt_setname(straystr, is->is_index + 1); is->is_straycount = &intrcnt[is->is_index + 1]; + mtx_unlock_spin(&intrcnt_lock); } void intrcnt_add(const char *name, u_long **countp) { - mtx_lock_spin(&intr_table_lock); + mtx_lock_spin(&intrcnt_lock); *countp = &intrcnt[intrcnt_index]; intrcnt_setname(name, intrcnt_index); intrcnt_index++; - mtx_unlock_spin(&intr_table_lock); + mtx_unlock_spin(&intrcnt_lock); } static void @@ -378,7 +472,8 @@ intrcnt_setname("???", 0); intrcnt_index = 1; STAILQ_INIT(&pics); - mtx_init(&intr_table_lock, "intr table", NULL, MTX_SPIN); + sx_init(&intr_table_lock, "intr sources"); + mtx_init(&intrcnt_lock, "intrcnt", NULL, MTX_SPIN); } SYSINIT(intr_init, SI_SUB_INTR, SI_ORDER_FIRST, intr_init, NULL) @@ -486,14 +581,14 @@ return; /* Round-robin assign a CPU to each enabled source. */ - mtx_lock_spin(&intr_table_lock); + sx_xlock(&intr_table_lock); assign_cpu = 1; for (i = 0; i < NUM_IO_INTS; i++) { isrc = interrupt_sources[i]; - if (isrc != NULL && isrc->is_enabled) + if (isrc != NULL && isrc->is_handlers > 0) intr_assign_next_cpu(isrc); } - mtx_unlock_spin(&intr_table_lock); + sx_xunlock(&intr_table_lock); } SYSINIT(intr_shuffle_irqs, SI_SUB_SMP, SI_ORDER_SECOND, intr_shuffle_irqs, NULL) #endif ==== //depot/projects/vimage/src/sys/amd64/amd64/io_apic.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.29 2007/03/20 21:53:30 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.30 2007/05/08 21:29:12 jhb Exp $"); #include "opt_isa.h" @@ -114,6 +114,7 @@ static void ioapic_disable_source(struct intsrc *isrc, int eoi); static void ioapic_eoi_source(struct intsrc *isrc); static void ioapic_enable_intr(struct intsrc *isrc); +static void ioapic_disable_intr(struct intsrc *isrc); static int ioapic_vector(struct intsrc *isrc); static int ioapic_source_pending(struct intsrc *isrc); static int ioapic_config_intr(struct intsrc *isrc, enum intr_trigger trig, @@ -125,8 +126,8 @@ static STAILQ_HEAD(,ioapic) ioapic_list = STAILQ_HEAD_INITIALIZER(ioapic_list); struct pic ioapic_template = { ioapic_enable_source, ioapic_disable_source, ioapic_eoi_source, ioapic_enable_intr, - ioapic_vector, ioapic_source_pending, - NULL, ioapic_resume, + ioapic_disable_intr, ioapic_vector, + ioapic_source_pending, NULL, ioapic_resume, ioapic_config_intr, ioapic_assign_cpu }; static int next_ioapic_base; @@ -359,6 +360,23 @@ } } +static void +ioapic_disable_intr(struct intsrc *isrc) +{ + struct ioapic_intsrc *intpin = (struct ioapic_intsrc *)isrc; + u_int vector; + + if (intpin->io_vector != 0) { + /* Mask this interrupt pin and free its APIC vector. */ + vector = intpin->io_vector; + apic_disable_vector(vector); + intpin->io_masked = 1; + intpin->io_vector = 0; + ioapic_program_intpin(intpin); + apic_free_vector(vector, intpin->io_irq); + } +} + static int ioapic_vector(struct intsrc *isrc) { ==== //depot/projects/vimage/src/sys/amd64/amd64/local_apic.c#5 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.38 2007/04/25 19:58:41 ariff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.40 2007/05/08 22:01:02 jhb Exp $"); #include "opt_hwpmc_hooks.h" @@ -65,13 +65,6 @@ #include #endif -/* - * We can handle up to 60 APICs via our logical cluster IDs, but currently - * the physical IDs on Intel processors up to the Pentium 4 are limited to - * 16. - */ -#define MAX_APICID 16 - /* Sanity checks on IDT vectors. */ CTASSERT(APIC_IO_INTS + APIC_NUM_IOINTS == APIC_TIMER_INT); CTASSERT(APIC_TIMER_INT < APIC_LOCAL_INTS); @@ -114,7 +107,7 @@ u_long la_hard_ticks; u_long la_stat_ticks; u_long la_prof_ticks; -} static lapics[MAX_APICID]; +} static lapics[MAX_APIC_ID + 1]; /* XXX: should thermal be an NMI? */ @@ -147,6 +140,8 @@ APIC_TDCR_32, APIC_TDCR_64, APIC_TDCR_128 }; +extern inthand_t IDTVEC(rsvd); + volatile lapic_t *lapic; vm_paddr_t lapic_paddr; static u_long lapic_timer_divisor, lapic_timer_period, lapic_timer_hz; @@ -238,7 +233,7 @@ { int i; - if (apic_id >= MAX_APICID) { + if (apic_id > MAX_APIC_ID) { printf("APIC: Ignoring local APIC with ID %d\n", apic_id); if (boot_cpu) panic("Can't ignore BSP"); @@ -837,6 +832,16 @@ setidt(vector, ioint_handlers[vector / 32], SDT_SYSIGT, SEL_KPL, 0); } +void +apic_disable_vector(u_int vector) +{ + + KASSERT(vector != IDT_SYSCALL, ("Attempt to overwrite syscall entry")); + KASSERT(ioint_handlers[vector / 32] != NULL, + ("No ISR handler for vector %u", vector)); + setidt(vector, &IDTVEC(rsvd), SDT_SYSIGT, SEL_KPL, 0); +} + /* Release an APIC vector when it's no longer in use. */ void apic_free_vector(u_int vector, u_int irq) ==== //depot/projects/vimage/src/sys/amd64/amd64/mp_machdep.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.283 2007/03/06 17:16:46 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.284 2007/05/08 22:01:02 jhb Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -151,7 +151,7 @@ int cpu_present:1; int cpu_bsp:1; int cpu_disabled:1; -} static cpu_info[MAXCPU]; +} static cpu_info[MAX_APIC_ID + 1]; int cpu_apic_ids[MAXCPU]; /* Holds pending bitmap based IPIs per CPU */ @@ -159,6 +159,7 @@ static u_int boot_address; +static void assign_cpu_ids(void); static void set_interrupt_apic_ids(void); static int start_all_aps(void); static int start_ap(int apic_id); @@ -204,7 +205,7 @@ } group = &mp_groups[0]; groups = 1; - for (cpu = 0, apic_id = 0; apic_id < MAXCPU; apic_id++) { + for (cpu = 0, apic_id = 0; apic_id <= MAX_APIC_ID; apic_id++) { if (!cpu_info[apic_id].cpu_present) continue; /* @@ -246,9 +247,8 @@ cpu_add(u_int apic_id, char boot_cpu) { - if (apic_id >= MAXCPU) { - printf("SMP: CPU %d exceeds maximum CPU %d, ignoring\n", - apic_id, MAXCPU - 1); + if (apic_id > MAX_APIC_ID) { + panic("SMP: APIC ID %d too high", apic_id); return; } KASSERT(cpu_info[apic_id].cpu_present == 0, ("CPU %d added twice", @@ -261,13 +261,13 @@ boot_cpu_id = apic_id; cpu_info[apic_id].cpu_bsp = 1; } - mp_ncpus++; - if (apic_id > mp_maxid) - mp_maxid = apic_id; + if (mp_ncpus < MAXCPU) { + mp_ncpus++; + mp_maxid = mp_ncpus -1; + } if (bootverbose) printf("SMP: Added CPU %d (%s)\n", apic_id, boot_cpu ? "BSP" : "AP"); - } void @@ -286,8 +286,7 @@ else KASSERT(mp_maxid >= mp_ncpus - 1, ("%s: counters out of sync: max %d, count %d", __func__, - mp_maxid, mp_ncpus)); - + mp_maxid, mp_ncpus)); } int @@ -365,6 +364,8 @@ ("BSP's APIC ID doesn't match boot_cpu_id")); cpu_apic_ids[0] = boot_cpu_id; + assign_cpu_ids(); + /* Start each Application Processor */ start_all_aps(); @@ -429,7 +430,7 @@ /* List CPUs */ printf(" cpu0 (BSP): APIC ID: %2d\n", boot_cpu_id); - for (i = 1, x = 0; x < MAXCPU; x++) { + for (i = 1, x = 0; x <= MAX_APIC_ID; x++) { if (!cpu_info[x].cpu_present || cpu_info[x].cpu_bsp) continue; if (cpu_info[x].cpu_disabled) @@ -646,6 +647,48 @@ } /* + * Assign logical CPU IDs to local APICs. + */ +static void +assign_cpu_ids(void) +{ + u_int i; + + /* Check for explicitly disabled CPUs. */ + for (i = 0; i <= MAX_APIC_ID; i++) { + if (!cpu_info[i].cpu_present || cpu_info[i].cpu_bsp) + continue; + + /* Don't use this CPU if it has been disabled by a tunable. */ + if (resource_disabled("lapic", i)) { + cpu_info[i].cpu_disabled = 1; + continue; + } + } + + /* + * Assign CPU IDs to local APIC IDs and disable any CPUs + * beyond MAXCPU. CPU 0 has already been assigned to the BSP, + * so we only have to assign IDs for APs. + */ + mp_ncpus = 1; + for (i = 0; i <= MAX_APIC_ID; i++) { + if (!cpu_info[i].cpu_present || cpu_info[i].cpu_bsp || + cpu_info[i].cpu_disabled) + continue; + + if (mp_ncpus < MAXCPU) { + cpu_apic_ids[mp_ncpus] = i; + mp_ncpus++; + } else >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat May 19 09:15:13 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9186416A405; Sat, 19 May 2007 09:15:13 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 657E416A401 for ; Sat, 19 May 2007 09:15:13 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 57C4913C44C for ; Sat, 19 May 2007 09:15:13 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4J9FD6O044419 for ; Sat, 19 May 2007 09:15:13 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4J9FDGj044410 for perforce@freebsd.org; Sat, 19 May 2007 09:15:13 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 19 May 2007 09:15:13 GMT Message-Id: <200705190915.l4J9FDGj044410@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 120038 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: Sat, 19 May 2007 09:15:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=120038 Change 120038 by hselasky@hselasky_mini_itx on 2007/05/19 09:14:53 Add missing flags. Affected files ... .. //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#4 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/usb_compat_linux.c#4 (text+ko) ==== @@ -679,6 +679,7 @@ cfg[0].callback = &usb_linux_isoc_callback; cfg[0].bufsize = 0; /* use wMaxPacketSize */ cfg[0].frames = usb_max_isoc_frames(dev); + cfg[0].flags = (USBD_USE_DMA|USBD_SHORT_XFER_OK); bcopy(cfg + 0, cfg + 1, sizeof(*cfg)); @@ -709,6 +710,7 @@ cfg[0].direction = addr & (UE_DIR_OUT|UE_DIR_IN); cfg[0].callback = &usb_linux_non_isoc_callback; cfg[0].bufsize = bufsize; + cfg[0].flags = (USBD_USE_DMA|USBD_SHORT_XFER_OK); if (usbd_transfer_setup(dev->bsd_udev, uhe->bsd_iface_index, uhe->bsd_xfer, cfg, 1, uhe, From owner-p4-projects@FreeBSD.ORG Sat May 19 10:50:12 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 15A2416A405; Sat, 19 May 2007 10:50:12 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C682916A400 for ; Sat, 19 May 2007 10:50:11 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id A09AE13C447 for ; Sat, 19 May 2007 10:50:11 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4JAoBgZ044248 for ; Sat, 19 May 2007 10:50:11 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4JAoBDQ044241 for perforce@freebsd.org; Sat, 19 May 2007 10:50:11 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 19 May 2007 10:50:11 GMT Message-Id: <200705191050.l4JAoBDQ044241@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 120041 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: Sat, 19 May 2007 10:50:12 -0000 http://perforce.freebsd.org/chv.cgi?CH=120041 Change 120041 by rdivacky@rdivacky_witten on 2007/05/19 10:49:34 Cut the loop if we dont have anything to proceed. Affected files ... .. //depot/projects/soc2007/rdivacky/linux_futex/sys/compat/linux/linux_futex.c#6 edit Differences ... ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/compat/linux/linux_futex.c#6 (text+ko) ==== @@ -441,7 +441,8 @@ wakeup_one(wp); if (count - n >= n2) break; - } + } else + break; /* don't loop anymore */ } } FUTEX_UNLOCK; From owner-p4-projects@FreeBSD.ORG Sat May 19 10:50:16 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8E12316A404; Sat, 19 May 2007 10:50:16 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6AED116A400 for ; Sat, 19 May 2007 10:50:16 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 5B57E13C43E for ; Sat, 19 May 2007 10:50:16 +0000 (UTC) (envelope-from rdivacky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4JAoGaf044330 for ; Sat, 19 May 2007 10:50:16 GMT (envelope-from rdivacky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4JAoBvi044251 for perforce@freebsd.org; Sat, 19 May 2007 10:50:11 GMT (envelope-from rdivacky@FreeBSD.org) Date: Sat, 19 May 2007 10:50:11 GMT Message-Id: <200705191050.l4JAoBvi044251@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rdivacky@FreeBSD.org using -f From: Roman Divacky To: Perforce Change Reviews Cc: Subject: PERFORCE change 120042 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: Sat, 19 May 2007 10:50:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=120042 Change 120042 by rdivacky@rdivacky_witten on 2007/05/19 10:49:53 IFC Affected files ... .. //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/amd64/machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/amd64/mp_machdep.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/amd64/pmap.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/include/md_var.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/include/smp.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/linux32/linux32_sysvec.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/arm/machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/arm/pmap.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/boot/i386/boot2/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/cam/cam_periph.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/cam/cam_xpt.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/cam/cam_xpt.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/cam/scsi/scsi_cd.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/cam/scsi/scsi_ch.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/cam/scsi/scsi_da.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/cam/scsi/scsi_pass.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/cam/scsi/scsi_pt.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/cam/scsi/scsi_ses.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/cam/scsi/scsi_sg.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/cam/scsi/scsi_targ_bh.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/coda/coda_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/coda/coda_vnops.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/compat/ia32/ia32_sysvec.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/compat/linprocfs/linprocfs.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/compat/linux/linux_misc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/compat/svr4/svr4_misc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/conf/Makefile.amd64#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/conf/Makefile.arm#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/conf/Makefile.i386#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/conf/Makefile.ia64#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/conf/Makefile.pc98#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/conf/Makefile.powerpc#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/conf/Makefile.sparc64#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/conf/Makefile.sun4v#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/conf/NOTES#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/conf/files#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/conf/kern.mk#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/conf/kern.pre.mk#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/conf/kmod.mk#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/conf/options#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/acpica/acpi.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/bce/if_bce.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/bce/if_bcefw.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/bce/if_bcereg.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/cardbus/cardbus.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/cardbus/cardbus_cis.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/ciss/ciss.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/em/e1000_80003es2lan.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/em/e1000_80003es2lan.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/em/e1000_82540.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/em/e1000_82541.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/em/e1000_82541.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/em/e1000_82542.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/em/e1000_82543.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/em/e1000_82543.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/em/e1000_82571.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/em/e1000_82571.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/em/e1000_82575.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/em/e1000_82575.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/em/e1000_api.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/em/e1000_api.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/em/e1000_defines.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/em/e1000_hw.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/em/e1000_ich8lan.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/em/e1000_ich8lan.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/em/e1000_mac.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/em/e1000_mac.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/em/e1000_manage.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/em/e1000_manage.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/em/e1000_nvm.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/em/e1000_nvm.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/em/e1000_osdep.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/em/e1000_phy.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/em/e1000_phy.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/em/e1000_regs.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/em/if_em.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/em/if_em.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/isp/isp_freebsd.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/mfi/mfi.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/mfi/mfi_cam.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/mfi/mfireg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/mfi/mfivar.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/mmc/mmc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/mmc/mmcsd.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/mmc/mmcvar.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/pccbb/pccbb.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/pci/pci.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/pci/pci_private.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/pci/pcireg.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/twa/tw_osl.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/twa/tw_osl_share.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/uart/uart_bus_pci.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/dev/usb/ufoma.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/fs/nullfs/null_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/fs/umapfs/umap_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/fs/unionfs/union_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/geom/part/g_part.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/i386/machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/i386/pmap.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/i386/include/smp.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/ia64/ia64/machdep.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/ia64/ia64/pmap.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/Make.tags.inc#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/imgact_elf.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/init_main.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/kern_exec.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/kern_exit.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/kern_fork.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/kern_lock.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/kern_malloc.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/kern_mib.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/kern_mutex.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/kern_resource.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/kern_rwlock.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/kern_sx.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/kern_synch.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/kern_thread.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/subr_lock.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/subr_sleepqueue.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/subr_trap.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/subr_turnstile.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/uipc_domain.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/uipc_mbuf.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/uipc_sockbuf.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/uipc_socket.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/uipc_syscalls.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/vfs_bio.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/vfs_default.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/vfs_subr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/vfs_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/kern/vnode_if.src#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/modules/mfi/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/modules/mfi/mfip/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_futex/sys/modules/netgraph/Makefile#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/modules/netgraph/car/Makefile#1 branch .. //depot/projects/soc2007/rdivacky/linux_futex/sys/net/ethernet.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/net/ieee8023ad_lacp.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/net/ieee8023ad_lacp.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/net/if.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/net/if.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/net/if_fwsubr.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/net/if_lagg.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/net/if_lagg.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/net/if_var.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netgraph/ng_car.c#1 branch .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netgraph/ng_car.h#1 branch .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netgraph/ng_fec.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netgraph/ng_mppc.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/icmp6.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/ip_input.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctp.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctp_asconf.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctp_auth.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctp_constants.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctp_indata.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctp_input.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctp_output.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctp_pcb.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctp_sysctl.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctp_timer.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctp_uio.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctp_usrreq.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/sctputil.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/tcp.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/tcp_input.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/tcp_output.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/tcp_reass.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/tcp_subr.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/tcp_syncache.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/tcp_timer.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/tcp_timer.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/tcp_timewait.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/tcp_var.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet/udp_usrreq.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet6/icmp6.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet6/in6_proto.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet6/ip6_input.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/netinet6/sctp6_usrreq.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/nfsclient/nfs_bio.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/pc98/conf/GENERIC#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/pc98/pc98/machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/powerpc/powerpc/machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sparc64/include/smp.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sparc64/sparc64/machdep.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sparc64/sparc64/pmap.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/sun4v/machdep.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/sun4v/pmap.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/sun4v/tsb.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sun4v/sun4v/tte_hash.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sys/lockf.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sys/param.h#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sys/sysctl.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sys/sysent.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sys/vmmeter.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/sys/vnode.h#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/ufs/ffs/ffs_vnops.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/vm/swap_pager.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/vm/uma_core.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/vm/vm_contig.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/vm/vm_fault.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/vm/vm_glue.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/vm/vm_map.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/vm/vm_meter.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/vm/vm_mmap.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/vm/vm_object.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/vm/vm_page.c#3 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/vm/vm_pageout.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/vm/vm_pageq.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/vm/vm_zeroidle.c#2 integrate .. //depot/projects/soc2007/rdivacky/linux_futex/sys/vm/vnode_pager.c#2 integrate Differences ... ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/amd64/machdep.c#2 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.670 2007/03/30 00:06:20 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.671 2007/05/18 07:10:42 jeff Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -221,8 +221,8 @@ vm_ksubmap_init(&kmi); printf("avail memory = %ju (%ju MB)\n", - ptoa((uintmax_t)cnt.v_free_count), - ptoa((uintmax_t)cnt.v_free_count) / 1048576); + ptoa((uintmax_t)VMCNT_GET(free_count)), + ptoa((uintmax_t)VMCNT_GET(free_count)) / 1048576); /* * Set up buffers, so they can be used to read disk labels. ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/amd64/mp_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.284 2007/05/08 22:01:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.285 2007/05/19 05:03:59 kan Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -80,6 +80,8 @@ int boot_cpu_id = -1; /* designated BSP */ extern int nkpt; +extern struct pcpu __pcpu[]; + /* * CPU topology map datastructures for HTT. */ ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/amd64/pmap.c#2 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.584 2007/04/25 18:10:43 ups Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.585 2007/05/18 07:10:43 jeff Exp $"); /* * Manages physical address maps. @@ -620,7 +620,7 @@ * numbers of pv entries. */ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); - pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; + pv_entry_max = shpgperproc * maxproc + VMCNT_GET(page_count); TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); pv_entry_high_water = 9 * (pv_entry_max / 10); } @@ -633,7 +633,7 @@ error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req); if (error == 0 && req->newptr) { - shpgperproc = (pv_entry_max - cnt.v_page_count) / maxproc; + shpgperproc = (pv_entry_max - VMCNT_GET(page_count)) / maxproc; pv_entry_high_water = 9 * (pv_entry_max / 10); } return (error); @@ -648,7 +648,7 @@ error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req); if (error == 0 && req->newptr) { - pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; + pv_entry_max = shpgperproc * maxproc + VMCNT_GET(page_count); pv_entry_high_water = 9 * (pv_entry_max / 10); } return (error); @@ -1149,8 +1149,7 @@ */ m->right = *free; *free = m; - - atomic_subtract_int(&cnt.v_wire_count, 1); + VMCNT_DEC(wire_count, 1); return 1; } @@ -1460,7 +1459,7 @@ pmap->pm_pml4[PML4PML4I] = 0; /* Recursive Mapping */ m->wire_count--; - atomic_subtract_int(&cnt.v_wire_count, 1); + VMCNT_DEC(wire_count, 1); vm_page_free_zero(m); PMAP_LOCK_DESTROY(pmap); } ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/include/md_var.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.80 2007/01/18 05:46:32 rodrigc Exp $ + * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.81 2007/05/19 05:03:59 kan Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -57,8 +57,6 @@ extern uint64_t *vm_page_dump; extern int vm_page_dump_size; -extern struct pcpu __pcpu[]; - typedef void alias_for_inthand_t(u_int cs, u_int ef, u_int esp, u_int ss); struct thread; struct reg; ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/include/smp.h#2 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/amd64/include/smp.h,v 1.89 2007/03/06 17:16:46 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/smp.h,v 1.90 2007/05/19 05:01:43 kan Exp $ * */ @@ -23,6 +23,7 @@ #include #include #include +#include /* global symbols in mpboot.S */ extern char mptramp_start[]; ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/amd64/linux32/linux32_sysvec.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.28 2007/04/02 18:38:12 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.29 2007/05/14 22:40:04 jhb Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -121,7 +121,7 @@ static void linux_sendsig(sig_t catcher, ksiginfo_t *ksi, sigset_t *mask); static void exec_linux_setregs(struct thread *td, u_long entry, u_long stack, u_long ps_strings); -static void linux32_fixlimits(struct proc *p); +static void linux32_fixlimit(struct rlimit *rl, int which); extern LIST_HEAD(futex_list, futex) futex_list; extern struct sx futex_sx; @@ -966,42 +966,36 @@ SYSCTL_ULONG(_compat_linux32, OID_AUTO, maxvmem, CTLFLAG_RW, &linux32_maxvmem, 0, ""); -/* - * XXX copied from ia32_sysvec.c. - */ static void -linux32_fixlimits(struct proc *p) +linux32_fixlimit(struct rlimit *rl, int which) { - struct plimit *oldlim, *newlim; - if (linux32_maxdsiz == 0 && linux32_maxssiz == 0 && - linux32_maxvmem == 0) - return; - newlim = lim_alloc(); - PROC_LOCK(p); - oldlim = p->p_limit; - lim_copy(newlim, oldlim); - if (linux32_maxdsiz != 0) { - if (newlim->pl_rlimit[RLIMIT_DATA].rlim_cur > linux32_maxdsiz) - newlim->pl_rlimit[RLIMIT_DATA].rlim_cur = linux32_maxdsiz; - if (newlim->pl_rlimit[RLIMIT_DATA].rlim_max > linux32_maxdsiz) - newlim->pl_rlimit[RLIMIT_DATA].rlim_max = linux32_maxdsiz; - } - if (linux32_maxssiz != 0) { - if (newlim->pl_rlimit[RLIMIT_STACK].rlim_cur > linux32_maxssiz) - newlim->pl_rlimit[RLIMIT_STACK].rlim_cur = linux32_maxssiz; - if (newlim->pl_rlimit[RLIMIT_STACK].rlim_max > linux32_maxssiz) - newlim->pl_rlimit[RLIMIT_STACK].rlim_max = linux32_maxssiz; - } - if (linux32_maxvmem != 0) { - if (newlim->pl_rlimit[RLIMIT_VMEM].rlim_cur > linux32_maxvmem) - newlim->pl_rlimit[RLIMIT_VMEM].rlim_cur = linux32_maxvmem; - if (newlim->pl_rlimit[RLIMIT_VMEM].rlim_max > linux32_maxvmem) - newlim->pl_rlimit[RLIMIT_VMEM].rlim_max = linux32_maxvmem; + switch (which) { + case RLIMIT_DATA: + if (linux32_maxdsiz != 0) { + if (rl->rlim_cur > linux32_maxdsiz) + rl->rlim_cur = linux32_maxdsiz; + if (rl->rlim_max > linux32_maxdsiz) + rl->rlim_max = linux32_maxdsiz; + } + break; + case RLIMIT_STACK: + if (linux32_maxssiz != 0) { + if (rl->rlim_cur > linux32_maxssiz) + rl->rlim_cur = linux32_maxssiz; + if (rl->rlim_max > linux32_maxssiz) + rl->rlim_max = linux32_maxssiz; + } + break; + case RLIMIT_VMEM: + if (linux32_maxvmem != 0) { + if (rl->rlim_cur > linux32_maxvmem) + rl->rlim_cur = linux32_maxvmem; + if (rl->rlim_max > linux32_maxvmem) + rl->rlim_max = linux32_maxvmem; + } + break; } - p->p_limit = newlim; - PROC_UNLOCK(p); - lim_free(oldlim); } struct sysentvec elf_linux_sysvec = { @@ -1030,7 +1024,7 @@ VM_PROT_ALL, linux_copyout_strings, exec_linux_setregs, - linux32_fixlimits + linux32_fixlimit }; static Elf32_Brandinfo linux_brand = { ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/arm/machdep.c#2 (text+ko) ==== @@ -44,7 +44,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.25 2007/02/14 04:41:28 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.26 2007/05/18 07:10:43 jeff Exp $"); #include #include @@ -286,8 +286,8 @@ vm_ksubmap_init(&kmi); printf("avail memory = %ju (%ju MB)\n", - (uintmax_t)ptoa(cnt.v_free_count), - (uintmax_t)ptoa(cnt.v_free_count) / 1048576); + (uintmax_t)ptoa(VMCNT_GET(free_count)), + (uintmax_t)ptoa(VMCNT_GET(free_count)) / 1048576); bufinit(); vm_pager_bufferinit(); ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/arm/arm/pmap.c#2 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.78 2007/02/05 10:33:39 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.79 2007/05/18 07:10:43 jeff Exp $"); #include #include #include @@ -1970,7 +1970,7 @@ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); - pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; + pv_entry_max = shpgperproc * maxproc + VMCNT_GET(page_count); pv_entry_high_water = 9 * (pv_entry_max / 10); l2zone = uma_zcreate("L2 Table", L2_TABLE_SIZE_REAL, pmap_l2ptp_ctor, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE); ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/boot/i386/boot2/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.59 2005/07/15 12:22:14 ache Exp $ +# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.60 2007/05/19 05:07:47 kan Exp $ FILES= boot boot1 boot2 @@ -36,7 +36,8 @@ -I${.CURDIR}/../btx/lib -I. \ -Wall -Waggregate-return -Wbad-function-cast -Wcast-align \ -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ - -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings + -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ + -Winline --param max-inline-insns-single=100 LDFLAGS=-static -N --gc-sections ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/cam/cam_periph.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.68 2007/04/19 23:34:51 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.69 2007/05/14 21:48:52 scottl Exp $"); #include #include @@ -102,7 +102,8 @@ int ndrivers; ndrivers = nperiph_drivers + 2; - newdrivers = malloc(sizeof(*newdrivers) * ndrivers, M_TEMP, M_WAITOK); + newdrivers = malloc(sizeof(*newdrivers) * ndrivers, M_CAMPERIPH, + M_WAITOK); if (periph_drivers) bcopy(periph_drivers, newdrivers, sizeof(*newdrivers) * nperiph_drivers); @@ -111,7 +112,7 @@ old = periph_drivers; periph_drivers = newdrivers; if (old) - free(old, M_TEMP); + free(old, M_CAMPERIPH); nperiph_drivers++; } ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/cam/cam_xpt.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.183 2007/04/27 14:23:05 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.187 2007/05/16 16:57:21 scottl Exp $"); #include #include @@ -1197,6 +1197,7 @@ error = ENOTSUP; break; } + xpt_release_bus(bus); break; } /* @@ -1533,7 +1534,7 @@ */ xsoftc.xpt_config_hook = (struct intr_config_hook *)malloc(sizeof(struct intr_config_hook), - M_TEMP, M_NOWAIT | M_ZERO); + M_CAMXPT, M_NOWAIT | M_ZERO); if (xsoftc.xpt_config_hook == NULL) { printf("xpt_init: Cannot malloc config hook " "- failing attach\n"); @@ -1542,7 +1543,7 @@ xsoftc.xpt_config_hook->ich_func = xpt_config; if (config_intrhook_establish(xsoftc.xpt_config_hook) != 0) { - free (xsoftc.xpt_config_hook, M_TEMP); + free (xsoftc.xpt_config_hook, M_CAMXPT); printf("xpt_init: config_intrhook_establish failed " "- failing attach\n"); } @@ -4139,7 +4140,6 @@ void xpt_print_path(struct cam_path *path) { - mtx_assert(path->bus->sim->mtx, MA_OWNED); if (path == NULL) printf("(nopath): "); @@ -5243,7 +5243,7 @@ /* Save some state for use while we probe for devices */ scan_info = (xpt_scan_bus_info *) - malloc(sizeof(xpt_scan_bus_info), M_TEMP, M_NOWAIT); + malloc(sizeof(xpt_scan_bus_info), M_CAMXPT, M_NOWAIT); scan_info->request_ccb = request_ccb; scan_info->cpi = &work_ccb->cpi; @@ -5277,7 +5277,7 @@ printf("xpt_scan_bus: xpt_create_path failed" " with status %#x, bus scan halted\n", status); - free(scan_info, M_TEMP); + free(scan_info, M_CAMXPT); request_ccb->ccb_h.status = status; xpt_free_ccb(work_ccb); xpt_done(request_ccb); @@ -5285,7 +5285,7 @@ } work_ccb = xpt_alloc_ccb_nowait(); if (work_ccb == NULL) { - free(scan_info, M_TEMP); + free(scan_info, M_CAMXPT); xpt_free_path(path); request_ccb->ccb_h.status = CAM_RESRC_UNAVAIL; xpt_done(request_ccb); @@ -5398,7 +5398,7 @@ xpt_free_ccb(request_ccb); xpt_free_ccb((union ccb *)scan_info->cpi); request_ccb = scan_info->request_ccb; - free(scan_info, M_TEMP); + free(scan_info, M_CAMXPT); request_ccb->ccb_h.status = CAM_REQ_CMP; xpt_done(request_ccb); break; @@ -5417,7 +5417,7 @@ xpt_free_ccb(request_ccb); xpt_free_ccb((union ccb *)scan_info->cpi); request_ccb = scan_info->request_ccb; - free(scan_info, M_TEMP); + free(scan_info, M_CAMXPT); request_ccb->ccb_h.status = status; xpt_done(request_ccb); break; @@ -5518,17 +5518,17 @@ } if (request_ccb == NULL) { - request_ccb = malloc(sizeof(union ccb), M_TEMP, M_NOWAIT); + request_ccb = malloc(sizeof(union ccb), M_CAMXPT, M_NOWAIT); if (request_ccb == NULL) { xpt_print(path, "xpt_scan_lun: can't allocate CCB, " "can't continue\n"); return; } - new_path = malloc(sizeof(*new_path), M_TEMP, M_NOWAIT); + new_path = malloc(sizeof(*new_path), M_CAMXPT, M_NOWAIT); if (new_path == NULL) { xpt_print(path, "xpt_scan_lun: can't allocate path, " "can't continue\n"); - free(request_ccb, M_TEMP); + free(request_ccb, M_CAMXPT); return; } status = xpt_compile_path(new_path, xpt_periph, @@ -5539,8 +5539,8 @@ if (status != CAM_REQ_CMP) { xpt_print(path, "xpt_scan_lun: can't compile path, " "can't continue\n"); - free(request_ccb, M_TEMP); - free(new_path, M_TEMP); + free(request_ccb, M_CAMXPT); + free(new_path, M_CAMXPT); return; } xpt_setup_ccb(&request_ccb->ccb_h, new_path, /*priority*/ 1); @@ -5575,8 +5575,8 @@ xptscandone(struct cam_periph *periph, union ccb *done_ccb) { xpt_release_path(done_ccb->ccb_h.path); - free(done_ccb->ccb_h.path, M_TEMP); - free(done_ccb, M_TEMP); + free(done_ccb->ccb_h.path, M_CAMXPT); + free(done_ccb, M_CAMXPT); } static cam_status @@ -5598,7 +5598,7 @@ return(CAM_REQ_CMP_ERR); } - softc = (probe_softc *)malloc(sizeof(*softc), M_TEMP, M_NOWAIT); + softc = (probe_softc *)malloc(sizeof(*softc), M_CAMXPT, M_NOWAIT); if (softc == NULL) { printf("proberegister: Unable to probe new device. " @@ -5751,7 +5751,7 @@ if (softc->action == PROBE_INQUIRY_BASIC_DV1 || softc->action == PROBE_INQUIRY_BASIC_DV2) { - inq_buf = malloc(inquiry_len, M_TEMP, M_NOWAIT); + inq_buf = malloc(inquiry_len, M_CAMXPT, M_NOWAIT); } if (inq_buf == NULL) { xpt_print(periph->path, "malloc failure- skipping Basic" @@ -5785,7 +5785,7 @@ mode_buf_len = sizeof(struct scsi_mode_header_6) + sizeof(struct scsi_mode_blk_desc) + sizeof(struct scsi_control_page); - mode_buf = malloc(mode_buf_len, M_TEMP, M_NOWAIT); + mode_buf = malloc(mode_buf_len, M_CAMXPT, M_NOWAIT); if (mode_buf != NULL) { scsi_mode_sense(csio, /*retries*/4, @@ -5817,7 +5817,7 @@ if ((device->quirk->quirks & CAM_QUIRK_NOSERIAL) == 0) serial_buf = (struct scsi_vpd_unit_serial_number *) - malloc(sizeof(*serial_buf), M_TEMP, + malloc(sizeof(*serial_buf), M_CAMXPT, M_NOWAIT | M_ZERO); if (serial_buf != NULL) { @@ -6107,7 +6107,7 @@ /*count*/1, /*run_queue*/TRUE); } xpt_release_ccb(done_ccb); - free(mode_hdr, M_TEMP); + free(mode_hdr, M_CAMXPT); softc->action = PROBE_SERIAL_NUM; xpt_schedule(periph, priority); return; @@ -6194,7 +6194,7 @@ xpt_async(AC_LOST_DEVICE, path, NULL); } if (serial_buf != NULL) - free(serial_buf, M_TEMP); + free(serial_buf, M_CAMXPT); if (changed != 0) { /* @@ -6283,12 +6283,12 @@ /* give up */ softc->action = PROBE_DV_EXIT; } - free(nbuf, M_TEMP); + free(nbuf, M_CAMXPT); xpt_release_ccb(done_ccb); xpt_schedule(periph, priority); return; } - free(nbuf, M_TEMP); + free(nbuf, M_CAMXPT); if (softc->action == PROBE_INQUIRY_BASIC_DV1) { softc->action = PROBE_INQUIRY_BASIC_DV2; xpt_release_ccb(done_ccb); @@ -6327,7 +6327,7 @@ static void probecleanup(struct cam_periph *periph) { - free(periph->softc, M_TEMP); + free(periph->softc, M_CAMXPT); } static void @@ -6984,7 +6984,7 @@ /* Release our hook so that the boot can continue. */ config_intrhook_disestablish(xsoftc.xpt_config_hook); - free(xsoftc.xpt_config_hook, M_TEMP); + free(xsoftc.xpt_config_hook, M_CAMXPT); xsoftc.xpt_config_hook = NULL; } @@ -7029,6 +7029,39 @@ xpt_free_ccb(done_ccb); } +cam_status +xpt_register_async(int event, ac_callback_t *cbfunc, void *cbarg, + struct cam_path *path) +{ + struct ccb_setasync csa; + cam_status status; + int xptpath = 0; + + if (path == NULL) { + mtx_lock(&xsoftc.xpt_lock); + status = xpt_create_path(&path, /*periph*/NULL, CAM_XPT_PATH_ID, + CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD); + if (status != CAM_REQ_CMP) { + mtx_unlock(&xsoftc.xpt_lock); + return (status); + } + xptpath = 1; + } + + xpt_setup_ccb(&csa.ccb_h, path, /*priority*/5); + csa.ccb_h.func_code = XPT_SASYNC_CB; + csa.event_enable = event; + csa.callback = cbfunc; + csa.callback_arg = cbarg; + xpt_action((union ccb *)&csa); + status = csa.ccb_h.status; + if (xptpath) { + xpt_free_path(path); + mtx_unlock(&xsoftc.xpt_lock); + } + return (status); +} + static void xptaction(struct cam_sim *sim, union ccb *work_ccb) { ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/cam/cam_xpt.h#2 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/cam_xpt.h,v 1.8 2007/04/15 08:49:09 scottl Exp $ + * $FreeBSD: src/sys/cam/cam_xpt.h,v 1.9 2007/05/16 16:54:23 scottl Exp $ */ #ifndef _CAM_CAM_XPT_H @@ -79,6 +79,8 @@ void xpt_rescan(union ccb *ccb); void xpt_lock_buses(void); void xpt_unlock_buses(void); +cam_status xpt_register_async(int event, ac_callback_t *cbfunc, + void *cbarg, struct cam_path *path); #endif /* _KERNEL */ #endif /* _CAM_CAM_XPT_H */ ==== //depot/projects/soc2007/rdivacky/linux_futex/sys/cam/scsi/scsi_cd.c#2 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.99 2007/04/16 19:41:14 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.101 2007/05/16 16:54:23 scottl Exp $"); #include "opt_cd.h" @@ -329,11 +329,12 @@ static STAILQ_HEAD(changerlist, cdchanger) changerq; static int num_changers; +MALLOC_DEFINE(M_SCSICD, "scsi_cd", "scsi_cd buffers"); + static void cdinit(void) { cam_status status; - struct cam_path *path; mtx_init(&changerq_mtx, "cdchangerq", "SCSI CD Changer List", MTX_DEF); STAILQ_INIT(&changerq); @@ -342,22 +343,8 @@ * Install a global async callback. This callback will * receive async callbacks like "new device found". */ - status = xpt_create_path(&path, /*periph*/NULL, CAM_XPT_PATH_ID, - CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD); - - if (status == CAM_REQ_CMP) { - struct ccb_setasync csa; + status = xpt_register_async(AC_FOUND_DEVICE, cdasync, NULL, NULL); - xpt_setup_ccb(&csa.ccb_h, path, /*priority*/5); - csa.ccb_h.func_code = XPT_SASYNC_CB; - csa.event_enable = AC_FOUND_DEVICE; - csa.callback = cdasync; - csa.callback_arg = NULL; - xpt_action((union ccb *)&csa); - status = csa.ccb_h.status; - xpt_free_path(path); - } - if (status != CAM_REQ_CMP) { printf("cd: Failed to attach master async callback " "due to status 0x%x!\n", status); @@ -368,20 +355,13 @@ cdoninvalidate(struct cam_periph *periph) { struct cd_softc *softc; - struct ccb_setasync csa; softc = (struct cd_softc *)periph->softc; /* * De-register any async callbacks. */ - xpt_setup_ccb(&csa.ccb_h, periph->path, - /* priority */ 5); - csa.ccb_h.func_code = XPT_SASYNC_CB; - csa.event_enable = 0; - csa.callback = cdasync; - csa.callback_arg = periph; - xpt_action((union ccb *)&csa); + xpt_register_async(0, cdasync, periph, periph->path); softc->flags |= CD_FLAG_INVALID; @@ -637,7 +617,6 @@ cdregister(struct cam_periph *periph, void *arg) { struct cd_softc *softc; - struct ccb_setasync csa; struct ccb_pathinq cpi; struct ccb_getdev *cgd; char tmpstr[80]; @@ -749,13 +728,8 @@ * Add an async callback so that we get * notified if this device goes away. */ - xpt_setup_ccb(&csa.ccb_h, periph->path, - /* priority */ 5); - csa.ccb_h.func_code = XPT_SASYNC_CB; - csa.event_enable = AC_SENT_BDR | AC_BUS_RESET | AC_LOST_DEVICE; - csa.callback = cdasync; - csa.callback_arg = periph; - xpt_action((union ccb *)&csa); + xpt_register_async(AC_SENT_BDR | AC_BUS_RESET | AC_LOST_DEVICE, + cdasync, periph, periph->path); /* * If the target lun is greater than 0, we most likely have a CD @@ -1519,7 +1493,7 @@ { rcap = (struct scsi_read_capacity_data *)malloc(sizeof(*rcap), - M_TEMP, + M_SCSICD, M_NOWAIT); if (rcap == NULL) { xpt_print(periph->path, @@ -1778,7 +1752,7 @@ } } } - free(rdcap, M_TEMP); + free(rdcap, M_SCSICD); if (announce_buf[0] != '\0') { xpt_announce_periph(periph, announce_buf); if (softc->flags & CD_FLAG_CHANGER) @@ -1906,7 +1880,7 @@ union cd_pages *page; params.alloc_len = sizeof(union cd_mode_data_6_10); - params.mode_buf = malloc(params.alloc_len, M_TEMP, + params.mode_buf = malloc(params.alloc_len, M_SCSICD, M_WAITOK | M_ZERO); cam_periph_lock(periph); @@ -1915,7 +1889,7 @@ error = cdgetmode(periph, ¶ms, AUDIO_PAGE); if (error) { - free(params.mode_buf, M_TEMP); + free(params.mode_buf, M_SCSICD); cam_periph_unlock(periph); break; } @@ -1924,7 +1898,7 @@ page->audio.flags &= ~CD_PA_SOTC; page->audio.flags |= CD_PA_IMMED; error = cdsetmode(periph, ¶ms); - free(params.mode_buf, M_TEMP); + free(params.mode_buf, M_SCSICD); if (error) { cam_periph_unlock(periph); break; @@ -2001,7 +1975,7 @@ union cd_pages *page; params.alloc_len = sizeof(union cd_mode_data_6_10); - params.mode_buf = malloc(params.alloc_len, M_TEMP, + params.mode_buf = malloc(params.alloc_len, M_SCSICD, M_WAITOK | M_ZERO); cam_periph_lock(periph); @@ -2010,7 +1984,7 @@ error = cdgetmode(periph, ¶ms, AUDIO_PAGE); if (error) { - free(params.mode_buf, M_TEMP); + free(params.mode_buf, M_SCSICD); cam_periph_unlock(periph); break; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat May 19 15:32:13 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 017E816A46B; Sat, 19 May 2007 15:32:13 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AC4EA16A41F for ; Sat, 19 May 2007 15:32:12 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 9C0EE13C455 for ; Sat, 19 May 2007 15:32:12 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4JFWCUV011044 for ; Sat, 19 May 2007 15:32:12 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4JFW9LB010994 for perforce@freebsd.org; Sat, 19 May 2007 15:32:09 GMT (envelope-from jhb@freebsd.org) Date: Sat, 19 May 2007 15:32:09 GMT Message-Id: <200705191532.l4JFW9LB010994@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 120058 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: Sat, 19 May 2007 15:32:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=120058 Change 120058 by jhb@jhb_mutex on 2007/05/19 15:31:43 IFC @120057 Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/machdep.c#66 integrate .. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#43 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#75 integrate .. //depot/projects/smpng/sys/amd64/include/md_var.h#15 integrate .. //depot/projects/smpng/sys/amd64/include/smp.h#15 integrate .. //depot/projects/smpng/sys/arm/arm/busdma_machdep.c#21 integrate .. //depot/projects/smpng/sys/arm/arm/machdep.c#21 integrate .. //depot/projects/smpng/sys/arm/arm/pmap.c#39 integrate .. //depot/projects/smpng/sys/arm/include/pmap.h#22 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/Makefile#19 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#78 integrate .. //depot/projects/smpng/sys/coda/coda_vnops.c#29 integrate .. //depot/projects/smpng/sys/coda/coda_vnops.h#12 integrate .. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#60 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#82 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#60 integrate .. //depot/projects/smpng/sys/conf/kern.mk#19 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#56 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#65 integrate .. //depot/projects/smpng/sys/dev/sound/isa/mss.c#32 integrate .. //depot/projects/smpng/sys/dev/sound/pci/envy24.c#11 integrate .. //depot/projects/smpng/sys/dev/sound/pci/envy24ht.c#8 integrate .. //depot/projects/smpng/sys/dev/sound/pci/fm801.c#21 integrate .. //depot/projects/smpng/sys/dev/twa/tw_osl.h#4 integrate .. //depot/projects/smpng/sys/dev/twa/tw_osl_share.h#7 integrate .. //depot/projects/smpng/sys/dev/usb/ufoma.c#3 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vnops.c#30 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_io.c#25 integrate .. //depot/projects/smpng/sys/fs/umapfs/umap_vnops.c#14 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vnops.c#35 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#127 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#119 integrate .. //depot/projects/smpng/sys/i386/include/smp.h#23 integrate .. //depot/projects/smpng/sys/ia64/ia64/exception.S#11 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#110 integrate .. //depot/projects/smpng/sys/ia64/ia64/mca.c#10 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#84 integrate .. //depot/projects/smpng/sys/kern/init_main.c#68 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#109 integrate .. //depot/projects/smpng/sys/kern/kern_lock.c#63 integrate .. //depot/projects/smpng/sys/kern/kern_malloc.c#48 integrate .. //depot/projects/smpng/sys/kern/kern_mib.c#32 integrate .. //depot/projects/smpng/sys/kern/kern_mutex.c#148 integrate .. //depot/projects/smpng/sys/kern/kern_rwlock.c#17 integrate .. //depot/projects/smpng/sys/kern/kern_sx.c#48 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#117 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#101 integrate .. //depot/projects/smpng/sys/kern/subr_lock.c#8 integrate .. //depot/projects/smpng/sys/kern/subr_sleepqueue.c#31 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#84 integrate .. //depot/projects/smpng/sys/kern/subr_turnstile.c#38 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#104 integrate .. //depot/projects/smpng/sys/kern/vfs_default.c#50 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#142 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#79 integrate .. //depot/projects/smpng/sys/kern/vnode_if.src#31 integrate .. //depot/projects/smpng/sys/net/ieee8023ad_lacp.c#8 integrate .. //depot/projects/smpng/sys/net/ieee8023ad_lacp.h#5 integrate .. //depot/projects/smpng/sys/net/if_fwsubr.c#15 integrate .. //depot/projects/smpng/sys/net/if_lagg.c#7 integrate .. //depot/projects/smpng/sys/netgraph/ng_fec.c#20 integrate .. //depot/projects/smpng/sys/netgraph/ng_mppc.c#15 integrate .. //depot/projects/smpng/sys/netinet/icmp6.h#12 integrate .. //depot/projects/smpng/sys/netinet/tcp.h#18 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#108 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#51 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#96 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#60 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#54 integrate .. //depot/projects/smpng/sys/netinet6/icmp6.c#39 integrate .. //depot/projects/smpng/sys/netinet6/in6_proto.c#20 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#49 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#51 integrate .. //depot/projects/smpng/sys/pc98/pc98/machdep.c#23 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#74 integrate .. //depot/projects/smpng/sys/sparc64/include/smp.h#17 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#86 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#70 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/machdep.c#5 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/pmap.c#11 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/tsb.c#4 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/tte_hash.c#7 integrate .. //depot/projects/smpng/sys/sys/lockf.h#7 integrate .. //depot/projects/smpng/sys/sys/param.h#118 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#44 integrate .. //depot/projects/smpng/sys/sys/vmmeter.h#7 integrate .. //depot/projects/smpng/sys/sys/vnode.h#80 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#53 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#71 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#71 integrate .. //depot/projects/smpng/sys/vm/vm_contig.c#43 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#67 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#61 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#86 integrate .. //depot/projects/smpng/sys/vm/vm_meter.c#32 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#62 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#94 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#92 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#62 integrate .. //depot/projects/smpng/sys/vm/vm_pageq.c#23 integrate .. //depot/projects/smpng/sys/vm/vm_zeroidle.c#35 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#62 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#66 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.670 2007/03/30 00:06:20 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.671 2007/05/18 07:10:42 jeff Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -221,8 +221,8 @@ vm_ksubmap_init(&kmi); printf("avail memory = %ju (%ju MB)\n", - ptoa((uintmax_t)cnt.v_free_count), - ptoa((uintmax_t)cnt.v_free_count) / 1048576); + ptoa((uintmax_t)VMCNT_GET(free_count)), + ptoa((uintmax_t)VMCNT_GET(free_count)) / 1048576); /* * Set up buffers, so they can be used to read disk labels. ==== //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#43 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.284 2007/05/08 22:01:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.285 2007/05/19 05:03:59 kan Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -80,6 +80,8 @@ int boot_cpu_id = -1; /* designated BSP */ extern int nkpt; +extern struct pcpu __pcpu[]; + /* * CPU topology map datastructures for HTT. */ ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#75 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.584 2007/04/25 18:10:43 ups Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.585 2007/05/18 07:10:43 jeff Exp $"); /* * Manages physical address maps. @@ -620,7 +620,7 @@ * numbers of pv entries. */ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); - pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; + pv_entry_max = shpgperproc * maxproc + VMCNT_GET(page_count); TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); pv_entry_high_water = 9 * (pv_entry_max / 10); } @@ -633,7 +633,7 @@ error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req); if (error == 0 && req->newptr) { - shpgperproc = (pv_entry_max - cnt.v_page_count) / maxproc; + shpgperproc = (pv_entry_max - VMCNT_GET(page_count)) / maxproc; pv_entry_high_water = 9 * (pv_entry_max / 10); } return (error); @@ -648,7 +648,7 @@ error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req); if (error == 0 && req->newptr) { - pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; + pv_entry_max = shpgperproc * maxproc + VMCNT_GET(page_count); pv_entry_high_water = 9 * (pv_entry_max / 10); } return (error); @@ -1149,8 +1149,7 @@ */ m->right = *free; *free = m; - - atomic_subtract_int(&cnt.v_wire_count, 1); + VMCNT_DEC(wire_count, 1); return 1; } @@ -1460,7 +1459,7 @@ pmap->pm_pml4[PML4PML4I] = 0; /* Recursive Mapping */ m->wire_count--; - atomic_subtract_int(&cnt.v_wire_count, 1); + VMCNT_DEC(wire_count, 1); vm_page_free_zero(m); PMAP_LOCK_DESTROY(pmap); } ==== //depot/projects/smpng/sys/amd64/include/md_var.h#15 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.80 2007/01/18 05:46:32 rodrigc Exp $ + * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.81 2007/05/19 05:03:59 kan Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -57,8 +57,6 @@ extern uint64_t *vm_page_dump; extern int vm_page_dump_size; -extern struct pcpu __pcpu[]; - typedef void alias_for_inthand_t(u_int cs, u_int ef, u_int esp, u_int ss); struct thread; struct reg; ==== //depot/projects/smpng/sys/amd64/include/smp.h#15 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/amd64/include/smp.h,v 1.89 2007/03/06 17:16:46 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/smp.h,v 1.90 2007/05/19 05:01:43 kan Exp $ * */ @@ -23,6 +23,7 @@ #include #include #include +#include /* global symbols in mpboot.S */ extern char mptramp_start[]; ==== //depot/projects/smpng/sys/arm/arm/busdma_machdep.c#21 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.29 2007/02/13 07:19:26 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.30 2007/05/19 13:17:31 cognet Exp $"); /* * ARM bus dma support routines @@ -1003,7 +1003,7 @@ bus_dmamap_callback2_t *callback, void *callback_arg, int flags) { - vm_offset_t lastaddr; + vm_offset_t lastaddr = 0; #ifdef __CC_SUPPORTS_DYNAMIC_ARRAY_INIT bus_dma_segment_t dm_segments[dmat->nsegments]; #else @@ -1079,7 +1079,7 @@ return; } -static __inline void +static void bus_dmamap_sync_buf(void *buf, int len, bus_dmasync_op_t op) { char _tmp_cl[arm_dcache_align], _tmp_clend[arm_dcache_align]; ==== //depot/projects/smpng/sys/arm/arm/machdep.c#21 (text+ko) ==== @@ -44,7 +44,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.25 2007/02/14 04:41:28 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.27 2007/05/19 13:32:58 cognet Exp $"); #include #include @@ -286,8 +286,8 @@ vm_ksubmap_init(&kmi); printf("avail memory = %ju (%ju MB)\n", - (uintmax_t)ptoa(cnt.v_free_count), - (uintmax_t)ptoa(cnt.v_free_count) / 1048576); + (uintmax_t)ptoa(VMCNT_GET(free_count)), + (uintmax_t)ptoa(VMCNT_GET(free_count)) / 1048576); bufinit(); vm_pager_bufferinit(); @@ -547,7 +547,7 @@ set_mcontext(struct thread *td, const mcontext_t *mcp) { struct trapframe *tf = td->td_frame; - __greg_t *gr = mcp->__gregs; + const __greg_t *gr = mcp->__gregs; tf->tf_r0 = gr[_REG_R0]; tf->tf_r1 = gr[_REG_R1]; ==== //depot/projects/smpng/sys/arm/arm/pmap.c#39 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.78 2007/02/05 10:33:39 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.81 2007/05/19 13:21:41 cognet Exp $"); #include #include #include @@ -431,10 +431,10 @@ l1->l1_kva = l1pt; l1->l1_domain_use_count = 0; - l1->l1_domain_first = 0; + l1->l1_domain_first = 1; for (i = 0; i < PMAP_DOMAINS; i++) - l1->l1_domain_free[i] = i + 1; + l1->l1_domain_free[i] = i + 2; /* * Copy the kernel's L1 entries to each new L1. @@ -1970,7 +1970,7 @@ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); - pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; + pv_entry_max = shpgperproc * maxproc + VMCNT_GET(page_count); pv_entry_high_water = 9 * (pv_entry_max / 10); l2zone = uma_zcreate("L2 Table", L2_TABLE_SIZE_REAL, pmap_l2ptp_ctor, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE); @@ -2910,7 +2910,7 @@ /* * remove a page rom the kernel pagetables */ -PMAP_INLINE void +void pmap_kremove(vm_offset_t va) { struct l2_bucket *l2b; ==== //depot/projects/smpng/sys/arm/include/pmap.h#22 (text+ko) ==== @@ -44,7 +44,7 @@ * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: FreeBSD: src/sys/i386/include/pmap.h,v 1.70 2000/11/30 * - * $FreeBSD: src/sys/arm/include/pmap.h,v 1.24 2007/01/17 00:53:05 cognet Exp $ + * $FreeBSD: src/sys/arm/include/pmap.h,v 1.25 2007/05/19 12:47:34 cognet Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -237,8 +237,8 @@ /* * Definitions for MMU domains */ -#define PMAP_DOMAINS 15 /* 15 'user' domains (0-14) */ -#define PMAP_DOMAIN_KERNEL 15 /* The kernel uses domain #15 */ +#define PMAP_DOMAINS 15 /* 15 'user' domains (1-15) */ +#define PMAP_DOMAIN_KERNEL 0 /* The kernel uses domain #0 */ /* * The new pmap ensures that page-tables are always mapping Write-Thru. ==== //depot/projects/smpng/sys/boot/i386/boot2/Makefile#19 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.59 2005/07/15 12:22:14 ache Exp $ +# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.60 2007/05/19 05:07:47 kan Exp $ FILES= boot boot1 boot2 @@ -36,7 +36,8 @@ -I${.CURDIR}/../btx/lib -I. \ -Wall -Waggregate-return -Wbad-function-cast -Wcast-align \ -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ - -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings + -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ + -Winline --param max-inline-insns-single=100 LDFLAGS=-static -N --gc-sections ==== //depot/projects/smpng/sys/cam/scsi/scsi_da.c#78 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.210 2007/05/16 16:54:23 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.211 2007/05/18 21:58:07 mjacob Exp $"); #include @@ -1303,9 +1303,8 @@ struct ccb_scsiio *csio; struct scsi_read_capacity_data *rcap; - rcap = (struct scsi_read_capacity_data *)malloc(sizeof(*rcap), - M_SCSIDA, - M_NOWAIT); + rcap = (struct scsi_read_capacity_data *) + malloc(sizeof(*rcap), M_SCSIDA, M_NOWAIT|M_ZERO); if (rcap == NULL) { printf("dastart: Couldn't malloc read_capacity data\n"); /* da_free_periph??? */ @@ -1330,7 +1329,7 @@ struct scsi_read_capacity_data_long *rcaplong; rcaplong = (struct scsi_read_capacity_data_long *) - malloc(sizeof(*rcaplong), M_SCSIDA, M_NOWAIT); + malloc(sizeof(*rcaplong), M_SCSIDA, M_NOWAIT|M_ZERO); if (rcaplong == NULL) { printf("dastart: Couldn't malloc read_capacity data\n"); /* da_free_periph??? */ ==== //depot/projects/smpng/sys/coda/coda_vnops.c#29 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/coda/coda_vnops.c,v 1.70 2007/03/13 01:50:21 tegge Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_vnops.c,v 1.71 2007/05/18 13:02:12 kib Exp $"); #include #include @@ -129,7 +129,7 @@ .vop_readlink = coda_readlink, /* readlink */ .vop_inactive = coda_inactive, /* inactive */ .vop_reclaim = coda_reclaim, /* reclaim */ - ._vop_lock = coda_lock, /* lock */ + .vop_lock1 = coda_lock, /* lock */ .vop_unlock = coda_unlock, /* unlock */ .vop_bmap = coda_bmap, /* bmap */ .vop_print = VOP_PANIC, /* print */ @@ -1627,7 +1627,7 @@ } int -coda_lock(struct _vop_lock_args *ap) +coda_lock(struct vop_lock1_args *ap) { /* true args */ struct vnode *vp = ap->a_vp; ==== //depot/projects/smpng/sys/coda/coda_vnops.h#12 (text+ko) ==== @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_vnops.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD: src/sys/coda/coda_vnops.h,v 1.17 2006/11/13 05:51:21 kmacy Exp $ + * $FreeBSD: src/sys/coda/coda_vnops.h,v 1.18 2007/05/18 13:02:12 kib Exp $ * */ @@ -72,7 +72,7 @@ vop_bmap_t coda_bmap; vop_strategy_t coda_strategy; vop_reclaim_t coda_reclaim; -_vop_lock_t coda_lock; +vop_lock1_t coda_lock; vop_unlock_t coda_unlock; vop_islocked_t coda_islocked; int coda_vop_error(void *); ==== //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#60 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.112 2007/05/01 03:09:57 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.113 2007/05/18 07:10:43 jeff Exp $"); #include #include @@ -146,14 +146,14 @@ /* * The correct thing here would be: * - memfree = cnt.v_free_count * PAGE_SIZE; + memfree = VMCNT_GET(free_count) * PAGE_SIZE; memused = memtotal - memfree; * * but it might mislead linux binaries into thinking there * is very little memory left, so we cheat and tell them that * all memory that isn't wired down is free. */ - memused = cnt.v_wire_count * PAGE_SIZE; + memused = VMCNT_GET(wire_count) * PAGE_SIZE; memfree = memtotal - memused; swap_pager_status(&i, &j); swaptotal = (unsigned long long)i * PAGE_SIZE; @@ -175,7 +175,7 @@ * like unstaticizing it just for linprocfs's sake. */ buffers = 0; - cached = cnt.v_cache_count * PAGE_SIZE; + cached = VMCNT_GET(cache_count) * PAGE_SIZE; sbuf_printf(sb, " total: used: free: shared: buffers: cached:\n" @@ -394,12 +394,12 @@ "intr %u\n" "ctxt %u\n" "btime %lld\n", - cnt.v_vnodepgsin, - cnt.v_vnodepgsout, - cnt.v_swappgsin, - cnt.v_swappgsout, - cnt.v_intr, - cnt.v_swtch, + VMCNT_GET(vnodepgsin), + VMCNT_GET(vnodepgsout), + VMCNT_GET(swappgsin), + VMCNT_GET(swappgsout), + VMCNT_GET(intr), + VMCNT_GET(swtch), (long long)boottime.tv_sec); return (0); } ==== //depot/projects/smpng/sys/compat/linux/linux_misc.c#82 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.208 2007/02/24 16:49:24 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.209 2007/05/18 07:10:43 jeff Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -139,7 +139,7 @@ LINUX_SYSINFO_LOADS_SCALE / averunnable.fscale; sysinfo.totalram = physmem * PAGE_SIZE; - sysinfo.freeram = sysinfo.totalram - cnt.v_wire_count * PAGE_SIZE; + sysinfo.freeram = sysinfo.totalram - VMCNT_GET(wire_count) * PAGE_SIZE; sysinfo.sharedram = 0; mtx_lock(&vm_object_list_mtx); ==== //depot/projects/smpng/sys/compat/svr4/svr4_misc.c#60 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.91 2006/11/06 13:41:50 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.92 2007/05/18 07:10:44 jeff Exp $"); #include "opt_mac.h" @@ -778,14 +778,14 @@ #if defined(UVM) *retval = uvmexp.free; /* XXX: free instead of total */ #else - *retval = cnt.v_free_count; /* XXX: free instead of total */ + *retval = VMCNT_GET(free_count); /* XXX: free instead of total */ #endif break; case SVR4_CONFIG_AVPHYS_PAGES: #if defined(UVM) *retval = uvmexp.active; /* XXX: active instead of avg */ #else - *retval = cnt.v_active_count; /* XXX: active instead of avg */ + *retval = VMCNT_GET(active_count); /* XXX: active instead of avg */ #endif break; #endif /* NOTYET */ ==== //depot/projects/smpng/sys/conf/kern.mk#19 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.mk,v 1.50 2006/11/26 23:16:46 kmacy Exp $ +# $FreeBSD: src/sys/conf/kern.mk,v 1.51 2007/05/19 04:45:54 kan Exp $ # # Warning flags for compiling the kernel and components of the kernel. @@ -12,7 +12,7 @@ .else CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ - ${_wundef} -fformat-extensions + ${_wundef} -Wno-pointer-sign -fformat-extensions .if !defined(NO_UNDEF) _wundef= -Wundef .endif @@ -46,7 +46,7 @@ # a very small subset of float registers for integer divides. # .if ${MACHINE_ARCH} == "ia64" -CFLAGS+= -ffixed-r13 -mfixed-range=f32-f127 -mno-sdata +CFLAGS+= -ffixed-r13 -mfixed-range=f32-f127 -fpic #-mno-sdata INLINE_LIMIT?= 15000 .endif ==== //depot/projects/smpng/sys/conf/kern.pre.mk#56 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.82 2007/05/04 00:00:10 jfv Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.83 2007/05/19 04:48:07 kan Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -53,7 +53,7 @@ NOSTDINC= -nostdinc .endif -INCLUDES= ${NOSTDINC} -I- ${INCLMAGIC} -I. -I$S +INCLUDES= ${NOSTDINC} ${INCLMAGIC} -I. -I$S # This hack lets us use the OpenBSD altq code without spamming a new # include path into contrib'ed source files. @@ -90,7 +90,7 @@ CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT} CFLAGS+= --param inline-unit-growth=100 CFLAGS+= --param large-function-growth=1000 -WERROR?= -Werror +#WERROR?= -Werror .endif # XXX LOCORE means "don't declare C stuff" not "for locore.s". ==== //depot/projects/smpng/sys/conf/kmod.mk#65 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.217 2007/03/21 03:42:49 sam Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.218 2007/05/19 04:48:08 kan Exp $ # # The include file handles building and installing loadable # kernel modules. @@ -79,7 +79,7 @@ . if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing) CFLAGS+= -fno-strict-aliasing . endif -WERROR?= -Werror +#WERROR?= -Werror .endif CFLAGS+= ${WERROR} CFLAGS+= -D_KERNEL @@ -93,7 +93,7 @@ NOSTDINC= -nostdinc .endif CFLAGS+= ${C_DIALECT} -CFLAGS:= ${CFLAGS:N-I*} ${NOSTDINC} -I- ${INCLMAGIC} ${CFLAGS:M-I*} +CFLAGS:= ${CFLAGS:N-I*} ${NOSTDINC} ${INCLMAGIC} ${CFLAGS:M-I*} .if defined(KERNBUILDDIR) CFLAGS+= -DHAVE_KERNEL_OPTION_HEADERS -include ${KERNBUILDDIR}/opt_global.h .endif ==== //depot/projects/smpng/sys/dev/sound/isa/mss.c#32 (text+ko) ==== @@ -29,7 +29,7 @@ #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/mss.c,v 1.109 2007/04/18 18:26:38 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/mss.c,v 1.110 2007/05/19 10:53:01 joel Exp $"); /* board-specific include files */ #include @@ -1320,7 +1320,7 @@ goto mss_probe_end; } tmp &= 0x3f; - if (!(tmp == 0x04 || tmp == 0x0f || tmp == 0x00)) { + if (!(tmp == 0x04 || tmp == 0x0f || tmp == 0x00 || tmp == 0x05)) { BVDDB(printf("No MSS signature detected on port 0x%lx (0x%x)\n", rman_get_start(mss->io_base), tmpx)); goto no; ==== //depot/projects/smpng/sys/dev/sound/pci/envy24.c#11 (text+ko) ==== @@ -35,7 +35,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24.c,v 1.11 2007/04/20 01:28:51 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24.c,v 1.12 2007/05/19 11:06:43 joel Exp $"); MALLOC_DEFINE(M_ENVY24, "envy24", "envy24 audio"); @@ -859,7 +859,7 @@ spicds_setcif(ptr->info, ptr->parent->cfg->cif); spicds_setformat(ptr->info, AK452X_FORMAT_I2S | AK452X_FORMAT_256FSN | AK452X_FORMAT_1X); - spicds_setdvc(ptr->info, 0); + spicds_setdvc(ptr->info, AK452X_DVC_DEMOFF); /* for the time being, init only first codec */ if (ptr->num == 0) spicds_init(ptr->info); ==== //depot/projects/smpng/sys/dev/sound/pci/envy24ht.c#8 (text+ko) ==== @@ -36,7 +36,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24ht.c,v 1.11 2007/04/20 01:28:51 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24ht.c,v 1.12 2007/05/19 11:06:43 joel Exp $"); MALLOC_DEFINE(M_ENVY24HT, "envy24ht", "envy24ht audio"); @@ -932,7 +932,7 @@ ptr->parent->cfg->type == SPICDS_TYPE_AK4528) { spicds_setformat(ptr->info, AK452X_FORMAT_I2S | AK452X_FORMAT_256FSN | AK452X_FORMAT_1X); - spicds_setdvc(ptr->info, 0); + spicds_setdvc(ptr->info, AK452X_DVC_DEMOFF); } /* for the time being, init only first codec */ ==== //depot/projects/smpng/sys/dev/sound/pci/fm801.c#21 (text+ko) ==== @@ -29,11 +29,11 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/fm801.c,v 1.30 2007/04/18 18:26:39 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/fm801.c,v 1.31 2007/05/19 13:19:32 joel Exp $"); #define PCI_VENDOR_FORTEMEDIA 0x1319 -#define PCI_DEVICE_FORTEMEDIA1 0x08011319 -#define PCI_DEVICE_FORTEMEDIA2 0x08021319 /* ??? have no idea what's this... */ +#define PCI_DEVICE_FORTEMEDIA1 0x08011319 /* Audio controller */ +#define PCI_DEVICE_FORTEMEDIA2 0x08021319 /* Joystick controller */ #define FM_PCM_VOLUME 0x00 #define FM_FM_VOLUME 0x02 @@ -417,15 +417,16 @@ struct fm801_chinfo *ch = data; struct fm801_info *fm801 = ch->parent; - if(ch->dir == PCMDIR_PLAY) { - if(fm801->play_flip) return fm801->play_blksize; + /* + * Don't mind for play_flip, set the blocksize to the + * desired values in any case - otherwise sound playback + * breaks here. + */ + if(ch->dir == PCMDIR_PLAY) fm801->play_blksize = blocksize; - } - if(ch->dir == PCMDIR_REC) { - if(fm801->rec_flip) return fm801->rec_blksize; + if(ch->dir == PCMDIR_REC) fm801->rec_blksize = blocksize; - } DPRINT("fm801ch_setblocksize %d (dir %d)\n",blocksize, ch->dir); ==== //depot/projects/smpng/sys/dev/twa/tw_osl.h#4 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/twa/tw_osl.h,v 1.3 2007/05/09 04:16:32 scottl Exp $ + * $FreeBSD: src/sys/dev/twa/tw_osl.h,v 1.4 2007/05/19 10:12:58 scottl Exp $ */ /* @@ -52,7 +52,7 @@ #define TW_OSLI_MAX_NUM_IOS TW_CL_MAX_SIMULTANEOUS_REQUESTS #define TW_OSLI_MAX_NUM_AENS 0x100 -#define TW_OSLI_DEFERRED_INTR_USED +//#define TW_OSLI_DEFERRED_INTR_USED /* Possible values of req->state. */ #define TW_OSLI_REQ_STATE_INIT 0x0 /* being initialized */ ==== //depot/projects/smpng/sys/dev/twa/tw_osl_share.h#7 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/twa/tw_osl_share.h,v 1.7 2007/05/10 15:36:58 scottl Exp $ + * $FreeBSD: src/sys/dev/twa/tw_osl_share.h,v 1.8 2007/05/19 10:12:58 scottl Exp $ */ /* @@ -75,7 +75,7 @@ #define TW_OSL_ENCLOSURE_SUPPORT #endif -#define TW_OSL_DRIVER_VERSION_STRING "3.70.03.006" +#define TW_OSL_DRIVER_VERSION_STRING "3.70.03.007" #define TW_OSL_CAN_SLEEP ==== //depot/projects/smpng/sys/dev/usb/ufoma.c#3 (text+ko) ==== @@ -2,7 +2,7 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ufoma.c,v 1.2 2006/09/07 00:06:41 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ufoma.c,v 1.3 2007/05/19 04:57:15 kan Exp $"); /*- * Copyright (c) 2005, Takanori Watanabe * Copyright (c) 2003, M. Warner Losh . @@ -256,8 +256,6 @@ }; -static devclass_t ucom_devclass; - DRIVER_MODULE(ufoma, uhub, ufoma_driver, ucom_devclass, usbd_driver_load, 0); MODULE_DEPEND(ufoma, usb, 1, 1, 1); MODULE_DEPEND(ufoma, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); ==== //depot/projects/smpng/sys/fs/nullfs/null_vnops.c#30 (text+ko) ==== @@ -36,7 +36,7 @@ * ...and... * @(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project * - * $FreeBSD: src/sys/fs/nullfs/null_vnops.c,v 1.93 2007/02/15 22:08:33 pjd Exp $ + * $FreeBSD: src/sys/fs/nullfs/null_vnops.c,v 1.94 2007/05/18 13:02:12 kib Exp $ */ /* @@ -510,7 +510,7 @@ * vnodes below us on the stack. */ static int -null_lock(struct _vop_lock_args *ap) +null_lock(struct vop_lock1_args *ap) { struct vnode *vp = ap->a_vp; int flags = ap->a_flags; @@ -728,7 +728,7 @@ .vop_getwritemount = null_getwritemount, .vop_inactive = null_inactive, .vop_islocked = null_islocked, - ._vop_lock = null_lock, + .vop_lock1 = null_lock, .vop_lookup = null_lookup, .vop_open = null_open, .vop_print = null_print, ==== //depot/projects/smpng/sys/fs/smbfs/smbfs_io.c#25 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/smbfs/smbfs_io.c,v 1.37 2006/08/09 17:43:26 alc Exp $ + * $FreeBSD: src/sys/fs/smbfs/smbfs_io.c,v 1.38 2007/05/18 07:10:44 jeff Exp $ * */ #include @@ -475,8 +475,8 @@ kva = (vm_offset_t) bp->b_data; pmap_qenter(kva, pages, npages); - cnt.v_vnodein++; - cnt.v_vnodepgsin += npages; + VMCNT_ADD(vnodein, 1); + VMCNT_ADD(vnodepgsin, npages); iov.iov_base = (caddr_t) kva; iov.iov_len = count; @@ -626,8 +626,8 @@ kva = (vm_offset_t) bp->b_data; pmap_qenter(kva, pages, npages); - cnt.v_vnodeout++; - cnt.v_vnodepgsout += count; + VMCNT_ADD(vnodeout, 1); + VMCNT_ADD(vnodepgsout, count); iov.iov_base = (caddr_t) kva; iov.iov_len = count; ==== //depot/projects/smpng/sys/fs/umapfs/umap_vnops.c#14 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)umap_vnops.c 8.6 (Berkeley) 5/22/95 - * $FreeBSD: src/sys/fs/umapfs/umap_vnops.c,v 1.48 2007/02/15 22:08:33 pjd Exp $ + * $FreeBSD: src/sys/fs/umapfs/umap_vnops.c,v 1.49 2007/05/18 13:02:12 kib Exp $ */ /* @@ -57,7 +57,7 @@ static vop_generic_t umap_bypass; static vop_getattr_t umap_getattr; static vop_inactive_t umap_inactive; -static vop_lock_t umap_lock; +static vop_lock1_t umap_lock; static vop_print_t umap_print; static vop_reclaim_t umap_reclaim; static vop_rename_t umap_rename; @@ -353,7 +353,7 @@ */ static int umap_lock(ap) - struct vop_lock_args /* { + struct vop_lock1_args /* { struct vnode *a_vp; int a_flags; struct thread *a_td; @@ -525,7 +525,7 @@ .vop_getattr = umap_getattr, .vop_inactive = umap_inactive, - .vop_lock = umap_lock, + .vop_lock1 = umap_lock, .vop_print = umap_print, .vop_reclaim = umap_reclaim, .vop_rename = umap_rename, ==== //depot/projects/smpng/sys/fs/unionfs/union_vnops.c#35 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)union_vnops.c 8.32 (Berkeley) 6/23/95 - * $FreeBSD: src/sys/fs/unionfs/union_vnops.c,v 1.140 2007/02/15 22:08:33 pjd Exp $ + * $FreeBSD: src/sys/fs/unionfs/union_vnops.c,v 1.141 2007/05/18 13:02:13 kib Exp $ * */ @@ -1630,7 +1630,7 @@ } static int -unionfs_lock(struct _vop_lock_args *ap) +unionfs_lock(struct vop_lock1_args *ap) { int error; int flags; @@ -2256,7 +2256,7 @@ .vop_lease = unionfs_lease, .vop_link = unionfs_link, .vop_listextattr = unionfs_listextattr, - ._vop_lock = unionfs_lock, + .vop_lock1 = unionfs_lock, .vop_lookup = unionfs_lookup, .vop_mkdir = unionfs_mkdir, .vop_mknod = unionfs_mknod, ==== //depot/projects/smpng/sys/i386/i386/machdep.c#127 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.650 2007/03/17 19:42:05 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.651 2007/05/18 07:10:44 jeff Exp $"); #include "opt_apic.h" #include "opt_atalk.h" @@ -247,8 +247,8 @@ vm_ksubmap_init(&kmi); printf("avail memory = %ju (%ju MB)\n", - ptoa((uintmax_t)cnt.v_free_count), - ptoa((uintmax_t)cnt.v_free_count) / 1048576); + ptoa((uintmax_t)VMCNT_GET(free_count)), + ptoa((uintmax_t)VMCNT_GET(free_count)) / 1048576); /* * Set up buffers, so they can be used to read disk labels. ==== //depot/projects/smpng/sys/i386/i386/pmap.c#119 (text+ko) ==== @@ -75,7 +75,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat May 19 17:53:37 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4ECC716A469; Sat, 19 May 2007 17:53:37 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E85CA16A468 for ; Sat, 19 May 2007 17:53:36 +0000 (UTC) (envelope-from njl@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id D6A3D13C45B for ; Sat, 19 May 2007 17:53:36 +0000 (UTC) (envelope-from njl@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4JHraw8053743 for ; Sat, 19 May 2007 17:53:36 GMT (envelope-from njl@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4JHrTRx053587 for perforce@freebsd.org; Sat, 19 May 2007 17:53:29 GMT (envelope-from njl@freebsd.org) Date: Sat, 19 May 2007 17:53:29 GMT Message-Id: <200705191753.l4JHrTRx053587@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to njl@freebsd.org using -f From: Nate Lawson To: Perforce Change Reviews Cc: Subject: PERFORCE change 120063 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: Sat, 19 May 2007 17:53:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=120063 Change 120063 by njl@njl_deenlo on 2007/05/19 17:52:33 Bring non-usb files up to -current. Owner of branch should integrate usb files (sys/dev/usb) and resolve conflicts. Affected files ... .. //depot/projects/usb/src/sys/amd64/acpica/madt.c#4 integrate .. //depot/projects/usb/src/sys/amd64/amd64/intr_machdep.c#5 integrate .. //depot/projects/usb/src/sys/amd64/amd64/io_apic.c#4 integrate .. //depot/projects/usb/src/sys/amd64/amd64/local_apic.c#5 integrate .. //depot/projects/usb/src/sys/amd64/amd64/machdep.c#5 integrate .. //depot/projects/usb/src/sys/amd64/amd64/mp_machdep.c#5 integrate .. //depot/projects/usb/src/sys/amd64/amd64/mptable.c#3 integrate .. //depot/projects/usb/src/sys/amd64/amd64/mptable_pci.c#3 integrate .. //depot/projects/usb/src/sys/amd64/amd64/msi.c#3 integrate .. //depot/projects/usb/src/sys/amd64/amd64/nexus.c#5 integrate .. //depot/projects/usb/src/sys/amd64/amd64/pmap.c#5 integrate .. //depot/projects/usb/src/sys/amd64/conf/GENERIC#6 integrate .. //depot/projects/usb/src/sys/amd64/conf/NOTES#6 integrate .. //depot/projects/usb/src/sys/amd64/include/apicvar.h#4 integrate .. //depot/projects/usb/src/sys/amd64/include/intr_machdep.h#4 integrate .. //depot/projects/usb/src/sys/amd64/include/vmparam.h#3 integrate .. //depot/projects/usb/src/sys/amd64/isa/atpic.c#3 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_machdep.c#5 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_sysvec.c#5 integrate .. //depot/projects/usb/src/sys/amd64/pci/pci_bus.c#4 integrate .. //depot/projects/usb/src/sys/arm/arm/machdep.c#3 integrate .. //depot/projects/usb/src/sys/arm/arm/pmap.c#5 integrate .. //depot/projects/usb/src/sys/arm/include/vmparam.h#3 integrate .. //depot/projects/usb/src/sys/arm/xscale/i80321/ep80219_machdep.c#3 integrate .. //depot/projects/usb/src/sys/arm/xscale/i80321/iq31244_machdep.c#4 integrate .. //depot/projects/usb/src/sys/arm/xscale/ixp425/avila_machdep.c#3 integrate .. //depot/projects/usb/src/sys/boot/common/loader.8#5 integrate .. //depot/projects/usb/src/sys/cam/cam_periph.c#4 integrate .. //depot/projects/usb/src/sys/cam/cam_xpt.c#5 integrate .. //depot/projects/usb/src/sys/cam/cam_xpt.h#4 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_cd.c#5 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_ch.c#4 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_da.c#5 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_pass.c#5 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_pt.c#4 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_sa.c#4 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_ses.c#4 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_sg.c#2 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_targ_bh.c#4 integrate .. //depot/projects/usb/src/sys/coda/coda_vnops.c#4 integrate .. //depot/projects/usb/src/sys/coda/coda_vnops.h#3 integrate .. //depot/projects/usb/src/sys/compat/freebsd32/freebsd32_misc.c#4 integrate .. //depot/projects/usb/src/sys/compat/ia32/ia32_sysvec.c#3 integrate .. //depot/projects/usb/src/sys/compat/linprocfs/linprocfs.c#5 integrate .. //depot/projects/usb/src/sys/compat/linux/linux_misc.c#5 integrate .. //depot/projects/usb/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#2 integrate .. //depot/projects/usb/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#2 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_misc.c#4 integrate .. //depot/projects/usb/src/sys/conf/Makefile.amd64#2 integrate .. //depot/projects/usb/src/sys/conf/Makefile.arm#3 integrate .. //depot/projects/usb/src/sys/conf/Makefile.i386#2 integrate .. //depot/projects/usb/src/sys/conf/Makefile.ia64#2 integrate .. //depot/projects/usb/src/sys/conf/Makefile.pc98#2 integrate .. //depot/projects/usb/src/sys/conf/Makefile.powerpc#2 integrate .. //depot/projects/usb/src/sys/conf/Makefile.sparc64#2 integrate .. //depot/projects/usb/src/sys/conf/Makefile.sun4v#2 integrate .. //depot/projects/usb/src/sys/conf/NOTES#8 integrate .. //depot/projects/usb/src/sys/conf/files#17 integrate .. //depot/projects/usb/src/sys/conf/kern.pre.mk#4 integrate .. //depot/projects/usb/src/sys/conf/options#5 integrate .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/gfs.c#2 integrate .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 integrate .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 integrate .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 integrate .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 integrate .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 integrate .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 integrate .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#2 integrate .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate .. //depot/projects/usb/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 integrate .. //depot/projects/usb/src/sys/crypto/camellia/camellia-api.c#1 branch .. //depot/projects/usb/src/sys/crypto/camellia/camellia.c#1 branch .. //depot/projects/usb/src/sys/crypto/camellia/camellia.h#1 branch .. //depot/projects/usb/src/sys/dev/acpica/acpi.c#6 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_hpet.c#4 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_pcib_acpi.c#3 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_pcib_pci.c#3 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpivar.h#5 integrate .. //depot/projects/usb/src/sys/dev/ata/ata-disk.c#6 integrate .. //depot/projects/usb/src/sys/dev/ata/atapi-cam.c#5 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bce.c#5 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bcefw.h#2 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bcereg.h#3 integrate .. //depot/projects/usb/src/sys/dev/bge/if_bge.c#5 integrate .. //depot/projects/usb/src/sys/dev/bge/if_bgereg.h#5 integrate .. //depot/projects/usb/src/sys/dev/cardbus/cardbus.c#5 integrate .. //depot/projects/usb/src/sys/dev/cardbus/cardbus_cis.c#3 integrate .. //depot/projects/usb/src/sys/dev/ciss/ciss.c#5 integrate .. //depot/projects/usb/src/sys/dev/ciss/cissvar.h#2 integrate .. //depot/projects/usb/src/sys/dev/em/LICENSE#2 integrate .. //depot/projects/usb/src/sys/dev/em/README#3 integrate .. //depot/projects/usb/src/sys/dev/em/e1000_80003es2lan.c#1 branch .. //depot/projects/usb/src/sys/dev/em/e1000_80003es2lan.h#1 branch .. //depot/projects/usb/src/sys/dev/em/e1000_82540.c#1 branch .. //depot/projects/usb/src/sys/dev/em/e1000_82541.c#1 branch .. //depot/projects/usb/src/sys/dev/em/e1000_82541.h#1 branch .. //depot/projects/usb/src/sys/dev/em/e1000_82542.c#1 branch .. //depot/projects/usb/src/sys/dev/em/e1000_82543.c#1 branch .. //depot/projects/usb/src/sys/dev/em/e1000_82543.h#1 branch .. //depot/projects/usb/src/sys/dev/em/e1000_82571.c#1 branch .. //depot/projects/usb/src/sys/dev/em/e1000_82571.h#1 branch .. //depot/projects/usb/src/sys/dev/em/e1000_82575.c#1 branch .. //depot/projects/usb/src/sys/dev/em/e1000_82575.h#1 branch .. //depot/projects/usb/src/sys/dev/em/e1000_api.c#1 branch .. //depot/projects/usb/src/sys/dev/em/e1000_api.h#1 branch .. //depot/projects/usb/src/sys/dev/em/e1000_defines.h#1 branch .. //depot/projects/usb/src/sys/dev/em/e1000_hw.h#1 branch .. //depot/projects/usb/src/sys/dev/em/e1000_ich8lan.c#1 branch .. //depot/projects/usb/src/sys/dev/em/e1000_ich8lan.h#1 branch .. //depot/projects/usb/src/sys/dev/em/e1000_mac.c#1 branch .. //depot/projects/usb/src/sys/dev/em/e1000_mac.h#1 branch .. //depot/projects/usb/src/sys/dev/em/e1000_manage.c#1 branch .. //depot/projects/usb/src/sys/dev/em/e1000_manage.h#1 branch .. //depot/projects/usb/src/sys/dev/em/e1000_nvm.c#1 branch .. //depot/projects/usb/src/sys/dev/em/e1000_nvm.h#1 branch .. //depot/projects/usb/src/sys/dev/em/e1000_osdep.h#1 branch .. //depot/projects/usb/src/sys/dev/em/e1000_phy.c#1 branch .. //depot/projects/usb/src/sys/dev/em/e1000_phy.h#1 branch .. //depot/projects/usb/src/sys/dev/em/e1000_regs.h#1 branch .. //depot/projects/usb/src/sys/dev/em/if_em.c#5 integrate .. //depot/projects/usb/src/sys/dev/em/if_em.h#4 integrate .. //depot/projects/usb/src/sys/dev/em/if_em_hw.c#4 delete .. //depot/projects/usb/src/sys/dev/em/if_em_hw.h#4 delete .. //depot/projects/usb/src/sys/dev/em/if_em_osdep.h#4 delete .. //depot/projects/usb/src/sys/dev/firewire/firewire.c#3 integrate .. //depot/projects/usb/src/sys/dev/firewire/firewirereg.h#3 integrate .. //depot/projects/usb/src/sys/dev/firewire/fwdev.c#4 integrate .. //depot/projects/usb/src/sys/dev/firewire/fwohci.c#3 integrate .. //depot/projects/usb/src/sys/dev/firewire/fwohcireg.h#2 integrate .. //depot/projects/usb/src/sys/dev/firewire/if_fwip.c#4 integrate .. //depot/projects/usb/src/sys/dev/firewire/sbp.c#4 integrate .. //depot/projects/usb/src/sys/dev/firewire/sbp_targ.c#3 integrate .. //depot/projects/usb/src/sys/dev/gem/if_gem.c#4 integrate .. //depot/projects/usb/src/sys/dev/gem/if_gem_pci.c#3 integrate .. //depot/projects/usb/src/sys/dev/gem/if_gemvar.h#3 integrate .. //depot/projects/usb/src/sys/dev/hme/if_hme.c#4 integrate .. //depot/projects/usb/src/sys/dev/hptiop/hptiop.c#1 branch .. //depot/projects/usb/src/sys/dev/hptiop/hptiop.h#1 branch .. //depot/projects/usb/src/sys/dev/ipmi/ipmi_smbios.c#3 integrate .. //depot/projects/usb/src/sys/dev/isp/isp.c#5 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_freebsd.c#5 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_freebsd.h#5 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_pci.c#5 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_sbus.c#5 integrate .. //depot/projects/usb/src/sys/dev/isp/isp_tpublic.h#5 integrate .. //depot/projects/usb/src/sys/dev/mfi/mfi.c#5 integrate .. //depot/projects/usb/src/sys/dev/mfi/mfi_cam.c#1 branch .. //depot/projects/usb/src/sys/dev/mfi/mfi_disk.c#4 integrate .. //depot/projects/usb/src/sys/dev/mfi/mfi_ioctl.h#3 integrate .. //depot/projects/usb/src/sys/dev/mfi/mfi_pci.c#4 integrate .. //depot/projects/usb/src/sys/dev/mfi/mfireg.h#4 integrate .. //depot/projects/usb/src/sys/dev/mfi/mfivar.h#4 integrate .. //depot/projects/usb/src/sys/dev/mii/brgphy.c#5 integrate .. //depot/projects/usb/src/sys/dev/mii/mii.c#3 integrate .. //depot/projects/usb/src/sys/dev/mmc/mmc.c#2 integrate .. //depot/projects/usb/src/sys/dev/mmc/mmcsd.c#2 integrate .. //depot/projects/usb/src/sys/dev/mmc/mmcvar.h#2 integrate .. //depot/projects/usb/src/sys/dev/mpt/mpt.c#4 integrate .. //depot/projects/usb/src/sys/dev/mpt/mpt.h#5 integrate .. //depot/projects/usb/src/sys/dev/mpt/mpt_cam.c#5 integrate .. //depot/projects/usb/src/sys/dev/mpt/mpt_cam.h#4 integrate .. //depot/projects/usb/src/sys/dev/mpt/mpt_pci.c#5 integrate .. //depot/projects/usb/src/sys/dev/mpt/mpt_raid.c#4 integrate .. //depot/projects/usb/src/sys/dev/mxge/eth_z8e.dat.gz.uu#4 integrate .. //depot/projects/usb/src/sys/dev/mxge/ethp_z8e.dat.gz.uu#4 integrate .. //depot/projects/usb/src/sys/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/usb/src/sys/dev/mxge/mxge_mcp.h#3 integrate .. //depot/projects/usb/src/sys/dev/nve/if_nve.c#3 integrate .. //depot/projects/usb/src/sys/dev/pccbb/pccbb.c#5 integrate .. //depot/projects/usb/src/sys/dev/pci/pci.c#6 integrate .. //depot/projects/usb/src/sys/dev/pci/pci_if.m#3 integrate .. //depot/projects/usb/src/sys/dev/pci/pci_pci.c#4 integrate .. //depot/projects/usb/src/sys/dev/pci/pci_private.h#3 integrate .. //depot/projects/usb/src/sys/dev/pci/pcib_if.m#3 integrate .. //depot/projects/usb/src/sys/dev/pci/pcib_private.h#3 integrate .. //depot/projects/usb/src/sys/dev/pci/pcireg.h#5 integrate .. //depot/projects/usb/src/sys/dev/pci/pcivar.h#5 integrate .. //depot/projects/usb/src/sys/dev/sk/if_sk.c#5 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/emu10kx.c#5 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#3 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac_private.h#3 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/ich.c#5 integrate .. //depot/projects/usb/src/sys/dev/sound/pcm/buffer.h#5 integrate .. //depot/projects/usb/src/sys/dev/sound/pcm/sound.h#5 integrate .. //depot/projects/usb/src/sys/dev/stge/if_stge.c#4 integrate .. //depot/projects/usb/src/sys/dev/stge/if_stgereg.h#2 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_cl.h#2 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_cl_externs.h#2 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_cl_fwif.h#2 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_cl_fwimg.c#2 delete .. //depot/projects/usb/src/sys/dev/twa/tw_cl_init.c#2 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_cl_intr.c#2 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_cl_io.c#2 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_cl_ioctl.h#2 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_cl_misc.c#2 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_cl_share.h#2 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_osl.h#2 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_osl_cam.c#4 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_osl_externs.h#2 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_osl_freebsd.c#4 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_osl_includes.h#3 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_osl_inline.h#3 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_osl_ioctl.h#2 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_osl_share.h#3 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_osl_types.h#2 integrate .. //depot/projects/usb/src/sys/dev/uart/uart_bus_pci.c#3 integrate .. //depot/projects/usb/src/sys/dev/uart/uart_kbd_sun.c#4 integrate .. //depot/projects/usb/src/sys/fs/nullfs/null_vnops.c#4 integrate .. //depot/projects/usb/src/sys/fs/procfs/procfs_ioctl.c#4 integrate .. //depot/projects/usb/src/sys/fs/smbfs/smbfs_io.c#3 integrate .. //depot/projects/usb/src/sys/fs/umapfs/umap_vnops.c#3 integrate .. //depot/projects/usb/src/sys/fs/unionfs/union_vnops.c#5 integrate .. //depot/projects/usb/src/sys/geom/eli/g_eli_ctl.c#5 integrate .. //depot/projects/usb/src/sys/geom/geom.h#4 integrate .. //depot/projects/usb/src/sys/geom/geom_dev.c#4 integrate .. //depot/projects/usb/src/sys/geom/geom_disk.c#4 integrate .. //depot/projects/usb/src/sys/geom/geom_disk.h#3 integrate .. //depot/projects/usb/src/sys/geom/geom_io.c#5 integrate .. //depot/projects/usb/src/sys/geom/geom_slice.c#3 integrate .. //depot/projects/usb/src/sys/geom/geom_subr.c#3 integrate .. //depot/projects/usb/src/sys/geom/part/g_part.c#2 integrate .. //depot/projects/usb/src/sys/geom/part/g_part.h#2 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_apm.c#2 integrate .. //depot/projects/usb/src/sys/geom/part/g_part_gpt.c#2 integrate .. //depot/projects/usb/src/sys/i386/Makefile#2 integrate .. //depot/projects/usb/src/sys/i386/acpica/madt.c#4 integrate .. //depot/projects/usb/src/sys/i386/conf/GENERIC#5 integrate .. //depot/projects/usb/src/sys/i386/conf/NOTES#5 integrate .. //depot/projects/usb/src/sys/i386/conf/PAE#3 integrate .. //depot/projects/usb/src/sys/i386/i386/intr_machdep.c#5 integrate .. //depot/projects/usb/src/sys/i386/i386/io_apic.c#4 integrate .. //depot/projects/usb/src/sys/i386/i386/local_apic.c#5 integrate .. //depot/projects/usb/src/sys/i386/i386/machdep.c#5 integrate .. //depot/projects/usb/src/sys/i386/i386/mp_machdep.c#5 integrate .. //depot/projects/usb/src/sys/i386/i386/mptable.c#3 integrate .. //depot/projects/usb/src/sys/i386/i386/mptable_pci.c#3 integrate .. //depot/projects/usb/src/sys/i386/i386/msi.c#3 integrate .. //depot/projects/usb/src/sys/i386/i386/nexus.c#5 integrate .. //depot/projects/usb/src/sys/i386/i386/pmap.c#5 integrate .. //depot/projects/usb/src/sys/i386/include/apicvar.h#4 integrate .. //depot/projects/usb/src/sys/i386/include/intr_machdep.h#4 integrate .. //depot/projects/usb/src/sys/i386/include/vmparam.h#3 integrate .. //depot/projects/usb/src/sys/i386/isa/atpic.c#3 integrate .. //depot/projects/usb/src/sys/i386/linux/linux_machdep.c#5 integrate .. //depot/projects/usb/src/sys/i386/pci/pci_bus.c#4 integrate .. //depot/projects/usb/src/sys/ia64/ia64/machdep.c#4 integrate .. //depot/projects/usb/src/sys/ia64/ia64/pmap.c#5 integrate .. //depot/projects/usb/src/sys/ia64/include/vmparam.h#4 integrate .. //depot/projects/usb/src/sys/kern/Make.tags.inc#4 integrate .. //depot/projects/usb/src/sys/kern/imgact_elf.c#3 integrate .. //depot/projects/usb/src/sys/kern/init_main.c#5 integrate .. //depot/projects/usb/src/sys/kern/kern_condvar.c#4 integrate .. //depot/projects/usb/src/sys/kern/kern_descrip.c#5 integrate .. //depot/projects/usb/src/sys/kern/kern_exec.c#5 integrate .. //depot/projects/usb/src/sys/kern/kern_exit.c#5 integrate .. //depot/projects/usb/src/sys/kern/kern_fork.c#5 integrate .. //depot/projects/usb/src/sys/kern/kern_intr.c#5 integrate .. //depot/projects/usb/src/sys/kern/kern_lock.c#5 integrate .. //depot/projects/usb/src/sys/kern/kern_malloc.c#5 integrate .. //depot/projects/usb/src/sys/kern/kern_mib.c#3 integrate .. //depot/projects/usb/src/sys/kern/kern_mutex.c#5 integrate .. //depot/projects/usb/src/sys/kern/kern_resource.c#5 integrate .. //depot/projects/usb/src/sys/kern/kern_rwlock.c#5 integrate .. //depot/projects/usb/src/sys/kern/kern_sx.c#5 integrate .. //depot/projects/usb/src/sys/kern/kern_synch.c#5 integrate .. //depot/projects/usb/src/sys/kern/kern_thread.c#5 integrate .. //depot/projects/usb/src/sys/kern/kern_timeout.c#3 integrate .. //depot/projects/usb/src/sys/kern/subr_lock.c#4 integrate .. //depot/projects/usb/src/sys/kern/subr_rman.c#5 integrate .. //depot/projects/usb/src/sys/kern/subr_sleepqueue.c#3 integrate .. //depot/projects/usb/src/sys/kern/subr_trap.c#4 integrate .. //depot/projects/usb/src/sys/kern/subr_turnstile.c#4 integrate .. //depot/projects/usb/src/sys/kern/sys_generic.c#5 integrate .. //depot/projects/usb/src/sys/kern/uipc_debug.c#2 integrate .. //depot/projects/usb/src/sys/kern/uipc_domain.c#3 integrate .. //depot/projects/usb/src/sys/kern/uipc_mbuf.c#5 integrate .. //depot/projects/usb/src/sys/kern/uipc_sockbuf.c#3 integrate .. //depot/projects/usb/src/sys/kern/uipc_socket.c#5 integrate .. //depot/projects/usb/src/sys/kern/uipc_syscalls.c#5 integrate .. //depot/projects/usb/src/sys/kern/uipc_usrreq.c#5 integrate .. //depot/projects/usb/src/sys/kern/vfs_bio.c#5 integrate .. //depot/projects/usb/src/sys/kern/vfs_default.c#4 integrate .. //depot/projects/usb/src/sys/kern/vfs_subr.c#5 integrate .. //depot/projects/usb/src/sys/kern/vfs_syscalls.c#5 integrate .. //depot/projects/usb/src/sys/kern/vfs_vnops.c#5 integrate .. //depot/projects/usb/src/sys/kern/vnode_if.src#5 integrate .. //depot/projects/usb/src/sys/modules/Makefile#6 integrate .. //depot/projects/usb/src/sys/modules/crypto/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/em/Makefile#2 integrate .. //depot/projects/usb/src/sys/modules/hptiop/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/mfi/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/mfi/mfip/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/netgraph/Makefile#4 integrate .. //depot/projects/usb/src/sys/modules/netgraph/car/Makefile#1 branch .. //depot/projects/usb/src/sys/modules/twa/Makefile#2 integrate .. //depot/projects/usb/src/sys/net/ethernet.h#4 integrate .. //depot/projects/usb/src/sys/net/ieee8023ad_lacp.c#2 integrate .. //depot/projects/usb/src/sys/net/ieee8023ad_lacp.h#2 integrate .. //depot/projects/usb/src/sys/net/if.c#5 integrate .. //depot/projects/usb/src/sys/net/if.h#3 integrate .. //depot/projects/usb/src/sys/net/if_lagg.c#2 integrate .. //depot/projects/usb/src/sys/net/if_lagg.h#2 integrate .. //depot/projects/usb/src/sys/net/if_var.h#4 integrate .. //depot/projects/usb/src/sys/net/pfkeyv2.h#2 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_amrr.c#2 integrate .. //depot/projects/usb/src/sys/netatalk/ddp_usrreq.c#4 integrate .. //depot/projects/usb/src/sys/netgraph/ng_car.c#1 branch .. //depot/projects/usb/src/sys/netgraph/ng_car.h#1 branch .. //depot/projects/usb/src/sys/netgraph/ng_fec.c#3 integrate .. //depot/projects/usb/src/sys/netgraph/ng_mppc.c#2 integrate .. //depot/projects/usb/src/sys/netgraph/ng_socket.c#4 integrate .. //depot/projects/usb/src/sys/netinet/icmp6.h#2 integrate .. //depot/projects/usb/src/sys/netinet/if_ether.c#5 integrate .. //depot/projects/usb/src/sys/netinet/in.c#4 integrate .. //depot/projects/usb/src/sys/netinet/in_cksum.c#2 integrate .. //depot/projects/usb/src/sys/netinet/in_gif.c#3 integrate .. //depot/projects/usb/src/sys/netinet/in_pcb.c#5 integrate .. //depot/projects/usb/src/sys/netinet/in_pcb.h#4 integrate .. //depot/projects/usb/src/sys/netinet/in_rmx.c#3 integrate .. //depot/projects/usb/src/sys/netinet/ip.h#3 integrate .. //depot/projects/usb/src/sys/netinet/ip_divert.c#4 integrate .. //depot/projects/usb/src/sys/netinet/ip_dummynet.c#4 integrate .. //depot/projects/usb/src/sys/netinet/ip_ecn.c#2 integrate .. //depot/projects/usb/src/sys/netinet/ip_encap.c#3 integrate .. //depot/projects/usb/src/sys/netinet/ip_fw.h#4 integrate .. //depot/projects/usb/src/sys/netinet/ip_fw2.c#5 integrate .. //depot/projects/usb/src/sys/netinet/ip_icmp.c#3 integrate .. //depot/projects/usb/src/sys/netinet/ip_id.c#2 integrate .. //depot/projects/usb/src/sys/netinet/ip_input.c#5 integrate .. //depot/projects/usb/src/sys/netinet/ip_ipsec.c#3 integrate .. //depot/projects/usb/src/sys/netinet/ip_mroute.c#4 integrate .. //depot/projects/usb/src/sys/netinet/ip_options.c#3 integrate .. //depot/projects/usb/src/sys/netinet/ip_options.h#2 integrate .. //depot/projects/usb/src/sys/netinet/ip_output.c#5 integrate .. //depot/projects/usb/src/sys/netinet/libalias/alias_proxy.c#4 integrate .. //depot/projects/usb/src/sys/netinet/raw_ip.c#5 integrate .. //depot/projects/usb/src/sys/netinet/sctp.h#3 integrate .. //depot/projects/usb/src/sys/netinet/sctp_asconf.c#3 integrate .. //depot/projects/usb/src/sys/netinet/sctp_asconf.h#3 integrate .. //depot/projects/usb/src/sys/netinet/sctp_auth.c#3 integrate .. //depot/projects/usb/src/sys/netinet/sctp_auth.h#3 integrate .. //depot/projects/usb/src/sys/netinet/sctp_bsd_addr.c#3 integrate .. //depot/projects/usb/src/sys/netinet/sctp_bsd_addr.h#3 integrate .. //depot/projects/usb/src/sys/netinet/sctp_constants.h#3 integrate .. //depot/projects/usb/src/sys/netinet/sctp_crc32.c#3 integrate .. //depot/projects/usb/src/sys/netinet/sctp_crc32.h#2 integrate .. //depot/projects/usb/src/sys/netinet/sctp_header.h#3 integrate .. //depot/projects/usb/src/sys/netinet/sctp_indata.c#3 integrate .. //depot/projects/usb/src/sys/netinet/sctp_indata.h#3 integrate .. //depot/projects/usb/src/sys/netinet/sctp_input.c#3 integrate .. //depot/projects/usb/src/sys/netinet/sctp_input.h#2 integrate .. //depot/projects/usb/src/sys/netinet/sctp_lock_bsd.h#3 integrate .. //depot/projects/usb/src/sys/netinet/sctp_os.h#3 integrate .. //depot/projects/usb/src/sys/netinet/sctp_os_bsd.h#3 integrate .. //depot/projects/usb/src/sys/netinet/sctp_output.c#3 integrate .. //depot/projects/usb/src/sys/netinet/sctp_output.h#3 integrate .. //depot/projects/usb/src/sys/netinet/sctp_pcb.c#3 integrate .. //depot/projects/usb/src/sys/netinet/sctp_pcb.h#3 integrate .. //depot/projects/usb/src/sys/netinet/sctp_peeloff.c#3 integrate .. //depot/projects/usb/src/sys/netinet/sctp_peeloff.h#2 integrate .. //depot/projects/usb/src/sys/netinet/sctp_structs.h#3 integrate .. //depot/projects/usb/src/sys/netinet/sctp_sysctl.c#2 integrate .. //depot/projects/usb/src/sys/netinet/sctp_sysctl.h#2 integrate .. //depot/projects/usb/src/sys/netinet/sctp_timer.c#3 integrate .. //depot/projects/usb/src/sys/netinet/sctp_timer.h#2 integrate .. //depot/projects/usb/src/sys/netinet/sctp_uio.h#3 integrate .. //depot/projects/usb/src/sys/netinet/sctp_usrreq.c#3 integrate .. //depot/projects/usb/src/sys/netinet/sctp_var.h#3 integrate .. //depot/projects/usb/src/sys/netinet/sctputil.c#3 integrate .. //depot/projects/usb/src/sys/netinet/sctputil.h#3 integrate .. //depot/projects/usb/src/sys/netinet/tcp.h#3 integrate .. //depot/projects/usb/src/sys/netinet/tcp_debug.c#2 integrate .. //depot/projects/usb/src/sys/netinet/tcp_fsm.h#2 integrate .. //depot/projects/usb/src/sys/netinet/tcp_input.c#5 integrate .. //depot/projects/usb/src/sys/netinet/tcp_output.c#5 integrate .. //depot/projects/usb/src/sys/netinet/tcp_reass.c#1 branch .. //depot/projects/usb/src/sys/netinet/tcp_sack.c#3 integrate .. //depot/projects/usb/src/sys/netinet/tcp_subr.c#5 integrate .. //depot/projects/usb/src/sys/netinet/tcp_syncache.c#5 integrate .. //depot/projects/usb/src/sys/netinet/tcp_timer.c#4 integrate .. //depot/projects/usb/src/sys/netinet/tcp_timer.h#5 integrate .. //depot/projects/usb/src/sys/netinet/tcp_timewait.c#1 branch .. //depot/projects/usb/src/sys/netinet/tcp_usrreq.c#5 integrate .. //depot/projects/usb/src/sys/netinet/tcp_var.h#4 integrate .. //depot/projects/usb/src/sys/netinet/udp_usrreq.c#5 integrate .. //depot/projects/usb/src/sys/netinet6/esp_camellia.c#1 branch .. //depot/projects/usb/src/sys/netinet6/esp_camellia.h#1 branch .. //depot/projects/usb/src/sys/netinet6/esp_core.c#3 integrate .. //depot/projects/usb/src/sys/netinet6/icmp6.c#5 integrate .. //depot/projects/usb/src/sys/netinet6/in6_pcb.c#5 integrate .. //depot/projects/usb/src/sys/netinet6/in6_pcb.h#2 integrate .. //depot/projects/usb/src/sys/netinet6/in6_proto.c#5 integrate .. //depot/projects/usb/src/sys/netinet6/in6_src.c#5 integrate .. //depot/projects/usb/src/sys/netinet6/ip6_input.c#5 integrate .. //depot/projects/usb/src/sys/netinet6/nd6.c#5 integrate .. //depot/projects/usb/src/sys/netinet6/nd6_nbr.c#4 integrate .. //depot/projects/usb/src/sys/netinet6/raw_ip6.c#4 integrate .. //depot/projects/usb/src/sys/netinet6/sctp6_usrreq.c#3 integrate .. //depot/projects/usb/src/sys/netinet6/sctp6_var.h#3 integrate .. //depot/projects/usb/src/sys/netipsec/xform_esp.c#2 integrate .. //depot/projects/usb/src/sys/netipx/ipx.c#3 integrate .. //depot/projects/usb/src/sys/netipx/ipx.h#3 integrate .. //depot/projects/usb/src/sys/netipx/ipx_cksum.c#3 integrate .. //depot/projects/usb/src/sys/netipx/ipx_if.h#3 integrate .. //depot/projects/usb/src/sys/netipx/ipx_input.c#3 integrate .. //depot/projects/usb/src/sys/netipx/ipx_outputfl.c#3 integrate .. //depot/projects/usb/src/sys/netipx/ipx_pcb.c#3 integrate .. //depot/projects/usb/src/sys/netipx/ipx_pcb.h#3 integrate .. //depot/projects/usb/src/sys/netipx/ipx_usrreq.c#4 integrate .. //depot/projects/usb/src/sys/netipx/ipx_var.h#3 integrate .. //depot/projects/usb/src/sys/netipx/spx_debug.c#3 integrate .. //depot/projects/usb/src/sys/netipx/spx_debug.h#3 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_bio.c#4 integrate .. //depot/projects/usb/src/sys/nfsclient/nfs_socket.c#5 integrate .. //depot/projects/usb/src/sys/opencrypto/cryptodev.c#3 integrate .. //depot/projects/usb/src/sys/opencrypto/cryptodev.h#4 integrate .. //depot/projects/usb/src/sys/opencrypto/cryptosoft.c#4 integrate .. //depot/projects/usb/src/sys/opencrypto/xform.c#3 integrate .. //depot/projects/usb/src/sys/opencrypto/xform.h#2 integrate .. //depot/projects/usb/src/sys/pc98/conf/GENERIC#6 integrate .. //depot/projects/usb/src/sys/pc98/pc98/machdep.c#5 integrate .. //depot/projects/usb/src/sys/pci/if_tl.c#4 integrate .. //depot/projects/usb/src/sys/powerpc/include/vmparam.h#3 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/machdep.c#5 integrate .. //depot/projects/usb/src/sys/security/audit/audit_ioctl.h#3 integrate .. //depot/projects/usb/src/sys/sparc64/include/profile.h#2 integrate .. //depot/projects/usb/src/sys/sparc64/include/vmparam.h#3 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/machdep.c#4 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/pmap.c#4 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/upa.c#3 integrate .. //depot/projects/usb/src/sys/sun4v/include/profile.h#2 integrate .. //depot/projects/usb/src/sys/sun4v/include/vmparam.h#3 integrate .. //depot/projects/usb/src/sys/sun4v/sun4v/machdep.c#2 integrate .. //depot/projects/usb/src/sys/sun4v/sun4v/pmap.c#2 integrate .. //depot/projects/usb/src/sys/sun4v/sun4v/tsb.c#2 integrate .. //depot/projects/usb/src/sys/sun4v/sun4v/tte_hash.c#2 integrate .. //depot/projects/usb/src/sys/sys/callout.h#2 integrate .. //depot/projects/usb/src/sys/sys/disk.h#2 integrate .. //depot/projects/usb/src/sys/sys/filedesc.h#3 integrate .. //depot/projects/usb/src/sys/sys/interrupt.h#4 integrate .. //depot/projects/usb/src/sys/sys/ioctl_compat.h#2 integrate .. //depot/projects/usb/src/sys/sys/lockf.h#2 integrate .. //depot/projects/usb/src/sys/sys/param.h#5 integrate .. //depot/projects/usb/src/sys/sys/rwlock.h#5 integrate .. //depot/projects/usb/src/sys/sys/socketvar.h#4 integrate .. //depot/projects/usb/src/sys/sys/sx.h#4 integrate .. //depot/projects/usb/src/sys/sys/sysent.h#5 integrate .. //depot/projects/usb/src/sys/sys/vmmeter.h#3 integrate .. //depot/projects/usb/src/sys/sys/vnode.h#4 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_softdep.c#4 integrate .. //depot/projects/usb/src/sys/ufs/ffs/ffs_vnops.c#4 integrate .. //depot/projects/usb/src/sys/vm/swap_pager.c#5 integrate .. //depot/projects/usb/src/sys/vm/uma_core.c#5 integrate .. //depot/projects/usb/src/sys/vm/uma_int.h#2 integrate .. //depot/projects/usb/src/sys/vm/vm_contig.c#5 integrate .. //depot/projects/usb/src/sys/vm/vm_fault.c#5 integrate .. //depot/projects/usb/src/sys/vm/vm_glue.c#4 integrate .. //depot/projects/usb/src/sys/vm/vm_map.c#5 integrate .. //depot/projects/usb/src/sys/vm/vm_meter.c#4 integrate .. //depot/projects/usb/src/sys/vm/vm_mmap.c#4 integrate .. //depot/projects/usb/src/sys/vm/vm_object.c#5 integrate .. //depot/projects/usb/src/sys/vm/vm_page.c#5 integrate .. //depot/projects/usb/src/sys/vm/vm_page.h#5 integrate .. //depot/projects/usb/src/sys/vm/vm_pageout.c#5 integrate .. //depot/projects/usb/src/sys/vm/vm_pageq.c#4 integrate .. //depot/projects/usb/src/sys/vm/vm_zeroidle.c#5 integrate .. //depot/projects/usb/src/sys/vm/vnode_pager.c#4 integrate Differences ... ==== //depot/projects/usb/src/sys/amd64/acpica/madt.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.23 2007/03/22 18:16:38 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.24 2007/05/08 22:01:02 jhb Exp $"); #include #include @@ -53,21 +53,18 @@ #include #include -#define NIOAPICS 32 /* Max number of I/O APICs */ -#define NLAPICS 32 /* Max number of local APICs */ - typedef void madt_entry_handler(ACPI_SUBTABLE_HEADER *entry, void *arg); /* These two arrays are indexed by APIC IDs. */ struct ioapic_info { void *io_apic; UINT32 io_vector; -} ioapics[NIOAPICS]; +} ioapics[MAX_APIC_ID + 1]; struct lapic_info { u_int la_enabled:1; u_int la_acpi_id:8; -} lapics[NLAPICS]; +} lapics[MAX_APIC_ID + 1]; static int madt_found_sci_override; static ACPI_TABLE_MADT *madt; @@ -393,7 +390,7 @@ } /* Third, we register all the I/O APIC's. */ - for (i = 0; i < NIOAPICS; i++) + for (i = 0; i <= MAX_APIC_ID; i++) if (ioapics[i].io_apic != NULL) ioapic_register(ioapics[i].io_apic); @@ -450,7 +447,7 @@ "enabled" : "disabled"); if (!(proc->LapicFlags & ACPI_MADT_ENABLED)) break; - if (proc->Id >= NLAPICS) + if (proc->Id > MAX_APIC_ID) panic("%s: CPU ID %u too high", __func__, proc->Id); la = &lapics[proc->Id]; KASSERT(la->la_enabled == 0, @@ -479,7 +476,7 @@ "MADT: Found IO APIC ID %u, Interrupt %u at %p\n", apic->Id, apic->GlobalIrqBase, (void *)(uintptr_t)apic->Address); - if (apic->Id >= NIOAPICS) + if (apic->Id > MAX_APIC_ID) panic("%s: I/O APIC ID %u too high", __func__, apic->Id); if (ioapics[apic->Id].io_apic != NULL) @@ -545,7 +542,7 @@ { int i; - for (i = 0; i < NLAPICS; i++) { + for (i = 0; i <= MAX_APIC_ID; i++) { if (!lapics[i].la_enabled) continue; if (lapics[i].la_acpi_id != acpi_id) @@ -566,7 +563,7 @@ int i, best; best = -1; - for (i = 0; i < NIOAPICS; i++) { + for (i = 0; i <= MAX_APIC_ID; i++) { if (ioapics[i].io_apic == NULL || ioapics[i].io_vector > intr) continue; ==== //depot/projects/usb/src/sys/amd64/amd64/intr_machdep.c#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.30 2007/03/06 17:16:46 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.32 2007/05/08 21:29:12 jhb Exp $ */ /* @@ -43,13 +43,14 @@ #include #include #include -#include #include #include +#include #include #include #include #include +#include #include #include #include @@ -71,9 +72,16 @@ static int intrcnt_index; static struct intsrc *interrupt_sources[NUM_IO_INTS]; -static struct mtx intr_table_lock; +static struct sx intr_table_lock; +static struct mtx intrcnt_lock; static STAILQ_HEAD(, pic) pics; +#ifdef INTR_FILTER +static void intr_eoi_src(void *arg); +static void intr_disab_eoi_src(void *arg); +static void intr_event_stray(void *cookie); +#endif + #ifdef SMP static int assign_cpu; @@ -109,14 +117,14 @@ { int error; - mtx_lock_spin(&intr_table_lock); + sx_xlock(&intr_table_lock); if (intr_pic_registered(pic)) error = EBUSY; else { STAILQ_INSERT_TAIL(&pics, pic, pics); error = 0; } - mtx_unlock_spin(&intr_table_lock); + sx_xunlock(&intr_table_lock); return (error); } @@ -134,20 +142,26 @@ vector = isrc->is_pic->pic_vector(isrc); if (interrupt_sources[vector] != NULL) return (EEXIST); +#ifdef INTR_FILTER error = intr_event_create(&isrc->is_event, isrc, 0, + (mask_fn)isrc->is_pic->pic_enable_source, + intr_eoi_src, intr_disab_eoi_src, "irq%d:", vector); +#else + error = intr_event_create(&isrc->is_event, isrc, 0, (mask_fn)isrc->is_pic->pic_enable_source, "irq%d:", vector); +#endif if (error) return (error); - mtx_lock_spin(&intr_table_lock); + sx_xlock(&intr_table_lock); if (interrupt_sources[vector] != NULL) { - mtx_unlock_spin(&intr_table_lock); + sx_xunlock(&intr_table_lock); intr_event_destroy(isrc->is_event); return (EEXIST); } intrcnt_register(isrc); interrupt_sources[vector] = isrc; - isrc->is_enabled = 0; - mtx_unlock_spin(&intr_table_lock); + isrc->is_handlers = 0; + sx_xunlock(&intr_table_lock); return (0); } @@ -171,19 +185,18 @@ error = intr_event_add_handler(isrc->is_event, name, filter, handler, arg, intr_priority(flags), flags, cookiep); if (error == 0) { + sx_xlock(&intr_table_lock); intrcnt_updatename(isrc); - mtx_lock_spin(&intr_table_lock); - if (!isrc->is_enabled) { - isrc->is_enabled = 1; + isrc->is_handlers++; + if (isrc->is_handlers == 1) { #ifdef SMP if (assign_cpu) intr_assign_next_cpu(isrc); #endif - mtx_unlock_spin(&intr_table_lock); isrc->is_pic->pic_enable_intr(isrc); - } else - mtx_unlock_spin(&intr_table_lock); - isrc->is_pic->pic_enable_source(isrc); + isrc->is_pic->pic_enable_source(isrc); + } + sx_xunlock(&intr_table_lock); } return (error); } @@ -196,8 +209,16 @@ isrc = intr_handler_source(cookie); error = intr_event_remove_handler(cookie); - if (error == 0) + if (error == 0) { + sx_xlock(&intr_table_lock); + isrc->is_handlers--; + if (isrc->is_handlers == 0) { + isrc->is_pic->pic_disable_source(isrc, PIC_NO_EOI); + isrc->is_pic->pic_disable_intr(isrc); + } intrcnt_updatename(isrc); + sx_xunlock(&intr_table_lock); + } return (error); } @@ -212,11 +233,82 @@ return (isrc->is_pic->pic_config_intr(isrc, trig, pol)); } +#ifdef INTR_FILTER void intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame) { struct thread *td; struct intr_event *ie; + int vector; + + td = curthread; + + /* + * We count software interrupts when we process them. The + * code here follows previous practice, but there's an + * argument for counting hardware interrupts when they're + * processed too. + */ + (*isrc->is_count)++; + PCPU_LAZY_INC(cnt.v_intr); + + ie = isrc->is_event; + + /* + * XXX: We assume that IRQ 0 is only used for the ISA timer + * device (clk). + */ + vector = isrc->is_pic->pic_vector(isrc); + if (vector == 0) + clkintr_pending = 1; + + if (intr_event_handle(ie, frame) != 0) + intr_event_stray(isrc); +} + +static void +intr_event_stray(void *cookie) +{ + struct intsrc *isrc; + + isrc = cookie; + /* + * For stray interrupts, mask and EOI the source, bump the + * stray count, and log the condition. + */ + isrc->is_pic->pic_disable_source(isrc, PIC_EOI); + (*isrc->is_straycount)++; + if (*isrc->is_straycount < MAX_STRAY_LOG) + log(LOG_ERR, "stray irq%d\n", isrc->is_pic->pic_vector(isrc)); + else if (*isrc->is_straycount == MAX_STRAY_LOG) + log(LOG_CRIT, + "too many stray irq %d's: not logging anymore\n", + isrc->is_pic->pic_vector(isrc)); +} + +static void +intr_eoi_src(void *arg) +{ + struct intsrc *isrc; + + isrc = arg; + isrc->is_pic->pic_eoi_source(isrc); +} + +static void +intr_disab_eoi_src(void *arg) +{ + struct intsrc *isrc; + + isrc = arg; + isrc->is_pic->pic_disable_source(isrc, PIC_EOI); +} +#else +void +intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame) +{ + struct thread *td; + struct intr_event *ie; struct intr_handler *ih; int error, vector, thread; @@ -298,6 +390,7 @@ } td->td_intr_nesting_level--; } +#endif void intr_resume(void) @@ -307,12 +400,12 @@ #ifndef DEV_ATPIC atpic_reset(); #endif - mtx_lock_spin(&intr_table_lock); + sx_xlock(&intr_table_lock); STAILQ_FOREACH(pic, &pics, pics) { if (pic->pic_resume != NULL) pic->pic_resume(pic); } - mtx_unlock_spin(&intr_table_lock); + sx_xunlock(&intr_table_lock); } void @@ -320,12 +413,12 @@ { struct pic *pic; - mtx_lock_spin(&intr_table_lock); + sx_xlock(&intr_table_lock); STAILQ_FOREACH(pic, &pics, pics) { if (pic->pic_suspend != NULL) pic->pic_suspend(pic); } - mtx_unlock_spin(&intr_table_lock); + sx_xunlock(&intr_table_lock); } static void @@ -348,8 +441,8 @@ { char straystr[MAXCOMLEN + 1]; - /* mtx_assert(&intr_table_lock, MA_OWNED); */ KASSERT(is->is_event != NULL, ("%s: isrc with no event", __func__)); + mtx_lock_spin(&intrcnt_lock); is->is_index = intrcnt_index; intrcnt_index += 2; snprintf(straystr, MAXCOMLEN + 1, "stray irq%d", @@ -358,17 +451,18 @@ is->is_count = &intrcnt[is->is_index]; intrcnt_setname(straystr, is->is_index + 1); is->is_straycount = &intrcnt[is->is_index + 1]; + mtx_unlock_spin(&intrcnt_lock); } void intrcnt_add(const char *name, u_long **countp) { - mtx_lock_spin(&intr_table_lock); + mtx_lock_spin(&intrcnt_lock); *countp = &intrcnt[intrcnt_index]; intrcnt_setname(name, intrcnt_index); intrcnt_index++; - mtx_unlock_spin(&intr_table_lock); + mtx_unlock_spin(&intrcnt_lock); } static void @@ -378,7 +472,8 @@ intrcnt_setname("???", 0); intrcnt_index = 1; STAILQ_INIT(&pics); - mtx_init(&intr_table_lock, "intr table", NULL, MTX_SPIN); + sx_init(&intr_table_lock, "intr sources"); + mtx_init(&intrcnt_lock, "intrcnt", NULL, MTX_SPIN); } SYSINIT(intr_init, SI_SUB_INTR, SI_ORDER_FIRST, intr_init, NULL) @@ -486,14 +581,14 @@ return; /* Round-robin assign a CPU to each enabled source. */ - mtx_lock_spin(&intr_table_lock); + sx_xlock(&intr_table_lock); assign_cpu = 1; for (i = 0; i < NUM_IO_INTS; i++) { isrc = interrupt_sources[i]; - if (isrc != NULL && isrc->is_enabled) + if (isrc != NULL && isrc->is_handlers > 0) intr_assign_next_cpu(isrc); } - mtx_unlock_spin(&intr_table_lock); + sx_xunlock(&intr_table_lock); } SYSINIT(intr_shuffle_irqs, SI_SUB_SMP, SI_ORDER_SECOND, intr_shuffle_irqs, NULL) #endif ==== //depot/projects/usb/src/sys/amd64/amd64/io_apic.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.29 2007/03/20 21:53:30 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.30 2007/05/08 21:29:12 jhb Exp $"); #include "opt_isa.h" @@ -114,6 +114,7 @@ static void ioapic_disable_source(struct intsrc *isrc, int eoi); static void ioapic_eoi_source(struct intsrc *isrc); static void ioapic_enable_intr(struct intsrc *isrc); +static void ioapic_disable_intr(struct intsrc *isrc); static int ioapic_vector(struct intsrc *isrc); static int ioapic_source_pending(struct intsrc *isrc); static int ioapic_config_intr(struct intsrc *isrc, enum intr_trigger trig, @@ -125,8 +126,8 @@ static STAILQ_HEAD(,ioapic) ioapic_list = STAILQ_HEAD_INITIALIZER(ioapic_list); struct pic ioapic_template = { ioapic_enable_source, ioapic_disable_source, ioapic_eoi_source, ioapic_enable_intr, - ioapic_vector, ioapic_source_pending, - NULL, ioapic_resume, + ioapic_disable_intr, ioapic_vector, + ioapic_source_pending, NULL, ioapic_resume, ioapic_config_intr, ioapic_assign_cpu }; static int next_ioapic_base; @@ -359,6 +360,23 @@ } } +static void +ioapic_disable_intr(struct intsrc *isrc) +{ + struct ioapic_intsrc *intpin = (struct ioapic_intsrc *)isrc; + u_int vector; + + if (intpin->io_vector != 0) { + /* Mask this interrupt pin and free its APIC vector. */ + vector = intpin->io_vector; + apic_disable_vector(vector); + intpin->io_masked = 1; + intpin->io_vector = 0; + ioapic_program_intpin(intpin); + apic_free_vector(vector, intpin->io_irq); + } +} + static int ioapic_vector(struct intsrc *isrc) { ==== //depot/projects/usb/src/sys/amd64/amd64/local_apic.c#5 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.38 2007/04/25 19:58:41 ariff Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.40 2007/05/08 22:01:02 jhb Exp $"); #include "opt_hwpmc_hooks.h" @@ -65,13 +65,6 @@ #include #endif -/* - * We can handle up to 60 APICs via our logical cluster IDs, but currently - * the physical IDs on Intel processors up to the Pentium 4 are limited to - * 16. - */ -#define MAX_APICID 16 - /* Sanity checks on IDT vectors. */ CTASSERT(APIC_IO_INTS + APIC_NUM_IOINTS == APIC_TIMER_INT); CTASSERT(APIC_TIMER_INT < APIC_LOCAL_INTS); @@ -114,7 +107,7 @@ u_long la_hard_ticks; u_long la_stat_ticks; u_long la_prof_ticks; -} static lapics[MAX_APICID]; +} static lapics[MAX_APIC_ID + 1]; /* XXX: should thermal be an NMI? */ @@ -147,6 +140,8 @@ APIC_TDCR_32, APIC_TDCR_64, APIC_TDCR_128 }; +extern inthand_t IDTVEC(rsvd); + volatile lapic_t *lapic; vm_paddr_t lapic_paddr; static u_long lapic_timer_divisor, lapic_timer_period, lapic_timer_hz; @@ -238,7 +233,7 @@ { int i; - if (apic_id >= MAX_APICID) { + if (apic_id > MAX_APIC_ID) { printf("APIC: Ignoring local APIC with ID %d\n", apic_id); if (boot_cpu) panic("Can't ignore BSP"); @@ -837,6 +832,16 @@ setidt(vector, ioint_handlers[vector / 32], SDT_SYSIGT, SEL_KPL, 0); } +void +apic_disable_vector(u_int vector) +{ + + KASSERT(vector != IDT_SYSCALL, ("Attempt to overwrite syscall entry")); + KASSERT(ioint_handlers[vector / 32] != NULL, + ("No ISR handler for vector %u", vector)); + setidt(vector, &IDTVEC(rsvd), SDT_SYSIGT, SEL_KPL, 0); +} + /* Release an APIC vector when it's no longer in use. */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat May 19 18:24:16 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E938F16A474; Sat, 19 May 2007 18:24:15 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 9705316A41F for ; Sat, 19 May 2007 18:24:15 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 8737013C448 for ; Sat, 19 May 2007 18:24:15 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4JIOFNq012224 for ; Sat, 19 May 2007 18:24:15 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4JIOFSm012174 for perforce@freebsd.org; Sat, 19 May 2007 18:24:15 GMT (envelope-from mjacob@freebsd.org) Date: Sat, 19 May 2007 18:24:15 GMT Message-Id: <200705191824.l4JIOFSm012174@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 120065 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: Sat, 19 May 2007 18:24:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=120065 Change 120065 by mjacob@mjexp on 2007/05/19 18:24:03 If we're going to complain about a downrev, if KDB is defined show a backtrace so we can find out who is doen this. Affected files ... .. //depot/projects/mjexp/sys/cam/cam_xpt.c#12 edit Differences ... ==== //depot/projects/mjexp/sys/cam/cam_xpt.c#12 (text+ko) ==== @@ -66,6 +66,9 @@ #include #include #include /* for xpt_print below */ +#ifdef KDB +#include +#endif #include "opt_cam.h" /* Datastructures internal to the xpt layer */ @@ -6474,15 +6477,21 @@ if (cts->protocol != device->protocol) { xpt_print(cts->ccb_h.path, "Uninitialized Protocol %x:%x?\n", cts->protocol, device->protocol); +#ifdef KDB + kdb_backtrace(); +#endif cts->protocol = device->protocol; } if (cts->protocol_version > device->protocol_version) { if (bootverbose) { - xpt_print(cts->ccb_h.path, "Down reving Protocol " + xpt_print(cts->ccb_h.path, "Down-reving Protocol " "Version from %d to %d?\n", cts->protocol_version, device->protocol_version); } +#ifdef KDB + kdb_backtrace(); +#endif cts->protocol_version = device->protocol_version; } @@ -6499,15 +6508,21 @@ if (cts->transport != device->transport) { xpt_print(cts->ccb_h.path, "Uninitialized Transport %x:%x?\n", cts->transport, device->transport); +#ifdef KDB + kdb_backtrace(); +#endif cts->transport = device->transport; } if (cts->transport_version > device->transport_version) { if (bootverbose) { - xpt_print(cts->ccb_h.path, "Down reving Transport " + xpt_print(cts->ccb_h.path, "Down-reving Transport " "Version from %d to %d?\n", cts->transport_version, device->transport_version); } +#ifdef KDB + kdb_backtrace(); +#endif cts->transport_version = device->transport_version; } From owner-p4-projects@FreeBSD.ORG Sat May 19 18:26:19 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6B74716A421; Sat, 19 May 2007 18:26:19 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 048A716A46C for ; Sat, 19 May 2007 18:26:19 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E804313C4AD for ; Sat, 19 May 2007 18:26:18 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4JIQITw021691 for ; Sat, 19 May 2007 18:26:18 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4JIQINs021650 for perforce@freebsd.org; Sat, 19 May 2007 18:26:18 GMT (envelope-from mjacob@freebsd.org) Date: Sat, 19 May 2007 18:26:18 GMT Message-Id: <200705191826.l4JIQINs021650@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 120066 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: Sat, 19 May 2007 18:26:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=120066 Change 120066 by mjacob@mjexp on 2007/05/19 18:25:21 Note integrated raid completion and do some LOR fixes. Affected files ... .. //depot/projects/mjexp/sys/dev/mpt/mpt_raid.c#8 edit Differences ... ==== //depot/projects/mjexp/sys/dev/mpt/mpt_raid.c#8 (text+ko) ==== @@ -368,6 +368,11 @@ int i; int print_event; + if (msg->Event == MPI_EVENT_IR_RESYNC_UPDATE) { + mpt_prt(mpt, "IR resync update %d completed.", + (le32toh(msg->Data[0]) > 16) & 0xff); + return (1); + } if (msg->Event != MPI_EVENT_INTEGRATED_RAID) { return (0); } @@ -701,19 +706,20 @@ mpt->raid_rescan = 0; + MPTLOCK_2_CAMLOCK(mpt); ccb = malloc(sizeof(*ccb), M_DEVBUF, M_WAITOK); error = xpt_create_path(&path, xpt_periph, cam_sim_path(mpt->phydisk_sim), CAM_TARGET_WILDCARD, CAM_LUN_WILDCARD); if (error != CAM_REQ_CMP) { free(ccb, M_DEVBUF); + CAMLOCK_2_MPTLOCK(mpt); mpt_prt(mpt, "Unable to rescan RAID Bus!\n"); } else { xpt_setup_ccb(&ccb->ccb_h, path, 5); ccb->ccb_h.func_code = XPT_SCAN_BUS; ccb->ccb_h.cbfcnp = mpt_cam_rescan_callback; ccb->crcn.flags = CAM_FLAG_NONE; - MPTLOCK_2_CAMLOCK(mpt); xpt_action(ccb); CAMLOCK_2_MPTLOCK(mpt); } From owner-p4-projects@FreeBSD.ORG Sat May 19 18:30:30 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EE85A16A46F; Sat, 19 May 2007 18:30:29 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id AB5D616A46C for ; Sat, 19 May 2007 18:30:29 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 958D213C484 for ; Sat, 19 May 2007 18:30:29 +0000 (UTC) (envelope-from mjacob@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4JIUTaE037828 for ; Sat, 19 May 2007 18:30:29 GMT (envelope-from mjacob@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4JIUOfr037575 for perforce@freebsd.org; Sat, 19 May 2007 18:30:24 GMT (envelope-from mjacob@freebsd.org) Date: Sat, 19 May 2007 18:30:24 GMT Message-Id: <200705191830.l4JIUOfr037575@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to mjacob@freebsd.org using -f From: Matt Jacob To: Perforce Change Reviews Cc: Subject: PERFORCE change 120068 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: Sat, 19 May 2007 18:30:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=120068 Change 120068 by mjacob@mjexp on 2007/05/19 18:29:48 IFC Affected files ... .. //depot/projects/mjexp/sys/amd64/amd64/machdep.c#10 integrate .. //depot/projects/mjexp/sys/amd64/amd64/mp_machdep.c#8 integrate .. //depot/projects/mjexp/sys/amd64/amd64/pmap.c#11 integrate .. //depot/projects/mjexp/sys/amd64/include/md_var.h#3 integrate .. //depot/projects/mjexp/sys/amd64/include/smp.h#3 integrate .. //depot/projects/mjexp/sys/arm/arm/busdma_machdep.c#4 integrate .. //depot/projects/mjexp/sys/arm/arm/machdep.c#3 integrate .. //depot/projects/mjexp/sys/arm/arm/pmap.c#5 integrate .. //depot/projects/mjexp/sys/arm/include/asm.h#2 integrate .. //depot/projects/mjexp/sys/arm/include/pmap.h#4 integrate .. //depot/projects/mjexp/sys/arm/include/profile.h#2 integrate .. //depot/projects/mjexp/sys/boot/i386/boot2/Makefile#2 integrate .. //depot/projects/mjexp/sys/cam/scsi/scsi_da.c#12 integrate .. //depot/projects/mjexp/sys/coda/coda_vnops.c#4 integrate .. //depot/projects/mjexp/sys/coda/coda_vnops.h#3 integrate .. //depot/projects/mjexp/sys/compat/linprocfs/linprocfs.c#13 integrate .. //depot/projects/mjexp/sys/compat/linux/linux_misc.c#11 integrate .. //depot/projects/mjexp/sys/compat/svr4/svr4_misc.c#4 integrate .. //depot/projects/mjexp/sys/conf/kern.mk#3 integrate .. //depot/projects/mjexp/sys/conf/kern.pre.mk#5 integrate .. //depot/projects/mjexp/sys/conf/kmod.mk#7 integrate .. //depot/projects/mjexp/sys/dev/sound/isa/mss.c#6 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/envy24.c#8 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/envy24ht.c#7 integrate .. //depot/projects/mjexp/sys/dev/sound/pci/fm801.c#4 integrate .. //depot/projects/mjexp/sys/dev/twa/tw_osl.h#3 integrate .. //depot/projects/mjexp/sys/dev/twa/tw_osl_share.h#4 integrate .. //depot/projects/mjexp/sys/dev/usb/ufoma.c#2 integrate .. //depot/projects/mjexp/sys/fs/nullfs/null_vnops.c#4 integrate .. //depot/projects/mjexp/sys/fs/smbfs/smbfs_io.c#2 integrate .. //depot/projects/mjexp/sys/fs/umapfs/umap_vnops.c#3 integrate .. //depot/projects/mjexp/sys/fs/unionfs/union_vnops.c#5 integrate .. //depot/projects/mjexp/sys/i386/i386/machdep.c#11 integrate .. //depot/projects/mjexp/sys/i386/i386/pmap.c#12 integrate .. //depot/projects/mjexp/sys/i386/include/smp.h#3 integrate .. //depot/projects/mjexp/sys/ia64/ia64/exception.S#2 integrate .. //depot/projects/mjexp/sys/ia64/ia64/machdep.c#7 integrate .. //depot/projects/mjexp/sys/ia64/ia64/mca.c#2 integrate .. //depot/projects/mjexp/sys/ia64/ia64/pmap.c#6 integrate .. //depot/projects/mjexp/sys/kern/init_main.c#9 integrate .. //depot/projects/mjexp/sys/kern/kern_fork.c#10 integrate .. //depot/projects/mjexp/sys/kern/kern_lock.c#8 integrate .. //depot/projects/mjexp/sys/kern/kern_malloc.c#4 integrate .. //depot/projects/mjexp/sys/kern/kern_mib.c#5 integrate .. //depot/projects/mjexp/sys/kern/kern_mutex.c#9 integrate .. //depot/projects/mjexp/sys/kern/kern_rwlock.c#8 integrate .. //depot/projects/mjexp/sys/kern/kern_sx.c#9 integrate .. //depot/projects/mjexp/sys/kern/kern_synch.c#13 integrate .. //depot/projects/mjexp/sys/kern/kern_thread.c#8 integrate .. //depot/projects/mjexp/sys/kern/subr_lock.c#6 integrate .. //depot/projects/mjexp/sys/kern/subr_sleepqueue.c#4 integrate .. //depot/projects/mjexp/sys/kern/subr_trap.c#7 integrate .. //depot/projects/mjexp/sys/kern/subr_turnstile.c#4 integrate .. //depot/projects/mjexp/sys/kern/vfs_bio.c#11 integrate .. //depot/projects/mjexp/sys/kern/vfs_default.c#5 integrate .. //depot/projects/mjexp/sys/kern/vfs_subr.c#8 integrate .. //depot/projects/mjexp/sys/kern/vfs_vnops.c#6 integrate .. //depot/projects/mjexp/sys/kern/vnode_if.src#4 integrate .. //depot/projects/mjexp/sys/net/ieee8023ad_lacp.c#5 integrate .. //depot/projects/mjexp/sys/net/ieee8023ad_lacp.h#5 integrate .. //depot/projects/mjexp/sys/net/if_fwsubr.c#3 integrate .. //depot/projects/mjexp/sys/net/if_lagg.c#4 integrate .. //depot/projects/mjexp/sys/netgraph/ng_fec.c#2 integrate .. //depot/projects/mjexp/sys/netgraph/ng_mppc.c#3 integrate .. //depot/projects/mjexp/sys/netinet/tcp.h#5 integrate .. //depot/projects/mjexp/sys/netinet/tcp_input.c#15 integrate .. //depot/projects/mjexp/sys/netinet/tcp_output.c#10 integrate .. //depot/projects/mjexp/sys/netinet/tcp_subr.c#12 integrate .. //depot/projects/mjexp/sys/netinet/tcp_syncache.c#10 integrate .. //depot/projects/mjexp/sys/netinet/tcp_var.h#9 integrate .. //depot/projects/mjexp/sys/nfsclient/nfs_bio.c#3 integrate .. //depot/projects/mjexp/sys/nfsclient/nfs_socket.c#7 integrate .. //depot/projects/mjexp/sys/pc98/pc98/machdep.c#10 integrate .. //depot/projects/mjexp/sys/powerpc/powerpc/machdep.c#6 integrate .. //depot/projects/mjexp/sys/sparc64/include/smp.h#2 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/machdep.c#7 integrate .. //depot/projects/mjexp/sys/sparc64/sparc64/pmap.c#3 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/machdep.c#5 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/pmap.c#7 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/tsb.c#5 integrate .. //depot/projects/mjexp/sys/sun4v/sun4v/tte_hash.c#4 integrate .. //depot/projects/mjexp/sys/sys/param.h#17 integrate .. //depot/projects/mjexp/sys/sys/sx.h#7 integrate .. //depot/projects/mjexp/sys/sys/sysctl.h#3 integrate .. //depot/projects/mjexp/sys/sys/vmmeter.h#3 integrate .. //depot/projects/mjexp/sys/sys/vnode.h#7 integrate .. //depot/projects/mjexp/sys/ufs/ffs/ffs_vnops.c#9 integrate .. //depot/projects/mjexp/sys/vm/swap_pager.c#8 integrate .. //depot/projects/mjexp/sys/vm/uma_core.c#7 integrate .. //depot/projects/mjexp/sys/vm/vm_contig.c#7 integrate .. //depot/projects/mjexp/sys/vm/vm_fault.c#7 integrate .. //depot/projects/mjexp/sys/vm/vm_glue.c#6 integrate .. //depot/projects/mjexp/sys/vm/vm_map.c#6 integrate .. //depot/projects/mjexp/sys/vm/vm_meter.c#3 integrate .. //depot/projects/mjexp/sys/vm/vm_mmap.c#4 integrate .. //depot/projects/mjexp/sys/vm/vm_object.c#8 integrate .. //depot/projects/mjexp/sys/vm/vm_page.c#10 integrate .. //depot/projects/mjexp/sys/vm/vm_pageout.c#5 integrate .. //depot/projects/mjexp/sys/vm/vm_pageq.c#3 integrate .. //depot/projects/mjexp/sys/vm/vm_zeroidle.c#7 integrate .. //depot/projects/mjexp/sys/vm/vnode_pager.c#3 integrate Differences ... ==== //depot/projects/mjexp/sys/amd64/amd64/machdep.c#10 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.670 2007/03/30 00:06:20 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.671 2007/05/18 07:10:42 jeff Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -221,8 +221,8 @@ vm_ksubmap_init(&kmi); printf("avail memory = %ju (%ju MB)\n", - ptoa((uintmax_t)cnt.v_free_count), - ptoa((uintmax_t)cnt.v_free_count) / 1048576); + ptoa((uintmax_t)VMCNT_GET(free_count)), + ptoa((uintmax_t)VMCNT_GET(free_count)) / 1048576); /* * Set up buffers, so they can be used to read disk labels. ==== //depot/projects/mjexp/sys/amd64/amd64/mp_machdep.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.284 2007/05/08 22:01:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.285 2007/05/19 05:03:59 kan Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -80,6 +80,8 @@ int boot_cpu_id = -1; /* designated BSP */ extern int nkpt; +extern struct pcpu __pcpu[]; + /* * CPU topology map datastructures for HTT. */ ==== //depot/projects/mjexp/sys/amd64/amd64/pmap.c#11 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.584 2007/04/25 18:10:43 ups Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.585 2007/05/18 07:10:43 jeff Exp $"); /* * Manages physical address maps. @@ -620,7 +620,7 @@ * numbers of pv entries. */ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); - pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; + pv_entry_max = shpgperproc * maxproc + VMCNT_GET(page_count); TUNABLE_INT_FETCH("vm.pmap.pv_entries", &pv_entry_max); pv_entry_high_water = 9 * (pv_entry_max / 10); } @@ -633,7 +633,7 @@ error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req); if (error == 0 && req->newptr) { - shpgperproc = (pv_entry_max - cnt.v_page_count) / maxproc; + shpgperproc = (pv_entry_max - VMCNT_GET(page_count)) / maxproc; pv_entry_high_water = 9 * (pv_entry_max / 10); } return (error); @@ -648,7 +648,7 @@ error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req); if (error == 0 && req->newptr) { - pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; + pv_entry_max = shpgperproc * maxproc + VMCNT_GET(page_count); pv_entry_high_water = 9 * (pv_entry_max / 10); } return (error); @@ -1149,8 +1149,7 @@ */ m->right = *free; *free = m; - - atomic_subtract_int(&cnt.v_wire_count, 1); + VMCNT_DEC(wire_count, 1); return 1; } @@ -1460,7 +1459,7 @@ pmap->pm_pml4[PML4PML4I] = 0; /* Recursive Mapping */ m->wire_count--; - atomic_subtract_int(&cnt.v_wire_count, 1); + VMCNT_DEC(wire_count, 1); vm_page_free_zero(m); PMAP_LOCK_DESTROY(pmap); } ==== //depot/projects/mjexp/sys/amd64/include/md_var.h#3 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.80 2007/01/18 05:46:32 rodrigc Exp $ + * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.81 2007/05/19 05:03:59 kan Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -57,8 +57,6 @@ extern uint64_t *vm_page_dump; extern int vm_page_dump_size; -extern struct pcpu __pcpu[]; - typedef void alias_for_inthand_t(u_int cs, u_int ef, u_int esp, u_int ss); struct thread; struct reg; ==== //depot/projects/mjexp/sys/amd64/include/smp.h#3 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/amd64/include/smp.h,v 1.89 2007/03/06 17:16:46 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/smp.h,v 1.90 2007/05/19 05:01:43 kan Exp $ * */ @@ -23,6 +23,7 @@ #include #include #include +#include /* global symbols in mpboot.S */ extern char mptramp_start[]; ==== //depot/projects/mjexp/sys/arm/arm/busdma_machdep.c#4 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.29 2007/02/13 07:19:26 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.30 2007/05/19 13:17:31 cognet Exp $"); /* * ARM bus dma support routines @@ -1003,7 +1003,7 @@ bus_dmamap_callback2_t *callback, void *callback_arg, int flags) { - vm_offset_t lastaddr; + vm_offset_t lastaddr = 0; #ifdef __CC_SUPPORTS_DYNAMIC_ARRAY_INIT bus_dma_segment_t dm_segments[dmat->nsegments]; #else @@ -1079,7 +1079,7 @@ return; } -static __inline void +static void bus_dmamap_sync_buf(void *buf, int len, bus_dmasync_op_t op) { char _tmp_cl[arm_dcache_align], _tmp_clend[arm_dcache_align]; ==== //depot/projects/mjexp/sys/arm/arm/machdep.c#3 (text+ko) ==== @@ -44,7 +44,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.25 2007/02/14 04:41:28 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.27 2007/05/19 13:32:58 cognet Exp $"); #include #include @@ -286,8 +286,8 @@ vm_ksubmap_init(&kmi); printf("avail memory = %ju (%ju MB)\n", - (uintmax_t)ptoa(cnt.v_free_count), - (uintmax_t)ptoa(cnt.v_free_count) / 1048576); + (uintmax_t)ptoa(VMCNT_GET(free_count)), + (uintmax_t)ptoa(VMCNT_GET(free_count)) / 1048576); bufinit(); vm_pager_bufferinit(); @@ -547,7 +547,7 @@ set_mcontext(struct thread *td, const mcontext_t *mcp) { struct trapframe *tf = td->td_frame; - __greg_t *gr = mcp->__gregs; + const __greg_t *gr = mcp->__gregs; tf->tf_r0 = gr[_REG_R0]; tf->tf_r1 = gr[_REG_R1]; ==== //depot/projects/mjexp/sys/arm/arm/pmap.c#5 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.78 2007/02/05 10:33:39 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.81 2007/05/19 13:21:41 cognet Exp $"); #include #include #include @@ -431,10 +431,10 @@ l1->l1_kva = l1pt; l1->l1_domain_use_count = 0; - l1->l1_domain_first = 0; + l1->l1_domain_first = 1; for (i = 0; i < PMAP_DOMAINS; i++) - l1->l1_domain_free[i] = i + 1; + l1->l1_domain_free[i] = i + 2; /* * Copy the kernel's L1 entries to each new L1. @@ -1970,7 +1970,7 @@ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); - pv_entry_max = shpgperproc * maxproc + cnt.v_page_count; + pv_entry_max = shpgperproc * maxproc + VMCNT_GET(page_count); pv_entry_high_water = 9 * (pv_entry_max / 10); l2zone = uma_zcreate("L2 Table", L2_TABLE_SIZE_REAL, pmap_l2ptp_ctor, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM | UMA_ZONE_NOFREE); @@ -2910,7 +2910,7 @@ /* * remove a page rom the kernel pagetables */ -PMAP_INLINE void +void pmap_kremove(vm_offset_t va) { struct l2_bucket *l2b; ==== //depot/projects/mjexp/sys/arm/include/asm.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * * from: @(#)asm.h 5.5 (Berkeley) 5/7/91 * - * $FreeBSD: src/sys/arm/include/asm.h,v 1.5 2006/08/30 11:45:07 cognet Exp $ + * $FreeBSD: src/sys/arm/include/asm.h,v 1.6 2007/05/19 16:20:37 cognet Exp $ */ #ifndef _MACHINE_ASM_H_ @@ -80,7 +80,7 @@ #ifdef GPROF # define _PROF_PROLOGUE \ - mov ip, lr; bl _mcount + mov ip, lr; bl __mcount #else # define _PROF_PROLOGUE #endif ==== //depot/projects/mjexp/sys/arm/include/pmap.h#4 (text+ko) ==== @@ -44,7 +44,7 @@ * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: FreeBSD: src/sys/i386/include/pmap.h,v 1.70 2000/11/30 * - * $FreeBSD: src/sys/arm/include/pmap.h,v 1.24 2007/01/17 00:53:05 cognet Exp $ + * $FreeBSD: src/sys/arm/include/pmap.h,v 1.25 2007/05/19 12:47:34 cognet Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -237,8 +237,8 @@ /* * Definitions for MMU domains */ -#define PMAP_DOMAINS 15 /* 15 'user' domains (0-14) */ -#define PMAP_DOMAIN_KERNEL 15 /* The kernel uses domain #15 */ +#define PMAP_DOMAINS 15 /* 15 'user' domains (1-15) */ +#define PMAP_DOMAIN_KERNEL 0 /* The kernel uses domain #0 */ /* * The new pmap ensures that page-tables are always mapping Write-Thru. ==== //depot/projects/mjexp/sys/arm/include/profile.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)profile.h 8.1 (Berkeley) 6/11/93 - * $FreeBSD: src/sys/arm/include/profile.h,v 1.6 2005/01/05 21:58:48 imp Exp $ + * $FreeBSD: src/sys/arm/include/profile.h,v 1.7 2007/05/19 16:20:37 cognet Exp $ */ #ifndef _MACHINE_PROFILE_H_ @@ -61,9 +61,9 @@ #define MCOUNT \ __asm__(".text"); \ __asm__(".align 0"); \ - __asm__(".type _mcount ,%function"); \ - __asm__(".global _mcount"); \ - __asm__("_mcount:"); \ + __asm__(".type __mcount ,%function"); \ + __asm__(".global __mcount"); \ + __asm__("__mcount:"); \ /* \ * Preserve registers that are trashed during mcount \ */ \ ==== //depot/projects/mjexp/sys/boot/i386/boot2/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.59 2005/07/15 12:22:14 ache Exp $ +# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.60 2007/05/19 05:07:47 kan Exp $ FILES= boot boot1 boot2 @@ -36,7 +36,8 @@ -I${.CURDIR}/../btx/lib -I. \ -Wall -Waggregate-return -Wbad-function-cast -Wcast-align \ -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ - -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings + -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ + -Winline --param max-inline-insns-single=100 LDFLAGS=-static -N --gc-sections ==== //depot/projects/mjexp/sys/cam/scsi/scsi_da.c#12 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.210 2007/05/16 16:54:23 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.211 2007/05/18 21:58:07 mjacob Exp $"); #include ==== //depot/projects/mjexp/sys/coda/coda_vnops.c#4 (text+ko) ==== @@ -42,7 +42,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/coda/coda_vnops.c,v 1.70 2007/03/13 01:50:21 tegge Exp $"); +__FBSDID("$FreeBSD: src/sys/coda/coda_vnops.c,v 1.71 2007/05/18 13:02:12 kib Exp $"); #include #include @@ -129,7 +129,7 @@ .vop_readlink = coda_readlink, /* readlink */ .vop_inactive = coda_inactive, /* inactive */ .vop_reclaim = coda_reclaim, /* reclaim */ - ._vop_lock = coda_lock, /* lock */ + .vop_lock1 = coda_lock, /* lock */ .vop_unlock = coda_unlock, /* unlock */ .vop_bmap = coda_bmap, /* bmap */ .vop_print = VOP_PANIC, /* print */ @@ -1627,7 +1627,7 @@ } int -coda_lock(struct _vop_lock_args *ap) +coda_lock(struct vop_lock1_args *ap) { /* true args */ struct vnode *vp = ap->a_vp; ==== //depot/projects/mjexp/sys/coda/coda_vnops.h#3 (text+ko) ==== @@ -27,7 +27,7 @@ * Mellon the rights to redistribute these changes without encumbrance. * * @(#) src/sys/coda/coda_vnops.h,v 1.1.1.1 1998/08/29 21:14:52 rvb Exp $ - * $FreeBSD: src/sys/coda/coda_vnops.h,v 1.17 2006/11/13 05:51:21 kmacy Exp $ + * $FreeBSD: src/sys/coda/coda_vnops.h,v 1.18 2007/05/18 13:02:12 kib Exp $ * */ @@ -72,7 +72,7 @@ vop_bmap_t coda_bmap; vop_strategy_t coda_strategy; vop_reclaim_t coda_reclaim; -_vop_lock_t coda_lock; +vop_lock1_t coda_lock; vop_unlock_t coda_unlock; vop_islocked_t coda_islocked; int coda_vop_error(void *); ==== //depot/projects/mjexp/sys/compat/linprocfs/linprocfs.c#13 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.112 2007/05/01 03:09:57 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linprocfs/linprocfs.c,v 1.113 2007/05/18 07:10:43 jeff Exp $"); #include #include @@ -146,14 +146,14 @@ /* * The correct thing here would be: * - memfree = cnt.v_free_count * PAGE_SIZE; + memfree = VMCNT_GET(free_count) * PAGE_SIZE; memused = memtotal - memfree; * * but it might mislead linux binaries into thinking there * is very little memory left, so we cheat and tell them that * all memory that isn't wired down is free. */ - memused = cnt.v_wire_count * PAGE_SIZE; + memused = VMCNT_GET(wire_count) * PAGE_SIZE; memfree = memtotal - memused; swap_pager_status(&i, &j); swaptotal = (unsigned long long)i * PAGE_SIZE; @@ -175,7 +175,7 @@ * like unstaticizing it just for linprocfs's sake. */ buffers = 0; - cached = cnt.v_cache_count * PAGE_SIZE; + cached = VMCNT_GET(cache_count) * PAGE_SIZE; sbuf_printf(sb, " total: used: free: shared: buffers: cached:\n" @@ -394,12 +394,12 @@ "intr %u\n" "ctxt %u\n" "btime %lld\n", - cnt.v_vnodepgsin, - cnt.v_vnodepgsout, - cnt.v_swappgsin, - cnt.v_swappgsout, - cnt.v_intr, - cnt.v_swtch, + VMCNT_GET(vnodepgsin), + VMCNT_GET(vnodepgsout), + VMCNT_GET(swappgsin), + VMCNT_GET(swappgsout), + VMCNT_GET(intr), + VMCNT_GET(swtch), (long long)boottime.tv_sec); return (0); } ==== //depot/projects/mjexp/sys/compat/linux/linux_misc.c#11 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.208 2007/02/24 16:49:24 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.209 2007/05/18 07:10:43 jeff Exp $"); #include "opt_compat.h" #include "opt_mac.h" @@ -139,7 +139,7 @@ LINUX_SYSINFO_LOADS_SCALE / averunnable.fscale; sysinfo.totalram = physmem * PAGE_SIZE; - sysinfo.freeram = sysinfo.totalram - cnt.v_wire_count * PAGE_SIZE; + sysinfo.freeram = sysinfo.totalram - VMCNT_GET(wire_count) * PAGE_SIZE; sysinfo.sharedram = 0; mtx_lock(&vm_object_list_mtx); ==== //depot/projects/mjexp/sys/compat/svr4/svr4_misc.c#4 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.91 2006/11/06 13:41:50 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.92 2007/05/18 07:10:44 jeff Exp $"); #include "opt_mac.h" @@ -778,14 +778,14 @@ #if defined(UVM) *retval = uvmexp.free; /* XXX: free instead of total */ #else - *retval = cnt.v_free_count; /* XXX: free instead of total */ + *retval = VMCNT_GET(free_count); /* XXX: free instead of total */ #endif break; case SVR4_CONFIG_AVPHYS_PAGES: #if defined(UVM) *retval = uvmexp.active; /* XXX: active instead of avg */ #else - *retval = cnt.v_active_count; /* XXX: active instead of avg */ + *retval = VMCNT_GET(active_count); /* XXX: active instead of avg */ #endif break; #endif /* NOTYET */ ==== //depot/projects/mjexp/sys/conf/kern.mk#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.mk,v 1.50 2006/11/26 23:16:46 kmacy Exp $ +# $FreeBSD: src/sys/conf/kern.mk,v 1.51 2007/05/19 04:45:54 kan Exp $ # # Warning flags for compiling the kernel and components of the kernel. @@ -12,7 +12,7 @@ .else CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ - ${_wundef} -fformat-extensions + ${_wundef} -Wno-pointer-sign -fformat-extensions .if !defined(NO_UNDEF) _wundef= -Wundef .endif @@ -46,7 +46,7 @@ # a very small subset of float registers for integer divides. # .if ${MACHINE_ARCH} == "ia64" -CFLAGS+= -ffixed-r13 -mfixed-range=f32-f127 -mno-sdata +CFLAGS+= -ffixed-r13 -mfixed-range=f32-f127 -fpic #-mno-sdata INLINE_LIMIT?= 15000 .endif ==== //depot/projects/mjexp/sys/conf/kern.pre.mk#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.82 2007/05/04 00:00:10 jfv Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.83 2007/05/19 04:48:07 kan Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -53,7 +53,7 @@ NOSTDINC= -nostdinc .endif -INCLUDES= ${NOSTDINC} -I- ${INCLMAGIC} -I. -I$S +INCLUDES= ${NOSTDINC} ${INCLMAGIC} -I. -I$S # This hack lets us use the OpenBSD altq code without spamming a new # include path into contrib'ed source files. @@ -90,7 +90,7 @@ CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT} CFLAGS+= --param inline-unit-growth=100 CFLAGS+= --param large-function-growth=1000 -WERROR?= -Werror +#WERROR?= -Werror .endif # XXX LOCORE means "don't declare C stuff" not "for locore.s". ==== //depot/projects/mjexp/sys/conf/kmod.mk#7 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.217 2007/03/21 03:42:49 sam Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.218 2007/05/19 04:48:08 kan Exp $ # # The include file handles building and installing loadable # kernel modules. @@ -79,7 +79,7 @@ . if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing) CFLAGS+= -fno-strict-aliasing . endif -WERROR?= -Werror +#WERROR?= -Werror .endif CFLAGS+= ${WERROR} CFLAGS+= -D_KERNEL @@ -93,7 +93,7 @@ NOSTDINC= -nostdinc .endif CFLAGS+= ${C_DIALECT} -CFLAGS:= ${CFLAGS:N-I*} ${NOSTDINC} -I- ${INCLMAGIC} ${CFLAGS:M-I*} +CFLAGS:= ${CFLAGS:N-I*} ${NOSTDINC} ${INCLMAGIC} ${CFLAGS:M-I*} .if defined(KERNBUILDDIR) CFLAGS+= -DHAVE_KERNEL_OPTION_HEADERS -include ${KERNBUILDDIR}/opt_global.h .endif ==== //depot/projects/mjexp/sys/dev/sound/isa/mss.c#6 (text+ko) ==== @@ -29,7 +29,7 @@ #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/mss.c,v 1.109 2007/04/18 18:26:38 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/mss.c,v 1.110 2007/05/19 10:53:01 joel Exp $"); /* board-specific include files */ #include @@ -1320,7 +1320,7 @@ goto mss_probe_end; } tmp &= 0x3f; - if (!(tmp == 0x04 || tmp == 0x0f || tmp == 0x00)) { + if (!(tmp == 0x04 || tmp == 0x0f || tmp == 0x00 || tmp == 0x05)) { BVDDB(printf("No MSS signature detected on port 0x%lx (0x%x)\n", rman_get_start(mss->io_base), tmpx)); goto no; ==== //depot/projects/mjexp/sys/dev/sound/pci/envy24.c#8 (text+ko) ==== @@ -35,7 +35,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24.c,v 1.11 2007/04/20 01:28:51 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24.c,v 1.12 2007/05/19 11:06:43 joel Exp $"); MALLOC_DEFINE(M_ENVY24, "envy24", "envy24 audio"); @@ -859,7 +859,7 @@ spicds_setcif(ptr->info, ptr->parent->cfg->cif); spicds_setformat(ptr->info, AK452X_FORMAT_I2S | AK452X_FORMAT_256FSN | AK452X_FORMAT_1X); - spicds_setdvc(ptr->info, 0); + spicds_setdvc(ptr->info, AK452X_DVC_DEMOFF); /* for the time being, init only first codec */ if (ptr->num == 0) spicds_init(ptr->info); ==== //depot/projects/mjexp/sys/dev/sound/pci/envy24ht.c#7 (text+ko) ==== @@ -36,7 +36,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24ht.c,v 1.11 2007/04/20 01:28:51 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24ht.c,v 1.12 2007/05/19 11:06:43 joel Exp $"); MALLOC_DEFINE(M_ENVY24HT, "envy24ht", "envy24ht audio"); @@ -932,7 +932,7 @@ ptr->parent->cfg->type == SPICDS_TYPE_AK4528) { spicds_setformat(ptr->info, AK452X_FORMAT_I2S | AK452X_FORMAT_256FSN | AK452X_FORMAT_1X); - spicds_setdvc(ptr->info, 0); + spicds_setdvc(ptr->info, AK452X_DVC_DEMOFF); } /* for the time being, init only first codec */ ==== //depot/projects/mjexp/sys/dev/sound/pci/fm801.c#4 (text+ko) ==== @@ -29,11 +29,11 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/fm801.c,v 1.30 2007/04/18 18:26:39 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/fm801.c,v 1.31 2007/05/19 13:19:32 joel Exp $"); #define PCI_VENDOR_FORTEMEDIA 0x1319 -#define PCI_DEVICE_FORTEMEDIA1 0x08011319 -#define PCI_DEVICE_FORTEMEDIA2 0x08021319 /* ??? have no idea what's this... */ +#define PCI_DEVICE_FORTEMEDIA1 0x08011319 /* Audio controller */ +#define PCI_DEVICE_FORTEMEDIA2 0x08021319 /* Joystick controller */ #define FM_PCM_VOLUME 0x00 #define FM_FM_VOLUME 0x02 @@ -417,15 +417,16 @@ struct fm801_chinfo *ch = data; struct fm801_info *fm801 = ch->parent; - if(ch->dir == PCMDIR_PLAY) { - if(fm801->play_flip) return fm801->play_blksize; + /* + * Don't mind for play_flip, set the blocksize to the + * desired values in any case - otherwise sound playback + * breaks here. + */ + if(ch->dir == PCMDIR_PLAY) fm801->play_blksize = blocksize; - } - if(ch->dir == PCMDIR_REC) { - if(fm801->rec_flip) return fm801->rec_blksize; + if(ch->dir == PCMDIR_REC) fm801->rec_blksize = blocksize; - } DPRINT("fm801ch_setblocksize %d (dir %d)\n",blocksize, ch->dir); ==== //depot/projects/mjexp/sys/dev/twa/tw_osl.h#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/twa/tw_osl.h,v 1.3 2007/05/09 04:16:32 scottl Exp $ + * $FreeBSD: src/sys/dev/twa/tw_osl.h,v 1.4 2007/05/19 10:12:58 scottl Exp $ */ /* @@ -52,7 +52,7 @@ #define TW_OSLI_MAX_NUM_IOS TW_CL_MAX_SIMULTANEOUS_REQUESTS #define TW_OSLI_MAX_NUM_AENS 0x100 -#define TW_OSLI_DEFERRED_INTR_USED +//#define TW_OSLI_DEFERRED_INTR_USED /* Possible values of req->state. */ #define TW_OSLI_REQ_STATE_INIT 0x0 /* being initialized */ ==== //depot/projects/mjexp/sys/dev/twa/tw_osl_share.h#4 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/twa/tw_osl_share.h,v 1.7 2007/05/10 15:36:58 scottl Exp $ + * $FreeBSD: src/sys/dev/twa/tw_osl_share.h,v 1.8 2007/05/19 10:12:58 scottl Exp $ */ /* @@ -75,7 +75,7 @@ #define TW_OSL_ENCLOSURE_SUPPORT #endif -#define TW_OSL_DRIVER_VERSION_STRING "3.70.03.006" +#define TW_OSL_DRIVER_VERSION_STRING "3.70.03.007" #define TW_OSL_CAN_SLEEP ==== //depot/projects/mjexp/sys/dev/usb/ufoma.c#2 (text+ko) ==== @@ -2,7 +2,7 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ufoma.c,v 1.2 2006/09/07 00:06:41 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ufoma.c,v 1.3 2007/05/19 04:57:15 kan Exp $"); /*- * Copyright (c) 2005, Takanori Watanabe * Copyright (c) 2003, M. Warner Losh . @@ -256,8 +256,6 @@ }; -static devclass_t ucom_devclass; - DRIVER_MODULE(ufoma, uhub, ufoma_driver, ucom_devclass, usbd_driver_load, 0); MODULE_DEPEND(ufoma, usb, 1, 1, 1); MODULE_DEPEND(ufoma, ucom, UCOM_MINVER, UCOM_PREFVER, UCOM_MAXVER); ==== //depot/projects/mjexp/sys/fs/nullfs/null_vnops.c#4 (text+ko) ==== @@ -36,7 +36,7 @@ * ...and... * @(#)null_vnodeops.c 1.20 92/07/07 UCLA Ficus project * - * $FreeBSD: src/sys/fs/nullfs/null_vnops.c,v 1.93 2007/02/15 22:08:33 pjd Exp $ + * $FreeBSD: src/sys/fs/nullfs/null_vnops.c,v 1.94 2007/05/18 13:02:12 kib Exp $ */ /* @@ -510,7 +510,7 @@ * vnodes below us on the stack. */ static int -null_lock(struct _vop_lock_args *ap) +null_lock(struct vop_lock1_args *ap) { struct vnode *vp = ap->a_vp; int flags = ap->a_flags; @@ -728,7 +728,7 @@ .vop_getwritemount = null_getwritemount, .vop_inactive = null_inactive, .vop_islocked = null_islocked, - ._vop_lock = null_lock, + .vop_lock1 = null_lock, .vop_lookup = null_lookup, .vop_open = null_open, .vop_print = null_print, ==== //depot/projects/mjexp/sys/fs/smbfs/smbfs_io.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/fs/smbfs/smbfs_io.c,v 1.37 2006/08/09 17:43:26 alc Exp $ + * $FreeBSD: src/sys/fs/smbfs/smbfs_io.c,v 1.38 2007/05/18 07:10:44 jeff Exp $ * */ #include @@ -475,8 +475,8 @@ kva = (vm_offset_t) bp->b_data; pmap_qenter(kva, pages, npages); - cnt.v_vnodein++; - cnt.v_vnodepgsin += npages; + VMCNT_ADD(vnodein, 1); + VMCNT_ADD(vnodepgsin, npages); iov.iov_base = (caddr_t) kva; iov.iov_len = count; @@ -626,8 +626,8 @@ kva = (vm_offset_t) bp->b_data; pmap_qenter(kva, pages, npages); - cnt.v_vnodeout++; - cnt.v_vnodepgsout += count; + VMCNT_ADD(vnodeout, 1); + VMCNT_ADD(vnodepgsout, count); iov.iov_base = (caddr_t) kva; iov.iov_len = count; ==== //depot/projects/mjexp/sys/fs/umapfs/umap_vnops.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)umap_vnops.c 8.6 (Berkeley) 5/22/95 - * $FreeBSD: src/sys/fs/umapfs/umap_vnops.c,v 1.48 2007/02/15 22:08:33 pjd Exp $ + * $FreeBSD: src/sys/fs/umapfs/umap_vnops.c,v 1.49 2007/05/18 13:02:12 kib Exp $ */ /* @@ -57,7 +57,7 @@ static vop_generic_t umap_bypass; static vop_getattr_t umap_getattr; static vop_inactive_t umap_inactive; -static vop_lock_t umap_lock; +static vop_lock1_t umap_lock; static vop_print_t umap_print; static vop_reclaim_t umap_reclaim; static vop_rename_t umap_rename; @@ -353,7 +353,7 @@ */ static int umap_lock(ap) - struct vop_lock_args /* { + struct vop_lock1_args /* { struct vnode *a_vp; int a_flags; struct thread *a_td; @@ -525,7 +525,7 @@ .vop_getattr = umap_getattr, .vop_inactive = umap_inactive, - .vop_lock = umap_lock, + .vop_lock1 = umap_lock, .vop_print = umap_print, .vop_reclaim = umap_reclaim, .vop_rename = umap_rename, ==== //depot/projects/mjexp/sys/fs/unionfs/union_vnops.c#5 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)union_vnops.c 8.32 (Berkeley) 6/23/95 - * $FreeBSD: src/sys/fs/unionfs/union_vnops.c,v 1.140 2007/02/15 22:08:33 pjd Exp $ + * $FreeBSD: src/sys/fs/unionfs/union_vnops.c,v 1.141 2007/05/18 13:02:13 kib Exp $ * */ @@ -1630,7 +1630,7 @@ } static int -unionfs_lock(struct _vop_lock_args *ap) +unionfs_lock(struct vop_lock1_args *ap) { int error; int flags; @@ -2256,7 +2256,7 @@ .vop_lease = unionfs_lease, .vop_link = unionfs_link, .vop_listextattr = unionfs_listextattr, - ._vop_lock = unionfs_lock, + .vop_lock1 = unionfs_lock, .vop_lookup = unionfs_lookup, .vop_mkdir = unionfs_mkdir, .vop_mknod = unionfs_mknod, ==== //depot/projects/mjexp/sys/i386/i386/machdep.c#11 (text+ko) ==== >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat May 19 20:34:28 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C057016A47A; Sat, 19 May 2007 20:34:27 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 8441F16A477 for ; Sat, 19 May 2007 20:34:27 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 6FCDA13C45B for ; Sat, 19 May 2007 20:34:27 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4JKYRDj048751 for ; Sat, 19 May 2007 20:34:27 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4JKYQNN048735 for perforce@freebsd.org; Sat, 19 May 2007 20:34:26 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 19 May 2007 20:34:26 GMT Message-Id: <200705192034.l4JKYQNN048735@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 120074 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: Sat, 19 May 2007 20:34:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=120074 Change 120074 by hselasky@hselasky_mini_itx on 2007/05/19 20:33:30 IFC @120061 - and fix duplicate USB ID assignment for BELKIN product 0x705a - and make all USB network drivers use ALTQ Affected files ... .. //depot/projects/usb/src/sys/amd64/amd64/mp_machdep.c#6 integrate .. //depot/projects/usb/src/sys/amd64/include/md_var.h#4 integrate .. //depot/projects/usb/src/sys/amd64/include/smp.h#3 integrate .. //depot/projects/usb/src/sys/arm/arm/busdma_machdep.c#5 integrate .. //depot/projects/usb/src/sys/arm/arm/machdep.c#4 integrate .. //depot/projects/usb/src/sys/arm/arm/pmap.c#6 integrate .. //depot/projects/usb/src/sys/arm/include/asm.h#3 integrate .. //depot/projects/usb/src/sys/arm/include/pmap.h#4 integrate .. //depot/projects/usb/src/sys/arm/include/profile.h#2 integrate .. //depot/projects/usb/src/sys/boot/i386/boot2/Makefile#2 integrate .. //depot/projects/usb/src/sys/cam/scsi/scsi_da.c#6 integrate .. //depot/projects/usb/src/sys/conf/kern.mk#4 integrate .. //depot/projects/usb/src/sys/conf/kern.pre.mk#5 integrate .. //depot/projects/usb/src/sys/conf/kmod.mk#5 integrate .. //depot/projects/usb/src/sys/dev/sound/isa/mss.c#3 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/envy24.c#4 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/envy24ht.c#3 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/fm801.c#3 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_osl.h#3 integrate .. //depot/projects/usb/src/sys/dev/twa/tw_osl_share.h#4 integrate .. //depot/projects/usb/src/sys/dev/usb/if_axe.c#25 integrate .. //depot/projects/usb/src/sys/dev/usb/if_axereg.h#13 integrate .. //depot/projects/usb/src/sys/dev/usb/if_cdce.c#18 edit .. //depot/projects/usb/src/sys/dev/usb/if_cue.c#21 integrate .. //depot/projects/usb/src/sys/dev/usb/if_cuereg.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb/if_kue.c#23 integrate .. //depot/projects/usb/src/sys/dev/usb/if_kuereg.h#9 integrate .. //depot/projects/usb/src/sys/dev/usb/if_rue.c#22 integrate .. //depot/projects/usb/src/sys/dev/usb/if_ruereg.h#10 integrate .. //depot/projects/usb/src/sys/dev/usb/if_rum.c#5 edit .. //depot/projects/usb/src/sys/dev/usb/if_udav.c#22 integrate .. //depot/projects/usb/src/sys/dev/usb/if_ural.c#28 edit .. //depot/projects/usb/src/sys/dev/usb/if_uralvar.h#16 integrate .. //depot/projects/usb/src/sys/dev/usb/rt2573_ucode.h#1 branch .. //depot/projects/usb/src/sys/dev/usb/ubsa.c#18 integrate .. //depot/projects/usb/src/sys/dev/usb/ufoma.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb/uftdi.c#16 edit .. //depot/projects/usb/src/sys/dev/usb/uhid.c#14 integrate .. //depot/projects/usb/src/sys/dev/usb/ukbd.c#15 integrate .. //depot/projects/usb/src/sys/dev/usb/ums.c#17 integrate .. //depot/projects/usb/src/sys/dev/usb/usb.c#12 integrate .. //depot/projects/usb/src/sys/dev/usb/usb_subr.c#36 edit .. //depot/projects/usb/src/sys/dev/usb/usbdevs#12 edit .. //depot/projects/usb/src/sys/i386/include/smp.h#3 integrate .. //depot/projects/usb/src/sys/ia64/ia64/exception.S#2 integrate .. //depot/projects/usb/src/sys/ia64/ia64/mca.c#2 integrate .. //depot/projects/usb/src/sys/ia64/ia64/pmap.c#6 integrate .. //depot/projects/usb/src/sys/kern/kern_mib.c#4 integrate .. //depot/projects/usb/src/sys/net/ieee8023ad_lacp.c#3 integrate .. //depot/projects/usb/src/sys/net/ieee8023ad_lacp.h#3 integrate .. //depot/projects/usb/src/sys/net/if_fwsubr.c#4 integrate .. //depot/projects/usb/src/sys/net/if_lagg.c#3 integrate .. //depot/projects/usb/src/sys/netinet/tcp_syncache.c#6 integrate .. //depot/projects/usb/src/sys/sparc64/include/smp.h#2 integrate .. //depot/projects/usb/src/sys/sys/param.h#6 integrate .. //depot/projects/usb/src/sys/sys/sysctl.h#5 integrate Differences ... ==== //depot/projects/usb/src/sys/amd64/amd64/mp_machdep.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.284 2007/05/08 22:01:02 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.285 2007/05/19 05:03:59 kan Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -80,6 +80,8 @@ int boot_cpu_id = -1; /* designated BSP */ extern int nkpt; +extern struct pcpu __pcpu[]; + /* * CPU topology map datastructures for HTT. */ ==== //depot/projects/usb/src/sys/amd64/include/md_var.h#4 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.80 2007/01/18 05:46:32 rodrigc Exp $ + * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.81 2007/05/19 05:03:59 kan Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -57,8 +57,6 @@ extern uint64_t *vm_page_dump; extern int vm_page_dump_size; -extern struct pcpu __pcpu[]; - typedef void alias_for_inthand_t(u_int cs, u_int ef, u_int esp, u_int ss); struct thread; struct reg; ==== //depot/projects/usb/src/sys/amd64/include/smp.h#3 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/amd64/include/smp.h,v 1.89 2007/03/06 17:16:46 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/smp.h,v 1.90 2007/05/19 05:01:43 kan Exp $ * */ @@ -23,6 +23,7 @@ #include #include #include +#include /* global symbols in mpboot.S */ extern char mptramp_start[]; ==== //depot/projects/usb/src/sys/arm/arm/busdma_machdep.c#5 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.29 2007/02/13 07:19:26 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/busdma_machdep.c,v 1.30 2007/05/19 13:17:31 cognet Exp $"); /* * ARM bus dma support routines @@ -1003,7 +1003,7 @@ bus_dmamap_callback2_t *callback, void *callback_arg, int flags) { - vm_offset_t lastaddr; + vm_offset_t lastaddr = 0; #ifdef __CC_SUPPORTS_DYNAMIC_ARRAY_INIT bus_dma_segment_t dm_segments[dmat->nsegments]; #else @@ -1079,7 +1079,7 @@ return; } -static __inline void +static void bus_dmamap_sync_buf(void *buf, int len, bus_dmasync_op_t op) { char _tmp_cl[arm_dcache_align], _tmp_clend[arm_dcache_align]; ==== //depot/projects/usb/src/sys/arm/arm/machdep.c#4 (text+ko) ==== @@ -44,7 +44,7 @@ #include "opt_compat.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.26 2007/05/18 07:10:43 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.27 2007/05/19 13:32:58 cognet Exp $"); #include #include @@ -547,7 +547,7 @@ set_mcontext(struct thread *td, const mcontext_t *mcp) { struct trapframe *tf = td->td_frame; - __greg_t *gr = mcp->__gregs; + const __greg_t *gr = mcp->__gregs; tf->tf_r0 = gr[_REG_R0]; tf->tf_r1 = gr[_REG_R1]; ==== //depot/projects/usb/src/sys/arm/arm/pmap.c#6 (text+ko) ==== @@ -147,7 +147,7 @@ #include "opt_vm.h" #include -__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.79 2007/05/18 07:10:43 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/pmap.c,v 1.81 2007/05/19 13:21:41 cognet Exp $"); #include #include #include @@ -431,10 +431,10 @@ l1->l1_kva = l1pt; l1->l1_domain_use_count = 0; - l1->l1_domain_first = 0; + l1->l1_domain_first = 1; for (i = 0; i < PMAP_DOMAINS; i++) - l1->l1_domain_free[i] = i + 1; + l1->l1_domain_free[i] = i + 2; /* * Copy the kernel's L1 entries to each new L1. @@ -2910,7 +2910,7 @@ /* * remove a page rom the kernel pagetables */ -PMAP_INLINE void +void pmap_kremove(vm_offset_t va) { struct l2_bucket *l2b; ==== //depot/projects/usb/src/sys/arm/include/asm.h#3 (text+ko) ==== @@ -33,7 +33,7 @@ * * from: @(#)asm.h 5.5 (Berkeley) 5/7/91 * - * $FreeBSD: src/sys/arm/include/asm.h,v 1.5 2006/08/30 11:45:07 cognet Exp $ + * $FreeBSD: src/sys/arm/include/asm.h,v 1.6 2007/05/19 16:20:37 cognet Exp $ */ #ifndef _MACHINE_ASM_H_ @@ -80,7 +80,7 @@ #ifdef GPROF # define _PROF_PROLOGUE \ - mov ip, lr; bl _mcount + mov ip, lr; bl __mcount #else # define _PROF_PROLOGUE #endif ==== //depot/projects/usb/src/sys/arm/include/pmap.h#4 (text+ko) ==== @@ -44,7 +44,7 @@ * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: FreeBSD: src/sys/i386/include/pmap.h,v 1.70 2000/11/30 * - * $FreeBSD: src/sys/arm/include/pmap.h,v 1.24 2007/01/17 00:53:05 cognet Exp $ + * $FreeBSD: src/sys/arm/include/pmap.h,v 1.25 2007/05/19 12:47:34 cognet Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -237,8 +237,8 @@ /* * Definitions for MMU domains */ -#define PMAP_DOMAINS 15 /* 15 'user' domains (0-14) */ -#define PMAP_DOMAIN_KERNEL 15 /* The kernel uses domain #15 */ +#define PMAP_DOMAINS 15 /* 15 'user' domains (1-15) */ +#define PMAP_DOMAIN_KERNEL 0 /* The kernel uses domain #0 */ /* * The new pmap ensures that page-tables are always mapping Write-Thru. ==== //depot/projects/usb/src/sys/arm/include/profile.h#2 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)profile.h 8.1 (Berkeley) 6/11/93 - * $FreeBSD: src/sys/arm/include/profile.h,v 1.6 2005/01/05 21:58:48 imp Exp $ + * $FreeBSD: src/sys/arm/include/profile.h,v 1.7 2007/05/19 16:20:37 cognet Exp $ */ #ifndef _MACHINE_PROFILE_H_ @@ -61,9 +61,9 @@ #define MCOUNT \ __asm__(".text"); \ __asm__(".align 0"); \ - __asm__(".type _mcount ,%function"); \ - __asm__(".global _mcount"); \ - __asm__("_mcount:"); \ + __asm__(".type __mcount ,%function"); \ + __asm__(".global __mcount"); \ + __asm__("__mcount:"); \ /* \ * Preserve registers that are trashed during mcount \ */ \ ==== //depot/projects/usb/src/sys/boot/i386/boot2/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.59 2005/07/15 12:22:14 ache Exp $ +# $FreeBSD: src/sys/boot/i386/boot2/Makefile,v 1.60 2007/05/19 05:07:47 kan Exp $ FILES= boot boot1 boot2 @@ -36,7 +36,8 @@ -I${.CURDIR}/../btx/lib -I. \ -Wall -Waggregate-return -Wbad-function-cast -Wcast-align \ -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \ - -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings + -Wpointer-arith -Wshadow -Wstrict-prototypes -Wwrite-strings \ + -Winline --param max-inline-insns-single=100 LDFLAGS=-static -N --gc-sections ==== //depot/projects/usb/src/sys/cam/scsi/scsi_da.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.210 2007/05/16 16:54:23 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.211 2007/05/18 21:58:07 mjacob Exp $"); #include @@ -1303,9 +1303,8 @@ struct ccb_scsiio *csio; struct scsi_read_capacity_data *rcap; - rcap = (struct scsi_read_capacity_data *)malloc(sizeof(*rcap), - M_SCSIDA, - M_NOWAIT); + rcap = (struct scsi_read_capacity_data *) + malloc(sizeof(*rcap), M_SCSIDA, M_NOWAIT|M_ZERO); if (rcap == NULL) { printf("dastart: Couldn't malloc read_capacity data\n"); /* da_free_periph??? */ @@ -1330,7 +1329,7 @@ struct scsi_read_capacity_data_long *rcaplong; rcaplong = (struct scsi_read_capacity_data_long *) - malloc(sizeof(*rcaplong), M_SCSIDA, M_NOWAIT); + malloc(sizeof(*rcaplong), M_SCSIDA, M_NOWAIT|M_ZERO); if (rcaplong == NULL) { printf("dastart: Couldn't malloc read_capacity data\n"); /* da_free_periph??? */ ==== //depot/projects/usb/src/sys/conf/kern.mk#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.mk,v 1.50 2006/11/26 23:16:46 kmacy Exp $ +# $FreeBSD: src/sys/conf/kern.mk,v 1.51 2007/05/19 04:45:54 kan Exp $ # # Warning flags for compiling the kernel and components of the kernel. @@ -12,7 +12,7 @@ .else CWARNFLAGS?= -Wall -Wredundant-decls -Wnested-externs -Wstrict-prototypes \ -Wmissing-prototypes -Wpointer-arith -Winline -Wcast-qual \ - ${_wundef} -fformat-extensions + ${_wundef} -Wno-pointer-sign -fformat-extensions .if !defined(NO_UNDEF) _wundef= -Wundef .endif @@ -46,7 +46,7 @@ # a very small subset of float registers for integer divides. # .if ${MACHINE_ARCH} == "ia64" -CFLAGS+= -ffixed-r13 -mfixed-range=f32-f127 -mno-sdata +CFLAGS+= -ffixed-r13 -mfixed-range=f32-f127 -fpic #-mno-sdata INLINE_LIMIT?= 15000 .endif ==== //depot/projects/usb/src/sys/conf/kern.pre.mk#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.82 2007/05/04 00:00:10 jfv Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.83 2007/05/19 04:48:07 kan Exp $ # Part of a unified Makefile for building kernels. This part contains all # of the definitions that need to be before %BEFORE_DEPEND. @@ -53,7 +53,7 @@ NOSTDINC= -nostdinc .endif -INCLUDES= ${NOSTDINC} -I- ${INCLMAGIC} -I. -I$S +INCLUDES= ${NOSTDINC} ${INCLMAGIC} -I. -I$S # This hack lets us use the OpenBSD altq code without spamming a new # include path into contrib'ed source files. @@ -90,7 +90,7 @@ CFLAGS+= -fno-common -finline-limit=${INLINE_LIMIT} CFLAGS+= --param inline-unit-growth=100 CFLAGS+= --param large-function-growth=1000 -WERROR?= -Werror +#WERROR?= -Werror .endif # XXX LOCORE means "don't declare C stuff" not "for locore.s". ==== //depot/projects/usb/src/sys/conf/kmod.mk#5 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.217 2007/03/21 03:42:49 sam Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.218 2007/05/19 04:48:08 kan Exp $ # # The include file handles building and installing loadable # kernel modules. @@ -79,7 +79,7 @@ . if !empty(CFLAGS:M-O[23s]) && empty(CFLAGS:M-fno-strict-aliasing) CFLAGS+= -fno-strict-aliasing . endif -WERROR?= -Werror +#WERROR?= -Werror .endif CFLAGS+= ${WERROR} CFLAGS+= -D_KERNEL @@ -93,7 +93,7 @@ NOSTDINC= -nostdinc .endif CFLAGS+= ${C_DIALECT} -CFLAGS:= ${CFLAGS:N-I*} ${NOSTDINC} -I- ${INCLMAGIC} ${CFLAGS:M-I*} +CFLAGS:= ${CFLAGS:N-I*} ${NOSTDINC} ${INCLMAGIC} ${CFLAGS:M-I*} .if defined(KERNBUILDDIR) CFLAGS+= -DHAVE_KERNEL_OPTION_HEADERS -include ${KERNBUILDDIR}/opt_global.h .endif ==== //depot/projects/usb/src/sys/dev/sound/isa/mss.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/mss.c,v 1.109 2007/04/18 18:26:38 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/isa/mss.c,v 1.110 2007/05/19 10:53:01 joel Exp $"); /* board-specific include files */ #include @@ -1320,7 +1320,7 @@ goto mss_probe_end; } tmp &= 0x3f; - if (!(tmp == 0x04 || tmp == 0x0f || tmp == 0x00)) { + if (!(tmp == 0x04 || tmp == 0x0f || tmp == 0x00 || tmp == 0x05)) { BVDDB(printf("No MSS signature detected on port 0x%lx (0x%x)\n", rman_get_start(mss->io_base), tmpx)); goto no; ==== //depot/projects/usb/src/sys/dev/sound/pci/envy24.c#4 (text+ko) ==== @@ -35,7 +35,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24.c,v 1.11 2007/04/20 01:28:51 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24.c,v 1.12 2007/05/19 11:06:43 joel Exp $"); MALLOC_DEFINE(M_ENVY24, "envy24", "envy24 audio"); @@ -859,7 +859,7 @@ spicds_setcif(ptr->info, ptr->parent->cfg->cif); spicds_setformat(ptr->info, AK452X_FORMAT_I2S | AK452X_FORMAT_256FSN | AK452X_FORMAT_1X); - spicds_setdvc(ptr->info, 0); + spicds_setdvc(ptr->info, AK452X_DVC_DEMOFF); /* for the time being, init only first codec */ if (ptr->num == 0) spicds_init(ptr->info); ==== //depot/projects/usb/src/sys/dev/sound/pci/envy24ht.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24ht.c,v 1.11 2007/04/20 01:28:51 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/envy24ht.c,v 1.12 2007/05/19 11:06:43 joel Exp $"); MALLOC_DEFINE(M_ENVY24HT, "envy24ht", "envy24ht audio"); @@ -932,7 +932,7 @@ ptr->parent->cfg->type == SPICDS_TYPE_AK4528) { spicds_setformat(ptr->info, AK452X_FORMAT_I2S | AK452X_FORMAT_256FSN | AK452X_FORMAT_1X); - spicds_setdvc(ptr->info, 0); + spicds_setdvc(ptr->info, AK452X_DVC_DEMOFF); } /* for the time being, init only first codec */ ==== //depot/projects/usb/src/sys/dev/sound/pci/fm801.c#3 (text+ko) ==== @@ -29,11 +29,11 @@ #include #include -SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/fm801.c,v 1.30 2007/04/18 18:26:39 ariff Exp $"); +SND_DECLARE_FILE("$FreeBSD: src/sys/dev/sound/pci/fm801.c,v 1.31 2007/05/19 13:19:32 joel Exp $"); #define PCI_VENDOR_FORTEMEDIA 0x1319 -#define PCI_DEVICE_FORTEMEDIA1 0x08011319 -#define PCI_DEVICE_FORTEMEDIA2 0x08021319 /* ??? have no idea what's this... */ +#define PCI_DEVICE_FORTEMEDIA1 0x08011319 /* Audio controller */ +#define PCI_DEVICE_FORTEMEDIA2 0x08021319 /* Joystick controller */ #define FM_PCM_VOLUME 0x00 #define FM_FM_VOLUME 0x02 @@ -417,15 +417,16 @@ struct fm801_chinfo *ch = data; struct fm801_info *fm801 = ch->parent; - if(ch->dir == PCMDIR_PLAY) { - if(fm801->play_flip) return fm801->play_blksize; + /* + * Don't mind for play_flip, set the blocksize to the + * desired values in any case - otherwise sound playback + * breaks here. + */ + if(ch->dir == PCMDIR_PLAY) fm801->play_blksize = blocksize; - } - if(ch->dir == PCMDIR_REC) { - if(fm801->rec_flip) return fm801->rec_blksize; + if(ch->dir == PCMDIR_REC) fm801->rec_blksize = blocksize; - } DPRINT("fm801ch_setblocksize %d (dir %d)\n",blocksize, ch->dir); ==== //depot/projects/usb/src/sys/dev/twa/tw_osl.h#3 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/twa/tw_osl.h,v 1.3 2007/05/09 04:16:32 scottl Exp $ + * $FreeBSD: src/sys/dev/twa/tw_osl.h,v 1.4 2007/05/19 10:12:58 scottl Exp $ */ /* @@ -52,7 +52,7 @@ #define TW_OSLI_MAX_NUM_IOS TW_CL_MAX_SIMULTANEOUS_REQUESTS #define TW_OSLI_MAX_NUM_AENS 0x100 -#define TW_OSLI_DEFERRED_INTR_USED +//#define TW_OSLI_DEFERRED_INTR_USED /* Possible values of req->state. */ #define TW_OSLI_REQ_STATE_INIT 0x0 /* being initialized */ ==== //depot/projects/usb/src/sys/dev/twa/tw_osl_share.h#4 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/twa/tw_osl_share.h,v 1.7 2007/05/10 15:36:58 scottl Exp $ + * $FreeBSD: src/sys/dev/twa/tw_osl_share.h,v 1.8 2007/05/19 10:12:58 scottl Exp $ */ /* @@ -75,7 +75,7 @@ #define TW_OSL_ENCLOSURE_SUPPORT #endif -#define TW_OSL_DRIVER_VERSION_STRING "3.70.03.006" +#define TW_OSL_DRIVER_VERSION_STRING "3.70.03.007" #define TW_OSL_CAN_SLEEP ==== //depot/projects/usb/src/sys/dev/usb/if_axe.c#25 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_axe.c,v 1.42 2007/03/31 23:23:41 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_axe.c,v 1.44 2007/05/12 05:56:10 brueffer Exp $"); /* * ASIX Electronics AX88172 USB 2.0 ethernet driver. Used in the @@ -889,7 +889,9 @@ ifp->if_start = axe_start_cb; ifp->if_watchdog = NULL; ifp->if_init = axe_init_cb; - ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; + IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); + ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN; + IFQ_SET_READY(&ifp->if_snd); /* XXX need Giant when accessing * the device structures ! @@ -1267,7 +1269,7 @@ while (1) { - IF_DEQUEUE(&(ifp->if_snd), m); + IFQ_DRV_DEQUEUE(&(ifp->if_snd), m); if (m == NULL) { if (pos > 0) ==== //depot/projects/usb/src/sys/dev/usb/if_axereg.h#13 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/if_axereg.h,v 1.10 2006/06/04 14:42:38 iedowse Exp $ + * $FreeBSD: src/sys/dev/usb/if_axereg.h,v 1.11 2007/05/01 11:17:29 brueffer Exp $ */ /* ==== //depot/projects/usb/src/sys/dev/usb/if_cdce.c#18 (text+ko) ==== @@ -383,7 +383,9 @@ ifp->if_start = cdce_start_cb; ifp->if_init = cdce_init_cb; ifp->if_baudrate = 11000000; - ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; + IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); + ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN; + IFQ_SET_READY(&ifp->if_snd); /* no IFM type for 11Mbps USB, so go with 10baseT */ ifmedia_add(&sc->sc_ifmedia, IFM_ETHER | IFM_10_T, 0, 0); @@ -522,7 +524,7 @@ goto done; } - IF_DEQUEUE(&(ifp->if_snd), m); + IFQ_DRV_DEQUEUE(&(ifp->if_snd), m); if (m == NULL) { goto done; ==== //depot/projects/usb/src/sys/dev/usb/if_cue.c#21 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_cue.c,v 1.63 2006/09/07 00:06:41 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_cue.c,v 1.64 2007/05/12 05:53:52 brueffer Exp $"); /* * CATC USB-EL1210A USB to ethernet driver. Used in the CATC Netmate @@ -567,7 +567,9 @@ ifp->if_watchdog = NULL; ifp->if_init = cue_init_cb; ifp->if_baudrate = 10000000; - ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; + IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); + ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN; + IFQ_SET_READY(&ifp->if_snd); sc->sc_ifp = ifp; @@ -834,7 +836,7 @@ goto done; } - IF_DEQUEUE(&(ifp->if_snd), m); + IFQ_DRV_DEQUEUE(&(ifp->if_snd), m); if (m == NULL) { goto done; ==== //depot/projects/usb/src/sys/dev/usb/if_cuereg.h#9 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/if_cuereg.h,v 1.18 2005/06/10 16:49:15 brooks Exp $ + * $FreeBSD: src/sys/dev/usb/if_cuereg.h,v 1.19 2007/05/12 05:53:52 brueffer Exp $ */ /* ==== //depot/projects/usb/src/sys/dev/usb/if_kue.c#23 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_kue.c,v 1.71 2006/10/07 18:03:39 flz Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_kue.c,v 1.73 2007/05/12 05:56:58 brueffer Exp $"); /* * Kawasaki LSI KL5KUSB101B USB to ethernet adapter driver. @@ -604,7 +604,9 @@ ifp->if_watchdog = NULL; ifp->if_init = kue_init_cb; ifp->if_baudrate = 10000000; - ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; + IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); + ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN; + IFQ_SET_READY(&ifp->if_snd); sc->sc_ifp = ifp; @@ -820,7 +822,7 @@ goto done; } - IF_DEQUEUE(&(ifp->if_snd), m); + IFQ_DRV_DEQUEUE(&(ifp->if_snd), m); if (m == NULL) { goto done; ==== //depot/projects/usb/src/sys/dev/usb/if_kuereg.h#9 (text+ko) ==== @@ -29,7 +29,7 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF * THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/if_kuereg.h,v 1.18 2005/06/10 16:49:15 brooks Exp $ + * $FreeBSD: src/sys/dev/usb/if_kuereg.h,v 1.19 2007/05/12 05:53:53 brueffer Exp $ */ /* ==== //depot/projects/usb/src/sys/dev/usb/if_rue.c#22 (text+ko) ==== @@ -57,7 +57,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_rue.c,v 1.30 2006/09/07 00:06:41 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_rue.c,v 1.31 2007/05/12 05:53:53 brueffer Exp $"); /* * RealTek RTL8150 USB to fast ethernet controller driver. @@ -794,7 +794,9 @@ ifp->if_start = rue_start_cb; ifp->if_watchdog = NULL; ifp->if_init = rue_init_cb; - ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; + IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); + ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN; + IFQ_SET_READY(&ifp->if_snd); /* XXX need Giant when accessing * the device structures ! @@ -1113,7 +1115,7 @@ goto done; } - IF_DEQUEUE(&(ifp->if_snd), m); + IFQ_DRV_DEQUEUE(&(ifp->if_snd), m); if (m == NULL) { goto done; ==== //depot/projects/usb/src/sys/dev/usb/if_ruereg.h#10 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/usb/if_ruereg.h,v 1.6 2005/06/10 16:49:15 brooks Exp $ + * $FreeBSD: src/sys/dev/usb/if_ruereg.h,v 1.7 2007/05/12 05:53:53 brueffer Exp $ */ #define RUE_CONFIG_NO 1 ==== //depot/projects/usb/src/sys/dev/usb/if_rum.c#5 (text+ko) ==== @@ -158,7 +158,7 @@ { USB_VENDOR_AMIT, USB_PRODUCT_AMIT_CGWLUSB2GO }, { USB_VENDOR_ASUS, USB_PRODUCT_ASUS_RT2573_1 }, { USB_VENDOR_ASUS, USB_PRODUCT_ASUS_RT2573_2 }, - { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D7050A }, + { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D705A }, { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D9050V3 }, { USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_WUSB54GC }, { USB_VENDOR_CISCOLINKSYS, USB_PRODUCT_CISCOLINKSYS_WUSB54GR }, ==== //depot/projects/usb/src/sys/dev/usb/if_udav.c#22 (text+ko) ==== @@ -1,6 +1,5 @@ /* $NetBSD: if_udav.c,v 1.2 2003/09/04 15:17:38 tsutsui Exp $ */ /* $nabe: if_udav.c,v 1.3 2003/08/21 16:57:19 nabe Exp $ */ -/* $FreeBSD: src/sys/dev/usb/if_udav.c,v 1.24 2006/10/19 01:15:58 iedowse Exp $ */ /*- * Copyright (c) 2003 * Shingo WATANABE . All rights reserved. @@ -50,7 +49,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_udav.c,v 1.24 2006/10/19 01:15:58 iedowse Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_udav.c,v 1.25 2007/05/12 05:53:53 brueffer Exp $"); #include "opt_inet.h" @@ -407,7 +406,9 @@ ifp->if_ioctl = udav_ioctl_cb; ifp->if_watchdog = NULL; ifp->if_init = udav_init_cb; - ifp->if_snd.ifq_maxlen = IFQ_MAXLEN; + IFQ_SET_MAXLEN(&ifp->if_snd, IFQ_MAXLEN); + ifp->if_snd.ifq_drv_maxlen = IFQ_MAXLEN; + IFQ_SET_READY(&ifp->if_snd); /* XXX need Giant when accessing * the device structures ! @@ -925,7 +926,7 @@ goto done; } - IF_DEQUEUE(&(ifp->if_snd), m); + IFQ_DRV_DEQUEUE(&(ifp->if_snd), m); if (m == NULL) { goto done; ==== //depot/projects/usb/src/sys/dev/usb/if_ural.c#28 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/if_ural.c,v 1.52 2007/04/24 11:18:55 sephe Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/if_ural.c,v 1.53 2007/05/09 09:32:41 kevlo Exp $"); /*- * Ralink Technology RT2500USB chipset driver @@ -220,7 +220,6 @@ { USB_VENDOR_ASUS, USB_PRODUCT_RALINK_RT2570 }, { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D7050 }, { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D7051 }, - { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5D705A }, { USB_VENDOR_CONCEPTRONIC2, USB_PRODUCT_CONCEPTRONIC2_C54RU }, { USB_VENDOR_DLINK, USB_PRODUCT_DLINK_DWLG122 }, { USB_VENDOR_GIGABYTE, USB_PRODUCT_GIGABYTE_GNWBKG }, ==== //depot/projects/usb/src/sys/dev/usb/if_uralvar.h#16 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/usb/if_uralvar.h,v 1.7 2006/09/07 00:06:41 imp Exp $ */ +/* $FreeBSD: src/sys/dev/usb/if_uralvar.h,v 1.8 2007/05/09 09:32:41 kevlo Exp $ */ /*- * Copyright (c) 2005 ==== //depot/projects/usb/src/sys/dev/usb/ubsa.c#18 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ubsa.c,v 1.22 2007/02/09 15:59:28 le Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ubsa.c,v 1.23 2007/05/08 18:51:39 maxim Exp $"); /*- * Copyright (c) 2001 The NetBSD Foundation, Inc. @@ -260,6 +260,8 @@ u_int16_t vendor; u_int16_t product; } ubsa_products [] = { + /* AnyData ADU-E100A/H */ + { USB_VENDOR_ANYDATA, USB_PRODUCT_ANYDATA_ADU_E100X }, /* BELKIN F5U103 */ { USB_VENDOR_BELKIN, USB_PRODUCT_BELKIN_F5U103 }, /* BELKIN F5U120 */ ==== //depot/projects/usb/src/sys/dev/usb/ufoma.c#17 (text+ko) ==== @@ -1,7 +1,7 @@ /* $NetBSD: umodem.c,v 1.45 2002/09/23 05:51:23 simonb Exp $ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ufoma.c,v 1.2 2006/09/07 00:06:41 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ufoma.c,v 1.3 2007/05/19 04:57:15 kan Exp $"); /*- * Copyright (c) 2005, Takanori Watanabe * Copyright (c) 2003, M. Warner Losh . ==== //depot/projects/usb/src/sys/dev/usb/uftdi.c#16 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/uftdi.c,v 1.24 2006/09/07 00:06:41 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/uftdi.c,v 1.25 2007/04/30 16:15:19 takawata Exp $"); /* * NOTE: all function names beginning like "uftdi_cfg_" can only * be called from within the config thread function ! @@ -265,6 +265,9 @@ (uaa->product == USB_PRODUCT_BBELECTRONICS_USOTL4)) { return UMATCH_VENDOR_PRODUCT; } + if (uaa->vendor == USB_VENDOR_MELCO && + (uaa->product == USB_PRODUCT_MELCO_PCOPRS1)) + return (UMATCH_VENDOR_PRODUCT); return (UMATCH_NONE); } @@ -373,6 +376,18 @@ } break; + case USB_VENDOR_MELCO: + switch( uaa->product ){ + case USB_PRODUCT_MELCO_PCOPRS1: + sc->sc_type = UFTDI_TYPE_8U232AM; + sc->sc_hdrlen = 0; + break; + + default: /* Can't happen */ + goto detach; + } + break; + default: /* Can't happen */ goto detach; } ==== //depot/projects/usb/src/sys/dev/usb/uhid.c#14 (text+ko) ==== ==== //depot/projects/usb/src/sys/dev/usb/ukbd.c#15 (text+ko) ==== @@ -71,7 +71,7 @@ #include "ukbdmap.h" #endif -__FBSDID("$FreeBSD: src/sys/dev/usb/ukbd.c,v 1.59 2006/11/28 21:13:07 flz Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ukbd.c,v 1.60 2007/05/12 05:53:53 brueffer Exp $"); #ifdef USB_DEBUG #define DPRINTF(n,fmt,...) \ ==== //depot/projects/usb/src/sys/dev/usb/ums.c#17 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/ums.c,v 1.83 2007/01/17 03:50:45 markus Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/ums.c,v 1.84 2007/05/12 05:53:53 brueffer Exp $"); /* * HID spec: http://www.usb.org/developers/devclass_docs/HID1_11.pdf ==== //depot/projects/usb/src/sys/dev/usb/usb.c#12 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/usb.c,v 1.111 2006/10/19 01:15:58 iedowse Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/usb.c,v 1.112 2007/05/12 05:53:53 brueffer Exp $"); /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -747,11 +747,7 @@ case FIOASYNC: if(*(int *)data) -#if __FreeBSD_version >= 500000 usb_async_proc = p->td_proc; -#else - usb_async_proc = p; -#endif else usb_async_proc = 0; @@ -775,11 +771,9 @@ switch (cmd) { -#if defined(__FreeBSD__) /* this part should be deleted */ case USB_DISCOVER: break; -#endif case USB_REQUEST: { struct usb_ctl_request *ur = (void *)data; ==== //depot/projects/usb/src/sys/dev/usb/usb_subr.c#36 (text+ko) ==== @@ -11,7 +11,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.89 2007/02/27 17:23:28 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/usb/usb_subr.c,v 1.90 2007/05/08 03:25:05 kevlo Exp $"); /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -698,8 +698,16 @@ cdp = udev->cdesc; - /* get the full descriptor */ - err = usbreq_get_desc(udev, UDESC_CONFIG, index, len, cdp, 3); + /* Get the full descriptor. Try a few times for slow devices. */ + for (nifc = 0; nifc < 3; nifc++) { + + err = usbreq_get_desc(udev, UDESC_CONFIG, index, len, cdp, 3); + + if (!err) break; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat May 19 20:37:32 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3BB9316A46B; Sat, 19 May 2007 20:37:32 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id DAC4A16A468 for ; Sat, 19 May 2007 20:37:31 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id CA43113C45B for ; Sat, 19 May 2007 20:37:31 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4JKbVr5051533 for ; Sat, 19 May 2007 20:37:31 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4JKbVKd051524 for perforce@freebsd.org; Sat, 19 May 2007 20:37:31 GMT (envelope-from jhb@freebsd.org) Date: Sat, 19 May 2007 20:37:31 GMT Message-Id: <200705192037.l4JKbVKd051524@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 120075 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: Sat, 19 May 2007 20:37:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=120075 Change 120075 by jhb@jhb_mutex on 2007/05/19 20:36:47 IFC @120073 Affected files ... .. //depot/projects/smpng/sys/arm/include/asm.h#6 integrate .. //depot/projects/smpng/sys/arm/include/profile.h#7 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#85 integrate .. //depot/projects/smpng/sys/kern/kern_sx.c#49 integrate .. //depot/projects/smpng/sys/sys/sx.h#28 integrate Differences ... ==== //depot/projects/smpng/sys/arm/include/asm.h#6 (text+ko) ==== @@ -33,7 +33,7 @@ * * from: @(#)asm.h 5.5 (Berkeley) 5/7/91 * - * $FreeBSD: src/sys/arm/include/asm.h,v 1.5 2006/08/30 11:45:07 cognet Exp $ + * $FreeBSD: src/sys/arm/include/asm.h,v 1.6 2007/05/19 16:20:37 cognet Exp $ */ #ifndef _MACHINE_ASM_H_ @@ -80,7 +80,7 @@ #ifdef GPROF # define _PROF_PROLOGUE \ - mov ip, lr; bl _mcount + mov ip, lr; bl __mcount #else # define _PROF_PROLOGUE #endif ==== //depot/projects/smpng/sys/arm/include/profile.h#7 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)profile.h 8.1 (Berkeley) 6/11/93 - * $FreeBSD: src/sys/arm/include/profile.h,v 1.6 2005/01/05 21:58:48 imp Exp $ + * $FreeBSD: src/sys/arm/include/profile.h,v 1.7 2007/05/19 16:20:37 cognet Exp $ */ #ifndef _MACHINE_PROFILE_H_ @@ -61,9 +61,9 @@ #define MCOUNT \ __asm__(".text"); \ __asm__(".align 0"); \ - __asm__(".type _mcount ,%function"); \ - __asm__(".global _mcount"); \ - __asm__("_mcount:"); \ + __asm__(".type __mcount ,%function"); \ + __asm__(".global __mcount"); \ + __asm__("__mcount:"); \ /* \ * Preserve registers that are trashed during mcount \ */ \ ==== //depot/projects/smpng/sys/ia64/ia64/pmap.c#85 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.184 2007/05/19 13:11:27 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.185 2007/05/19 18:25:14 marcel Exp $"); #include #include @@ -1420,14 +1420,14 @@ pmap_remove_pte(pmap, pte, va, pv, 1); } } - } else { - for (va = sva; va < eva; va = va += PAGE_SIZE) { + for (va = sva; va < eva; va += PAGE_SIZE) { pte = pmap_find_vhpt(va); if (pte != NULL) pmap_remove_pte(pmap, pte, va, 0, 1); } } + out: vm_page_unlock_queues(); pmap_install(oldpmap); ==== //depot/projects/smpng/sys/kern/kern_sx.c#49 (text+ko) ==== @@ -40,7 +40,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/kern/kern_sx.c,v 1.46 2007/05/18 15:05:41 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_sx.c,v 1.49 2007/05/19 20:18:12 jhb Exp $"); #include #include @@ -101,14 +101,6 @@ */ #define sx_recursed(sx) ((sx)->sx_recurse != 0) -/* - * Return a pointer to the owning thread if the lock is exclusively - * locked. - */ -#define sx_xholder(sx) \ - ((sx)->sx_lock & SX_LOCK_SHARED ? NULL : \ - (struct thread *)SX_OWNER((sx)->sx_lock)) - #ifdef DDB static void db_show_sx(struct lock_object *lock); #endif @@ -170,6 +162,9 @@ { int flags; + MPASS((opts & ~(SX_QUIET | SX_RECURSE | SX_NOWITNESS | SX_DUPOK | + SX_NOPROFILE | SX_ADAPTIVESPIN)) == 0); + flags = LO_SLEEPABLE | LO_UPGRADABLE | LO_RECURSABLE; if (opts & SX_DUPOK) flags |= LO_DUPOK; @@ -180,7 +175,7 @@ if (opts & SX_QUIET) flags |= LO_QUIET; - flags |= opts & SX_ADAPTIVESPIN; + flags |= opts & (SX_ADAPTIVESPIN | SX_RECURSE); sx->sx_lock = SX_LOCK_UNLOCKED; sx->sx_recurse = 0; lock_init(&sx->lock_object, &lock_class_sx, description, NULL, flags); @@ -254,7 +249,7 @@ KASSERT(sx->sx_lock != SX_LOCK_DESTROYED, ("sx_try_xlock() of destroyed sx @ %s:%d", file, line)); - if (sx_xlocked(sx)) { + if (sx_xlocked(sx) && (sx->lock_object.lo_flags & SX_RECURSE) != 0) { sx->sx_recurse++; atomic_set_ptr(&sx->sx_lock, SX_LOCK_RECURSED); rval = 1; @@ -412,6 +407,9 @@ /* If we already hold an exclusive lock, then recurse. */ if (sx_xlocked(sx)) { + KASSERT((sx->lock_object.lo_flags & SX_RECURSE) != 0, + ("_sx_xlock_hard: recursed on non-recursive sx %s @ %s:%d\n", + sx->lock_object.lo_name, file, line)); sx->sx_recurse++; atomic_set_ptr(&sx->sx_lock, SX_LOCK_RECURSED); if (LOCK_LOG_TEST(&sx->lock_object, 0)) ==== //depot/projects/smpng/sys/sys/sx.h#28 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * - * $FreeBSD: src/sys/sys/sx.h,v 1.31 2007/05/08 21:51:37 jhb Exp $ + * $FreeBSD: src/sys/sys/sx.h,v 1.33 2007/05/19 20:18:12 jhb Exp $ */ #ifndef _SYS_SX_H_ @@ -213,6 +213,14 @@ #define sx_try_upgrade(sx) _sx_try_upgrade((sx), LOCK_FILE, LOCK_LINE) #define sx_downgrade(sx) _sx_downgrade((sx), LOCK_FILE, LOCK_LINE) +/* + * Return a pointer to the owning thread if the lock is exclusively + * locked. + */ +#define sx_xholder(sx) \ + ((sx)->sx_lock & SX_LOCK_SHARED ? NULL : \ + (struct thread *)SX_OWNER((sx)->sx_lock)) + #define sx_xlocked(sx) \ (((sx)->sx_lock & ~(SX_LOCK_FLAGMASK & ~SX_LOCK_SHARED)) == \ (uintptr_t)curthread) @@ -235,6 +243,7 @@ #define SX_NOWITNESS 0x04 #define SX_QUIET 0x08 #define SX_ADAPTIVESPIN 0x10 +#define SX_RECURSE 0x20 /* * XXX: These options should be renamed as SA_* From owner-p4-projects@FreeBSD.ORG Sat May 19 20:40:36 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7136D16A469; Sat, 19 May 2007 20:40:36 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 470D616A421 for ; Sat, 19 May 2007 20:40:36 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 35B3413C457 for ; Sat, 19 May 2007 20:40:36 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4JKeaiW056343 for ; Sat, 19 May 2007 20:40:36 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4JKeZkR056334 for perforce@freebsd.org; Sat, 19 May 2007 20:40:35 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 19 May 2007 20:40:35 GMT Message-Id: <200705192040.l4JKeZkR056334@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 120076 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: Sat, 19 May 2007 20:40:36 -0000 http://perforce.freebsd.org/chv.cgi?CH=120076 Change 120076 by hselasky@hselasky_mini_itx on 2007/05/19 20:39:38 IFC @120073 Affected files ... .. //depot/projects/usb/src/sys/ia64/ia64/pmap.c#7 integrate .. //depot/projects/usb/src/sys/kern/kern_sx.c#6 integrate .. //depot/projects/usb/src/sys/sys/sx.h#5 integrate Differences ... ==== //depot/projects/usb/src/sys/ia64/ia64/pmap.c#7 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.184 2007/05/19 13:11:27 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/ia64/ia64/pmap.c,v 1.185 2007/05/19 18:25:14 marcel Exp $"); #include #include @@ -1420,14 +1420,14 @@ pmap_remove_pte(pmap, pte, va, pv, 1); } } - } else { - for (va = sva; va < eva; va = va += PAGE_SIZE) { + for (va = sva; va < eva; va += PAGE_SIZE) { pte = pmap_find_vhpt(va); if (pte != NULL) pmap_remove_pte(pmap, pte, va, 0, 1); } } + out: vm_page_unlock_queues(); pmap_install(oldpmap); ==== //depot/projects/usb/src/sys/kern/kern_sx.c#6 (text+ko) ==== @@ -40,7 +40,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/kern/kern_sx.c,v 1.46 2007/05/18 15:05:41 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_sx.c,v 1.49 2007/05/19 20:18:12 jhb Exp $"); #include #include @@ -101,14 +101,6 @@ */ #define sx_recursed(sx) ((sx)->sx_recurse != 0) -/* - * Return a pointer to the owning thread if the lock is exclusively - * locked. - */ -#define sx_xholder(sx) \ - ((sx)->sx_lock & SX_LOCK_SHARED ? NULL : \ - (struct thread *)SX_OWNER((sx)->sx_lock)) - #ifdef DDB static void db_show_sx(struct lock_object *lock); #endif @@ -170,6 +162,9 @@ { int flags; + MPASS((opts & ~(SX_QUIET | SX_RECURSE | SX_NOWITNESS | SX_DUPOK | + SX_NOPROFILE | SX_ADAPTIVESPIN)) == 0); + flags = LO_SLEEPABLE | LO_UPGRADABLE | LO_RECURSABLE; if (opts & SX_DUPOK) flags |= LO_DUPOK; @@ -180,7 +175,7 @@ if (opts & SX_QUIET) flags |= LO_QUIET; - flags |= opts & SX_ADAPTIVESPIN; + flags |= opts & (SX_ADAPTIVESPIN | SX_RECURSE); sx->sx_lock = SX_LOCK_UNLOCKED; sx->sx_recurse = 0; lock_init(&sx->lock_object, &lock_class_sx, description, NULL, flags); @@ -254,7 +249,7 @@ KASSERT(sx->sx_lock != SX_LOCK_DESTROYED, ("sx_try_xlock() of destroyed sx @ %s:%d", file, line)); - if (sx_xlocked(sx)) { + if (sx_xlocked(sx) && (sx->lock_object.lo_flags & SX_RECURSE) != 0) { sx->sx_recurse++; atomic_set_ptr(&sx->sx_lock, SX_LOCK_RECURSED); rval = 1; @@ -412,6 +407,9 @@ /* If we already hold an exclusive lock, then recurse. */ if (sx_xlocked(sx)) { + KASSERT((sx->lock_object.lo_flags & SX_RECURSE) != 0, + ("_sx_xlock_hard: recursed on non-recursive sx %s @ %s:%d\n", + sx->lock_object.lo_name, file, line)); sx->sx_recurse++; atomic_set_ptr(&sx->sx_lock, SX_LOCK_RECURSED); if (LOCK_LOG_TEST(&sx->lock_object, 0)) ==== //depot/projects/usb/src/sys/sys/sx.h#5 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * - * $FreeBSD: src/sys/sys/sx.h,v 1.31 2007/05/08 21:51:37 jhb Exp $ + * $FreeBSD: src/sys/sys/sx.h,v 1.33 2007/05/19 20:18:12 jhb Exp $ */ #ifndef _SYS_SX_H_ @@ -213,6 +213,14 @@ #define sx_try_upgrade(sx) _sx_try_upgrade((sx), LOCK_FILE, LOCK_LINE) #define sx_downgrade(sx) _sx_downgrade((sx), LOCK_FILE, LOCK_LINE) +/* + * Return a pointer to the owning thread if the lock is exclusively + * locked. + */ +#define sx_xholder(sx) \ + ((sx)->sx_lock & SX_LOCK_SHARED ? NULL : \ + (struct thread *)SX_OWNER((sx)->sx_lock)) + #define sx_xlocked(sx) \ (((sx)->sx_lock & ~(SX_LOCK_FLAGMASK & ~SX_LOCK_SHARED)) == \ (uintptr_t)curthread) @@ -235,6 +243,7 @@ #define SX_NOWITNESS 0x04 #define SX_QUIET 0x08 #define SX_ADAPTIVESPIN 0x10 +#define SX_RECURSE 0x20 /* * XXX: These options should be renamed as SA_* From owner-p4-projects@FreeBSD.ORG Sat May 19 20:52:52 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F189216A41F; Sat, 19 May 2007 20:52:51 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A4C6516A46E for ; Sat, 19 May 2007 20:52:51 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 93FAE13C44B for ; Sat, 19 May 2007 20:52:51 +0000 (UTC) (envelope-from ivoras@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4JKqpSW076901 for ; Sat, 19 May 2007 20:52:51 GMT (envelope-from ivoras@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4JKqpPa076892 for perforce@freebsd.org; Sat, 19 May 2007 20:52:51 GMT (envelope-from ivoras@FreeBSD.org) Date: Sat, 19 May 2007 20:52:51 GMT Message-Id: <200705192052.l4JKqpPa076892@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ivoras@FreeBSD.org using -f From: Ivan Voras To: Perforce Change Reviews Cc: Subject: PERFORCE change 120077 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: Sat, 19 May 2007 20:52:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=120077 Change 120077 by ivoras@ivoras_beastie on 2007/05/19 20:51:54 * Separate basic window UI support in a separate class (BaseWin) * Add "Help" button to MainWin Affected files ... .. //depot/projects/soc2007/ivoras_finstall/installer/basewin.py#1 add .. //depot/projects/soc2007/ivoras_finstall/installer/finstall.py#6 edit .. //depot/projects/soc2007/ivoras_finstall/installer/glade/mainwin.glade#5 edit Differences ... ==== //depot/projects/soc2007/ivoras_finstall/installer/finstall.py#6 (text+ko) ==== @@ -2,8 +2,9 @@ from types import MethodType import gtk, gtk.gdk, gtk.glade +from basewin import BaseWin -class MainWin: +class MainWin(BaseWin): # Configured tracks Steps_Novice = [ @@ -13,10 +14,8 @@ def __init__(self): + BaseWin.__init__(self, "mainwin") self.tile_xml = None # will be used for tiles - self.xml = gtk.glade.XML("glade/mainwin.glade") - self.window = self.xml.get_widget("mainwin") - self.xml.signal_autoconnect(self._get_event_handlers(None)) self["img_logo"].set_from_file("img/logo.jpg") # img_logo stretches the window vertically, so calling window.set_position() has no affect self._center_window(self.window) @@ -39,41 +38,6 @@ return self.xml.get_widget(key) - def _center_window(self, window): - """Centers window on screen """ - ws = window.get_size() - window.move((gtk.gdk.screen_width() - ws[0]) / 2, (gtk.gdk.screen_height() - ws[1]) / 2) - - - def _get_event_handlers(self, prefix): - """Returns a dictionary of form {'on_method' : self.on_method} for all - methods of self begining with "on_". This is useful for binding signal - handlers.""" - dict = {} - if prefix != None: - prefix2 = "%s_on_" % prefix - else: - prefix2 = "on_" - for name in dir(self): - if not name.startswith(prefix2): - continue - attr = getattr(self, name) - if isinstance(attr, MethodType): - dict[name[len(prefix2)-3:]] = attr - return dict - - - def _load_label(self, file_name): - """Returns the content of a text/* file with formatting replacements - so it looks decent when Pango renders it""" - return file("text/%s" % file_name).read().replace("\n", " ").replace("
", "\n").replace("\n ", "\n") - - - def _clear_container(self, cont): - for child in cont.get_children(): - cont.remove(child) - - def _load_tile(self, tile_name): """Loads a tile by it's name and integrates it in the wizard window""" self._clear_container(self.xml.get_widget("vbox_container")) @@ -145,7 +109,7 @@ def intro_on_next(self): if self["radio_novice"].get_active(): - pass # The default track is already Novice + pass # The default track is Novice elif self["radio_standard"].get_active(): print "standard" elif self["radio_expert"].get_active(): ==== //depot/projects/soc2007/ivoras_finstall/installer/glade/mainwin.glade#5 (text+ko) ==== @@ -33,6 +33,7 @@ 530 + 420 True GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK 3 @@ -159,6 +160,17 @@ True + + True + True + True + GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK + gtk-help + True + + + + True True @@ -166,6 +178,9 @@ gtk-cancel True + + 1 + @@ -177,7 +192,7 @@ - 1 + 2 @@ -190,7 +205,7 @@ - 2 + 3 From owner-p4-projects@FreeBSD.ORG Sat May 19 21:37:50 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E5B116A46B; Sat, 19 May 2007 21:37:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 00F7316A468 for ; Sat, 19 May 2007 21:37:50 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id E48C513C4BA for ; Sat, 19 May 2007 21:37:49 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4JLbn88019421 for ; Sat, 19 May 2007 21:37:49 GMT (envelope-from jhb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4JLbnnx019415 for perforce@freebsd.org; Sat, 19 May 2007 21:37:49 GMT (envelope-from jhb@freebsd.org) Date: Sat, 19 May 2007 21:37:49 GMT Message-Id: <200705192137.l4JLbnnx019415@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f From: John Baldwin To: Perforce Change Reviews Cc: Subject: PERFORCE change 120082 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: Sat, 19 May 2007 21:37:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=120082 Change 120082 by jhb@jhb_mutex on 2007/05/19 21:37:04 IFC @120081 Affected files ... .. //depot/projects/smpng/sys/kern/kern_sx.c#50 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#106 integrate .. //depot/projects/smpng/sys/sys/sx.h#29 integrate Differences ... ==== //depot/projects/smpng/sys/kern/kern_sx.c#50 (text+ko) ==== @@ -40,7 +40,7 @@ #include "opt_ddb.h" #include -__FBSDID("$FreeBSD: src/sys/kern/kern_sx.c,v 1.49 2007/05/19 20:18:12 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/kern_sx.c,v 1.50 2007/05/19 21:26:05 jhb Exp $"); #include #include @@ -139,7 +139,7 @@ struct sx *sx; sx = (struct sx *)lock; - sx_assert(sx, SX_LOCKED | SX_NOTRECURSED); + sx_assert(sx, SA_LOCKED | SA_NOTRECURSED); if (sx_xlocked(sx)) { sx_xunlock(sx); return (1); @@ -273,7 +273,7 @@ MPASS(curthread != NULL); KASSERT(sx->sx_lock != SX_LOCK_DESTROYED, ("sx_sunlock() of destroyed sx @ %s:%d", file, line)); - _sx_assert(sx, SX_SLOCKED, file, line); + _sx_assert(sx, SA_SLOCKED, file, line); curthread->td_locks--; WITNESS_UNLOCK(&sx->lock_object, 0, file, line); LOCK_LOG_LOCK("SUNLOCK", &sx->lock_object, 0, 0, file, line); @@ -289,7 +289,7 @@ MPASS(curthread != NULL); KASSERT(sx->sx_lock != SX_LOCK_DESTROYED, ("sx_xunlock() of destroyed sx @ %s:%d", file, line)); - _sx_assert(sx, SX_XLOCKED, file, line); + _sx_assert(sx, SA_XLOCKED, file, line); curthread->td_locks--; WITNESS_UNLOCK(&sx->lock_object, LOP_EXCLUSIVE, file, line); LOCK_LOG_LOCK("XUNLOCK", &sx->lock_object, 0, sx->sx_recurse, file, @@ -312,7 +312,7 @@ KASSERT(sx->sx_lock != SX_LOCK_DESTROYED, ("sx_try_upgrade() of destroyed sx @ %s:%d", file, line)); - _sx_assert(sx, SX_SLOCKED, file, line); + _sx_assert(sx, SA_SLOCKED, file, line); /* * Try to switch from one shared lock to an exclusive lock. We need @@ -339,7 +339,7 @@ KASSERT(sx->sx_lock != SX_LOCK_DESTROYED, ("sx_downgrade() of destroyed sx @ %s:%d", file, line)); - _sx_assert(sx, SX_XLOCKED | SX_NOTRECURSED, file, line); + _sx_assert(sx, SA_XLOCKED | SA_NOTRECURSED, file, line); #ifndef INVARIANTS if (sx_recursed(sx)) panic("downgrade of a recursed lock"); @@ -845,16 +845,16 @@ if (panicstr != NULL) return; switch (what) { - case SX_SLOCKED: - case SX_SLOCKED | SX_NOTRECURSED: - case SX_SLOCKED | SX_RECURSED: + case SA_SLOCKED: + case SA_SLOCKED | SA_NOTRECURSED: + case SA_SLOCKED | SA_RECURSED: #ifndef WITNESS slocked = 1; /* FALLTHROUGH */ #endif - case SX_LOCKED: - case SX_LOCKED | SX_NOTRECURSED: - case SX_LOCKED | SX_RECURSED: + case SA_LOCKED: + case SA_LOCKED | SA_NOTRECURSED: + case SA_LOCKED | SA_RECURSED: #ifdef WITNESS witness_assert(&sx->lock_object, what, file, line); #else @@ -872,31 +872,31 @@ if (!(sx->sx_lock & SX_LOCK_SHARED)) { if (sx_recursed(sx)) { - if (what & SX_NOTRECURSED) + if (what & SA_NOTRECURSED) panic("Lock %s recursed @ %s:%d\n", sx->lock_object.lo_name, file, line); - } else if (what & SX_RECURSED) + } else if (what & SA_RECURSED) panic("Lock %s not recursed @ %s:%d\n", sx->lock_object.lo_name, file, line); } #endif break; - case SX_XLOCKED: - case SX_XLOCKED | SX_NOTRECURSED: - case SX_XLOCKED | SX_RECURSED: + case SA_XLOCKED: + case SA_XLOCKED | SA_NOTRECURSED: + case SA_XLOCKED | SA_RECURSED: if (sx_xholder(sx) != curthread) panic("Lock %s not exclusively locked @ %s:%d\n", sx->lock_object.lo_name, file, line); if (sx_recursed(sx)) { - if (what & SX_NOTRECURSED) + if (what & SA_NOTRECURSED) panic("Lock %s recursed @ %s:%d\n", sx->lock_object.lo_name, file, line); - } else if (what & SX_RECURSED) + } else if (what & SA_RECURSED) panic("Lock %s not recursed @ %s:%d\n", sx->lock_object.lo_name, file, line); break; - case SX_UNLOCKED: + case SA_UNLOCKED: #ifdef WITNESS witness_assert(&sx->lock_object, what, file, line); #else ==== //depot/projects/smpng/sys/kern/uipc_syscalls.c#106 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.255 2007/05/16 20:41:08 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_syscalls.c,v 1.256 2007/05/19 20:50:59 andre Exp $"); #include "opt_sctp.h" #include "opt_compat.h" @@ -1819,8 +1819,8 @@ struct mbuf *m = NULL; struct sf_buf *sf; struct vm_page *pg; - off_t off, xfsize, sbytes = 0, rem = 0; - int error, mnw = 0; + off_t off, xfsize, fsbytes = 0, sbytes = 0, rem = 0; + int error, hdrlen = 0, mnw = 0; int vfslocked; NET_LOCK_GIANT(); @@ -1916,6 +1916,7 @@ error = mnw ? EAGAIN : ENOBUFS; goto out; } + hdrlen = m_length(m, NULL); } } @@ -1933,7 +1934,7 @@ * The outer loop checks the state and available space of the socket * and takes care of the overall progress. */ - for (off = uap->offset; ; ) { + for (off = uap->offset, rem = uap->nbytes; ; ) { int loopbytes = 0; int space = 0; int done = 0; @@ -1998,6 +1999,13 @@ SOCKBUF_UNLOCK(&so->so_snd); /* + * Reduce space in the socket buffer by the size of + * the header mbuf chain. + * hdrlen is set to 0 after the first loop. + */ + space -= hdrlen; + + /* * Loop and construct maximum sized mbuf chain to be bulk * dumped into socket buffer. */ @@ -2015,12 +2023,12 @@ pgoff = (vm_offset_t)(off & PAGE_MASK); xfsize = omin(PAGE_SIZE - pgoff, obj->un_pager.vnp.vnp_size - uap->offset - - sbytes - loopbytes); + fsbytes - loopbytes); if (uap->nbytes) - rem = (uap->nbytes - sbytes - loopbytes); + rem = (uap->nbytes - fsbytes - loopbytes); else - rem = obj->un_pager.vnp.vnp_size - uap->offset - - sbytes - loopbytes; + rem = obj->un_pager.vnp.vnp_size - + uap->offset - fsbytes - loopbytes; xfsize = omin(rem, xfsize); if (xfsize <= 0) { VM_OBJECT_UNLOCK(obj); @@ -2038,9 +2046,8 @@ } /* - * Attempt to look up the page. - * Allocate if not found or - * wait and loop if busy. + * Attempt to look up the page. Allocate + * if not found or wait and loop if busy. */ pindex = OFF_TO_IDX(off); pg = vm_page_grab(obj, pindex, VM_ALLOC_NOBUSY | @@ -2161,7 +2168,7 @@ /* Add the buffer chain to the socket buffer. */ if (m != NULL) { - int mlen; + int mlen, err; mlen = m_length(m, NULL); SOCKBUF_LOCK(&so->so_snd); @@ -2171,10 +2178,27 @@ goto done; } SOCKBUF_UNLOCK(&so->so_snd); - error = (*so->so_proto->pr_usrreqs->pru_send) + /* Avoid error aliasing. */ + err = (*so->so_proto->pr_usrreqs->pru_send) (so, 0, m, NULL, NULL, td); - if (!error) + if (err == 0) { + /* + * We need two counters to get the + * file offset and nbytes to send + * right: + * - sbytes contains the total amount + * of bytes sent, including headers. + * - fsbytes contains the total amount + * of bytes sent from the file. + */ sbytes += mlen; + fsbytes += mlen; + if (hdrlen) { + fsbytes -= hdrlen; + hdrlen = 0; + } + } else if (error == 0) + error = err; m = NULL; /* pru_send always consumes */ } ==== //depot/projects/smpng/sys/sys/sx.h#29 (text+ko) ==== @@ -26,7 +26,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH * DAMAGE. * - * $FreeBSD: src/sys/sys/sx.h,v 1.33 2007/05/19 20:18:12 jhb Exp $ + * $FreeBSD: src/sys/sys/sx.h,v 1.34 2007/05/19 21:26:05 jhb Exp $ */ #ifndef _SYS_SX_H_ @@ -245,10 +245,15 @@ #define SX_ADAPTIVESPIN 0x10 #define SX_RECURSE 0x20 -/* - * XXX: These options should be renamed as SA_* - */ #if defined(INVARIANTS) || defined(INVARIANT_SUPPORT) +#define SA_LOCKED LA_LOCKED +#define SA_SLOCKED LA_SLOCKED +#define SA_XLOCKED LA_XLOCKED +#define SA_UNLOCKED LA_UNLOCKED +#define SA_RECURSED LA_RECURSED +#define SA_NOTRECURSED LA_NOTRECURSED + +/* Backwards compatability. */ #define SX_LOCKED LA_LOCKED #define SX_SLOCKED LA_SLOCKED #define SX_XLOCKED LA_XLOCKED From owner-p4-projects@FreeBSD.ORG Sat May 19 21:40:55 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9719F16A485; Sat, 19 May 2007 21:40:55 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 4B02116A46B for ; Sat, 19 May 2007 21:40:55 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 39E0413C457 for ; Sat, 19 May 2007 21:40:55 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4JLetGC022165 for ; Sat, 19 May 2007 21:40:55 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4JLesM2022155 for perforce@freebsd.org; Sat, 19 May 2007 21:40:54 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 19 May 2007 21:40:54 GMT Message-Id: <200705192140.l4JLesM2022155@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 120084 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: Sat, 19 May 2007 21:40:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=120084 Change 120084 by hselasky@hselasky_mini_itx on 2007/05/19 21:40:06 Fix some problem related to sync/adaptive endpoints. Affected files ... .. //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#11 edit Differences ... ==== //depot/projects/usb/src/sys/dev/sound/usb/uaudio.c#11 (text+ko) ==== @@ -1042,11 +1042,12 @@ ep_sync = 1; } + /* Ignore sync endpoint information until further. */ +#if 0 if (ep_sync && (!ed2)) { continue; } -#if 1 /* we can't handle endpoints that need a sync pipe yet */ if (ep_sync) { @@ -1425,8 +1426,8 @@ */ if (ch->p_asf1d->bSamFreqType != 1) { if (uaudio_set_speed(sc->sc_udev, endpoint, ch->sample_rate)) { - DPRINTF(0, "setting of sample rate failed!\n"); - goto error; + /* If the endpoint is adaptive setting the speed may fail. */ + DPRINTF(0, "setting of sample rate failed! (continuing anyway)\n"); } } From owner-p4-projects@FreeBSD.ORG Sat May 19 22:08:29 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 71DCC16A46B; Sat, 19 May 2007 22:08:29 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 3184B16A468 for ; Sat, 19 May 2007 22:08:29 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id 20E5E13C447 for ; Sat, 19 May 2007 22:08:29 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l4JM8TU5043667 for ; Sat, 19 May 2007 22:08:29 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l4JM8SFA043658 for perforce@freebsd.org; Sat, 19 May 2007 22:08:28 GMT (envelope-from hselasky@FreeBSD.org) Date: Sat, 19 May 2007 22:08:28 GMT Message-Id: <200705192208.l4JM8SFA043658@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to hselasky@FreeBSD.org using -f From: Hans Petter Selasky To: Perforce Change Reviews Cc: Subject: PERFORCE change 120085 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: Sat, 19 May 2007 22:08:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=120085 Change 120085 by hselasky@hselasky_mini_itx on 2007/05/19 22:07:47 Correct order of include files in "ukbd.c". Affected files ... .. //depot/projects/usb/src/sys/dev/usb/ukbd.c#16 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb/ukbd.c#16 (text+ko) ==== @@ -1,3 +1,6 @@ +#include +__FBSDID("$FreeBSD: src/sys/dev/usb/ukbd.c,v 1.60 2007/05/12 05:53:53 brueffer Exp $"); + /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. * All rights reserved. @@ -46,7 +49,6 @@ #include "opt_kbd.h" #include "opt_ukbd.h" -#include #include #include #include @@ -57,7 +59,6 @@ #include #include -#include #include #include @@ -71,7 +72,8 @@ #include "ukbdmap.h" #endif -__FBSDID("$FreeBSD: src/sys/dev/usb/ukbd.c,v 1.60 2007/05/12 05:53:53 brueffer Exp $"); +/* the following file must be included after "ukbdmap.h" */ +#include #ifdef USB_DEBUG #define DPRINTF(n,fmt,...) \