From owner-p4-projects@FreeBSD.ORG Sun Nov 23 00:12:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7B6651065675; Sun, 23 Nov 2008 00:12:29 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 27125106564A for ; Sun, 23 Nov 2008 00:12:29 +0000 (UTC) (envelope-from gk@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 11A108FC16 for ; Sun, 23 Nov 2008 00:12:29 +0000 (UTC) (envelope-from gk@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAN0CTSV016517 for ; Sun, 23 Nov 2008 00:12:29 GMT (envelope-from gk@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAN0CTOx016515 for perforce@freebsd.org; Sun, 23 Nov 2008 00:12:29 GMT (envelope-from gk@FreeBSD.org) Date: Sun, 23 Nov 2008 00:12:29 GMT Message-Id: <200811230012.mAN0CTOx016515@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gk@FreeBSD.org using -f From: Gleb Kurtsou To: Perforce Change Reviews Cc: Subject: PERFORCE change 153374 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, 23 Nov 2008 00:12:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=153374 Change 153374 by gk@gk_h1 on 2008/11/23 00:11:54 Major improvement to ipfw tables. Extend tables to containg layer2 addresses only (= any ip address) and table lookup during layer2 filtering. Sponsored by: Korcett Holdings, Inc (www.korcett.com) Affected files ... .. //depot/projects/soc2008/gk_l2filter/sbin-ipfw/ipfw2.c#13 edit .. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_fw.h#13 edit .. //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_fw2.c#19 edit Differences ... ==== //depot/projects/soc2008/gk_l2filter/sbin-ipfw/ipfw2.c#13 (text+ko) ==== @@ -6022,7 +6022,7 @@ do_add = **av == 'a'; ac--; av++; if (!ac) - errx(EX_USAGE, "IP address required"); + errx(EX_USAGE, "Address required"); p = strchr(*av, '/'); if (p) { *p++ = '\0'; @@ -6031,11 +6031,19 @@ errx(EX_DATAERR, "bad width ``%s''", p); } else ent.masklen = 32; - if (lookup_host(*av, (struct in_addr *)&ent.addr) != 0) - errx(EX_NOHOST, "hostname ``%s'' unknown", *av); - ac--; av++; + if (strcmp(*av, "ether") == 0 || strcmp(*av, "any") == 0) { + ent.addr = INADDR_ANY; + ent.masklen = 0; + if ((*av)[0] == 'a') { /* any */ + ac--; av++; + } + } else { + if (lookup_host(*av, (struct in_addr *)&ent.addr) != 0) + errx(EX_NOHOST, "hostname ``%s'' unknown", *av); + ac--; av++; + } bzero(&ent.ether_addr, sizeof(ent.ether_addr)); - if (do_add && ac >= 2 && strcmp(*av, "ether") == 0) { + if (ac >= 2 && strcmp(*av, "ether") == 0) { get_ether_addr(av[1], &ent.ether_addr); ac-=2; av+=2; } @@ -6136,9 +6144,13 @@ tether_buf[0] = 0; } - printf("%s/%u %s%s\n", - inet_ntoa(*(struct in_addr *)&tbl->ent[a].addr), - tbl->ent[a].masklen, tether_buf, tval_buf); + if (tbl->ent[a].addr == INADDR_ANY && tbl->ent[a].masklen == 0) + printf("any"); + else + printf("%s/%u", + inet_ntoa(*(struct in_addr *)&tbl->ent[a].addr), + tbl->ent[a].masklen); + printf(" %s%s\n", tether_buf, tval_buf); } free(tbl); } ==== //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_fw.h#13 (text+ko) ==== @@ -682,11 +682,15 @@ #ifdef IPFW_INTERNAL +struct ipfw_table_head { + struct radix_node_head *in_rnh, *ether_rnh; +}; + struct ip_fw_chain { struct ip_fw *rules; /* list of rules */ struct ip_fw *reap; /* list of rules to reap */ LIST_HEAD(, cfg_nat) nat; /* list of nat entries */ - struct radix_node_head *tables[IPFW_TABLES_MAX]; + struct ipfw_table_head tables[IPFW_TABLES_MAX]; struct rwlock rwmtx; }; #define IPFW_LOCK_INIT(_chain) \ ==== //depot/projects/soc2008/gk_l2filter/sys-netinet/ip_fw2.c#19 (text+ko) ==== @@ -58,6 +58,7 @@ #include #include #include +#include #include #include #include @@ -181,10 +182,17 @@ return (ether_addr_allow(want, a)); } +struct table_entry_addr { + u_char len; + u_char __reserved; + struct ether_addr ether_addr; + in_addr_t in_addr; +}; + struct table_entry { - struct radix_node rn[2]; - struct sockaddr_in addr, mask; - ipfw_ether_addr ether_addr; + struct radix_node in_rn[2], ether_rn[2]; + struct table_entry_addr addr, mask; + int refcnt; u_int32_t value; }; @@ -1802,86 +1810,149 @@ return rule; } +static void +init_table_entry_addr(struct table_entry_addr *addr, struct table_entry_addr *mask, + in_addr_t in_addr, uint8_t mlen, ipfw_ether_addr *ether_addr) +{ + addr->len = mask->len = sizeof(struct table_entry_addr); + mask->in_addr = htonl(mlen ? ~((1 << (32 - mlen)) - 1) : 0); + addr->in_addr = in_addr & mask->in_addr; + if (ether_addr && (ether_addr->flags & IPFW_EA_CHECK)) { + if (ether_addr->flags & IPFW_EA_MULTICAST) { + bzero(addr->ether_addr.octet, ETHER_ADDR_LEN); + addr->ether_addr.octet[0] = 0x01; + bzero(mask->ether_addr.octet, ETHER_ADDR_LEN); + mask->ether_addr.octet[0] = 0x01; + } else { + memcpy(addr->ether_addr.octet, ether_addr->octet, ETHER_ADDR_LEN); + memset(mask->ether_addr.octet, 0xff, ETHER_ADDR_LEN); + } + } else { + /* set any ether addr */ + bzero(addr->ether_addr.octet, ETHER_ADDR_LEN); + memset(mask->ether_addr.octet, 0xff, ETHER_ADDR_LEN); + } +} + +static __inline struct table_entry * +__rn_to_table_entry(struct radix_node *_rn, int off) +{ + char *rn = (char*) _rn; + + if (rn == NULL) + return NULL; + return (struct table_entry*)(rn - off); + +} + +#define RN_TO_ENT(e, r) (__rn_to_table_entry(e, __offsetof(struct table_entry, r))) + +static __inline void +release_table_entry(struct ipfw_table_head *th, struct table_entry *ent) +{ + IPFW_WLOCK_ASSERT(&V_layer3_chain); /* FIXME */ + + if (refcount_release(&ent->refcnt)) { + if (ent->in_rn[0].rn_flags) + th->in_rnh->rnh_deladdr(&ent->addr, &ent->mask, th->in_rnh); + free(ent, M_IPFW_TBL); + } +} + static int add_table_entry(struct ip_fw_chain *ch, uint16_t tbl, in_addr_t addr, uint8_t mlen, ipfw_ether_addr *ether_addr, uint32_t value) { INIT_VNET_IPFW(curvnet); - struct radix_node_head *rnh; - struct table_entry *ent; + struct ipfw_table_head *th; + struct table_entry *ent, *in_ent; if (tbl >= IPFW_TABLES_MAX) return (EINVAL); - rnh = ch->tables[tbl]; + th = &ch->tables[tbl]; ent = malloc(sizeof(*ent), M_IPFW_TBL, M_NOWAIT | M_ZERO); if (ent == NULL) return (ENOMEM); + refcount_init(&ent->refcnt, 1); ent->value = value; - ent->addr.sin_len = ent->mask.sin_len = 8; - ent->mask.sin_addr.s_addr = htonl(mlen ? ~((1 << (32 - mlen)) - 1) : 0); - ent->addr.sin_addr.s_addr = addr & ent->mask.sin_addr.s_addr; - ent->ether_addr = *ether_addr; + init_table_entry_addr(&ent->addr, &ent->mask, addr, mlen, ether_addr); IPFW_WLOCK(&V_layer3_chain); - if (rnh->rnh_addaddr(&ent->addr, &ent->mask, rnh, (void *)ent) == - NULL) { + if (th->ether_rnh->rnh_addaddr(&ent->addr, &ent->mask, th->ether_rnh, + ent->ether_rn) == NULL) { IPFW_WUNLOCK(&V_layer3_chain); free(ent, M_IPFW_TBL); return (EEXIST); } + in_ent = RN_TO_ENT(th->in_rnh->rnh_lookup(&ent->addr, &ent->mask, th->in_rnh), + in_rn); + if (in_ent == NULL) { + in_ent = RN_TO_ENT(th->in_rnh->rnh_addaddr(&ent->addr, &ent->mask, + th->in_rnh, ent->in_rn), in_rn); + if (in_ent == NULL) { + th->ether_rnh->rnh_deladdr(&ent->addr, &ent->mask, th->ether_rnh); + IPFW_WUNLOCK(&V_layer3_chain); + free(ent, M_IPFW_TBL); + return (EEXIST); + } + } + refcount_acquire(&in_ent->refcnt); IPFW_WUNLOCK(&V_layer3_chain); return (0); } +static __inline int +delete_table_entry_rn(struct ipfw_table_head *th, void *addr, void *mask) +{ + struct table_entry *ent, *in_ent; + + ent = RN_TO_ENT(th->ether_rnh->rnh_deladdr(addr, mask, th->ether_rnh), + ether_rn); + if (ent == NULL) + return (ESRCH); + in_ent = RN_TO_ENT(th->in_rnh->rnh_lookup(&ent->addr, &ent->mask, th->in_rnh), + in_rn); + release_table_entry(th, in_ent); + release_table_entry(th, ent); + return (0); +} + static int del_table_entry(struct ip_fw_chain *ch, uint16_t tbl, in_addr_t addr, - uint8_t mlen) + uint8_t mlen, ipfw_ether_addr *ether_addr) { - struct radix_node_head *rnh; - struct table_entry *ent; - struct sockaddr_in sa, mask; + struct ipfw_table_head *th; + struct table_entry_addr sa, mask; + int err; if (tbl >= IPFW_TABLES_MAX) return (EINVAL); - rnh = ch->tables[tbl]; - sa.sin_len = mask.sin_len = 8; - mask.sin_addr.s_addr = htonl(mlen ? ~((1 << (32 - mlen)) - 1) : 0); - sa.sin_addr.s_addr = addr & mask.sin_addr.s_addr; + th = &ch->tables[tbl]; + init_table_entry_addr(&sa, &mask, addr, mlen, ether_addr); IPFW_WLOCK(ch); - ent = (struct table_entry *)rnh->rnh_deladdr(&sa, &mask, rnh); - if (ent == NULL) { - IPFW_WUNLOCK(ch); - return (ESRCH); - } + err = delete_table_entry_rn(th, &sa, &mask); IPFW_WUNLOCK(ch); - free(ent, M_IPFW_TBL); - return (0); + return (err); } static int flush_table_entry(struct radix_node *rn, void *arg) { - struct radix_node_head * const rnh = arg; - struct table_entry *ent; - - ent = (struct table_entry *) - rnh->rnh_deladdr(rn->rn_key, rn->rn_mask, rnh); - if (ent != NULL) - free(ent, M_IPFW_TBL); + delete_table_entry_rn((struct ipfw_table_head *)arg, rn->rn_key, rn->rn_mask); return (0); } static int flush_table(struct ip_fw_chain *ch, uint16_t tbl) { - struct radix_node_head *rnh; + struct ipfw_table_head *th; IPFW_WLOCK_ASSERT(ch); if (tbl >= IPFW_TABLES_MAX) return (EINVAL); - rnh = ch->tables[tbl]; - KASSERT(rnh != NULL, ("NULL IPFW table")); - rnh->rnh_walktree(rnh, flush_table_entry, rnh); + th = &ch->tables[tbl]; + KASSERT(th->ether_rnh != NULL, ("NULL IPFW table")); + th->ether_rnh->rnh_walktree(th->ether_rnh, flush_table_entry, th); return (0); } @@ -1903,7 +1974,12 @@ uint16_t j; for (i = 0; i < IPFW_TABLES_MAX; i++) { - if (!rn_inithead((void **)&ch->tables[i], 32)) { + struct ipfw_table_head *th = &ch->tables[i]; + + if (!rn_inithead((void**)&(th->in_rnh), + __offsetof(struct table_entry_addr, in_addr) * 8) || + !rn_inithead((void**)&(th->ether_rnh), + __offsetof(struct table_entry_addr, ether_addr) * 8)) { for (j = 0; j < i; j++) { (void) flush_table(ch, j); } @@ -1915,22 +1991,35 @@ static int lookup_table(struct ip_fw_chain *ch, uint16_t tbl, in_addr_t addr, - ipfw_ether_addr *ea, uint32_t *val) + ipfw_ether_addr *ether_addr, uint32_t *val) { - struct radix_node_head *rnh; - struct table_entry *ent; - struct sockaddr_in sa; + struct ipfw_table_head *th; + struct table_entry_addr sa, mask; + struct table_entry *ent = NULL; + const int has_ether_addr = (ether_addr && (ether_addr->flags & IPFW_EA_CHECK)); + const int has_in_addr = (addr != INADDR_ANY); if (tbl >= IPFW_TABLES_MAX) return (0); - rnh = ch->tables[tbl]; - sa.sin_len = 8; - sa.sin_addr.s_addr = addr; - ent = (struct table_entry *)(rnh->rnh_lookup(&sa, NULL, rnh)); + th = &ch->tables[tbl]; + init_table_entry_addr(&sa, &mask, addr, (addr == INADDR_ANY ? 0 : 32), ether_addr); + if (has_ether_addr) { + ent = RN_TO_ENT(th->ether_rnh->rnh_lookup(&sa, NULL, th->ether_rnh), + ether_rn); + if (ent == NULL && has_in_addr) { + /* + * Try to lookup entry with any (zero) ether_addr. It's + * handled this way not to deal with non-continuous + * masks in radix trees. + */ + bzero(sa.ether_addr.octet, ETHER_ADDR_LEN); + ent = RN_TO_ENT(th->ether_rnh->rnh_lookup(&sa, NULL, th->ether_rnh), + ether_rn); + } + } else if (has_in_addr) { + ent = RN_TO_ENT(th->in_rnh->rnh_lookup(&sa, NULL, th->in_rnh), in_rn); + } if (ent != NULL) { - if (ea && !ether_addr_allow(&ent->ether_addr, ea)) - return (0); - /* use address to create dynamic rule */ *val = ent->value; return (1); } @@ -1949,20 +2038,20 @@ static int count_table(struct ip_fw_chain *ch, uint32_t tbl, uint32_t *cnt) { - struct radix_node_head *rnh; + struct ipfw_table_head *th; if (tbl >= IPFW_TABLES_MAX) return (EINVAL); - rnh = ch->tables[tbl]; + th = &ch->tables[tbl]; *cnt = 0; - rnh->rnh_walktree(rnh, count_table_entry, cnt); + th->ether_rnh->rnh_walktree(th->ether_rnh, count_table_entry, cnt); return (0); } static int dump_table_entry(struct radix_node *rn, void *arg) { - struct table_entry * const n = (struct table_entry *)rn; + struct table_entry * const n = RN_TO_ENT(rn, ether_rn); ipfw_table * const tbl = arg; ipfw_table_entry *ent; @@ -1970,12 +2059,23 @@ return (1); ent = &tbl->ent[tbl->cnt]; ent->tbl = tbl->tbl; - if (in_nullhost(n->mask.sin_addr)) + if (n->mask.in_addr == INADDR_ANY) ent->masklen = 0; else - ent->masklen = 33 - ffs(ntohl(n->mask.sin_addr.s_addr)); - ent->addr = n->addr.sin_addr.s_addr; - ent->ether_addr = n->ether_addr; + ent->masklen = 33 - ffs(ntohl(n->mask.in_addr)); + ent->addr = n->addr.in_addr; + memcpy(ent->ether_addr.octet, n->addr.ether_addr.octet, ETHER_ADDR_LEN); + ent->ether_addr.flags = 0; + +#define __ETHER_IS_ZERO(a) (((a)[0] | (a)[1] | (a)[2] | (a)[3] | (a)[4] | (a)[5]) == 0) + if (!__ETHER_IS_ZERO(n->mask.ether_addr.octet) && + !__ETHER_IS_ZERO(n->addr.ether_addr.octet)) { + ent->ether_addr.flags = IPFW_EA_CHECK; + /* Should be fixed after adding new flags */ + if (n->mask.ether_addr.octet[0] == 0x01) + ent->ether_addr.flags |= IPFW_EA_MULTICAST; + } +#undef __ETHER_IS_ZERO ent->value = n->value; tbl->cnt++; return (0); @@ -1984,13 +2084,13 @@ static int dump_table(struct ip_fw_chain *ch, ipfw_table *tbl) { - struct radix_node_head *rnh; + struct ipfw_table_head *th; if (tbl->tbl >= IPFW_TABLES_MAX) return (EINVAL); - rnh = ch->tables[tbl->tbl]; + th = &ch->tables[tbl->tbl]; tbl->cnt = 0; - rnh->rnh_walktree(rnh, dump_table_entry, tbl); + th->ether_rnh->rnh_walktree(th->ether_rnh, dump_table_entry, tbl); return (0); } @@ -2707,16 +2807,21 @@ case O_IP_SRC_LOOKUP: case O_IP_DST_LOOKUP: - if (is_ipv4) { - ipfw_ether_addr *ea = - (cmd->opcode == O_IP_DST_LOOKUP ? - &args->f_id.dst_ether : - &args->f_id.src_ether); - uint32_t a = - (cmd->opcode == O_IP_DST_LOOKUP) ? - dst_ip.s_addr : src_ip.s_addr; + if (is_ipv4 || (args->flags & IP_FW_ARGS_LAYER2)) { + ipfw_ether_addr *ea; + uint32_t a; uint32_t v; + if (cmd->opcode == O_IP_DST_LOOKUP) { + a = dst_ip.s_addr; + ea = &args->f_id.dst_ether; + } else { + a = src_ip.s_addr; + ea = &args->f_id.src_ether; + } + if (args->flags & IP_FW_ARGS_LAYER2) + a = INADDR_ANY; + match = lookup_table(chain, cmd->arg1, a, ea, &v); if (!match) @@ -4441,7 +4546,7 @@ if (error) break; error = del_table_entry(&V_layer3_chain, ent.tbl, - ent.addr, ent.masklen); + ent.addr, ent.masklen, &ent.ether_addr); } break; From owner-p4-projects@FreeBSD.ORG Sun Nov 23 09:48:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AFE441065675; Sun, 23 Nov 2008 09:48:13 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 726C11065670 for ; Sun, 23 Nov 2008 09:48:13 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 61FE18FC0A for ; Sun, 23 Nov 2008 09:48:13 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAN9mDKE000875 for ; Sun, 23 Nov 2008 09:48:13 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAN9mDNQ000873 for perforce@freebsd.org; Sun, 23 Nov 2008 09:48:13 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 23 Nov 2008 09:48:13 GMT Message-Id: <200811230948.mAN9mDNQ000873@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 153382 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, 23 Nov 2008 09:48:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=153382 Change 153382 by hselasky@hselasky_laptop001 on 2008/11/23 09:47:22 USB mass storage test improvements. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.c#11 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.c#11 (text+ko) ==== @@ -72,8 +72,7 @@ DIR_NONE, }; -#define BULK_SIZE 64 /* dummy */ - +#define BULK_SIZE 64 /* dummy */ /* Command Block Wrapper */ struct bbb_cbw { @@ -171,7 +170,7 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, .mh.bufsize = BULK_SIZE, - .mh.flags = {.proxy_buffer = 1,.short_xfer_ok = 1,}, + .mh.flags = {.proxy_buffer = 1,}, .mh.callback = &bbb_data_write_callback, .mh.timeout = 4 * USB_MS_HZ, /* 4 seconds */ }, @@ -279,6 +278,7 @@ DPRINTFN(0, "Truncating long command!\n"); } xfer->frlengths[0] = sizeof(sc->cbw); + xfer->flags.stall_pipe = 1; usb2_set_frame_data(xfer, &sc->cbw, 0); usb2_start_hardware(xfer); @@ -537,12 +537,14 @@ repeat_inquiry: sc->cbw.CBWCDB[0] = 0x12; /* INQUIRY */ - - err = bbb_command_start(sc, DIR_IN, 0, sc->buffer, 256, 6, USB_MS_HZ); - if (err) { - err = bbb_command_start(sc, DIR_IN, 0, sc->buffer, 256, 12, USB_MS_HZ); - if (err) { - err = bbb_command_start(sc, DIR_IN, 0, sc->buffer, 256, 16, USB_MS_HZ); + err = bbb_command_start(sc, DIR_IN, 0, + sc->buffer, 256, 6, USB_MS_HZ); + if (err == 1) { + err = bbb_command_start(sc, DIR_IN, 0, + sc->buffer, 256, 12, USB_MS_HZ); + if (err == 1) { + err = bbb_command_start(sc, DIR_IN, 0, + sc->buffer, 256, 16, USB_MS_HZ); } } if ((sc->actlen != 0) && (err == 0)) { @@ -570,7 +572,7 @@ err = 0; goto done; } - } else if (--timeout) { + } else if ((err != 2) && --timeout) { usb2_pause_mtx(&sc->mtx, USB_MS_HZ); goto repeat_inquiry; } From owner-p4-projects@FreeBSD.ORG Sun Nov 23 10:59:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9BE1C1065673; Sun, 23 Nov 2008 10:59:26 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 602BD106564A for ; Sun, 23 Nov 2008 10:59:26 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 52BED8FC16 for ; Sun, 23 Nov 2008 10:59:26 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mANAxQDG007251 for ; Sun, 23 Nov 2008 10:59:26 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mANAxQNG007249 for perforce@freebsd.org; Sun, 23 Nov 2008 10:59:26 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 23 Nov 2008 10:59:26 GMT Message-Id: <200811231059.mANAxQNG007249@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 153384 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, 23 Nov 2008 10:59:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=153384 Change 153384 by hselasky@hselasky_laptop001 on 2008/11/23 10:58:30 More fixes to mass storage test. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.c#12 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_msctest.c#12 (text+ko) ==== @@ -273,12 +273,12 @@ USETDW(sc->cbw.dCBWDataTransferLength, sc->data_len); sc->cbw.bCBWFlags = ((sc->dir == DIR_IN) ? CBWFLAGS_IN : CBWFLAGS_OUT); sc->cbw.bCBWLUN = sc->lun; + sc->cbw.bCDBLength = sc->cmd_len; if (sc->cbw.bCDBLength > sizeof(sc->cbw.CBWCDB)) { sc->cbw.bCDBLength = sizeof(sc->cbw.CBWCDB); DPRINTFN(0, "Truncating long command!\n"); } xfer->frlengths[0] = sizeof(sc->cbw); - xfer->flags.stall_pipe = 1; usb2_set_frame_data(xfer, &sc->cbw, 0); usb2_start_hardware(xfer); @@ -537,16 +537,14 @@ repeat_inquiry: sc->cbw.CBWCDB[0] = 0x12; /* INQUIRY */ + sc->cbw.CBWCDB[1] = 0; + sc->cbw.CBWCDB[2] = 0; + sc->cbw.CBWCDB[3] = 0; + sc->cbw.CBWCDB[4] = 0x24; /* length */ + sc->cbw.CBWCDB[5] = 0; err = bbb_command_start(sc, DIR_IN, 0, - sc->buffer, 256, 6, USB_MS_HZ); - if (err == 1) { - err = bbb_command_start(sc, DIR_IN, 0, - sc->buffer, 256, 12, USB_MS_HZ); - if (err == 1) { - err = bbb_command_start(sc, DIR_IN, 0, - sc->buffer, 256, 16, USB_MS_HZ); - } - } + sc->buffer, 0x24, 6, USB_MS_HZ); + if ((sc->actlen != 0) && (err == 0)) { sid_type = sc->buffer[0] & 0x1F; if (sid_type == 0x05) { From owner-p4-projects@FreeBSD.ORG Sun Nov 23 11:07:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51468106567A; Sun, 23 Nov 2008 11:07:35 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 14F861065675 for ; Sun, 23 Nov 2008 11:07:35 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 05B0E8FC17 for ; Sun, 23 Nov 2008 11:07:35 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mANB7YK9008819 for ; Sun, 23 Nov 2008 11:07:34 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mANB7YQB008817 for perforce@freebsd.org; Sun, 23 Nov 2008 11:07:34 GMT (envelope-from hselasky@FreeBSD.org) Date: Sun, 23 Nov 2008 11:07:34 GMT Message-Id: <200811231107.mANB7YQB008817@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 153385 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, 23 Nov 2008 11:07:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=153385 Change 153385 by hselasky@hselasky_laptop001 on 2008/11/23 11:07:16 IFC @ 1553381 Affected files ... .. //depot/projects/usb/src/sys/amd64/amd64/elf_machdep.c#4 integrate .. //depot/projects/usb/src/sys/amd64/include/atomic.h#4 integrate .. //depot/projects/usb/src/sys/amd64/linux32/linux32_sysvec.c#11 integrate .. //depot/projects/usb/src/sys/arm/arm/elf_machdep.c#5 integrate .. //depot/projects/usb/src/sys/arm/include/atomic.h#5 integrate .. //depot/projects/usb/src/sys/arm/mv/mv_pci.c#2 integrate .. //depot/projects/usb/src/sys/boot/arm/uboot/Makefile#2 integrate .. //depot/projects/usb/src/sys/boot/arm/uboot/conf.c#2 integrate .. //depot/projects/usb/src/sys/boot/arm/uboot/version#2 integrate .. //depot/projects/usb/src/sys/boot/common/interp.c#2 integrate .. //depot/projects/usb/src/sys/boot/i386/Makefile#5 integrate .. //depot/projects/usb/src/sys/boot/i386/gptzfsboot/Makefile#1 branch .. //depot/projects/usb/src/sys/boot/i386/libi386/biosdisk.c#6 integrate .. //depot/projects/usb/src/sys/boot/i386/zfsboot/zfsboot.c#2 integrate .. //depot/projects/usb/src/sys/boot/uboot/lib/devicename.c#2 integrate .. //depot/projects/usb/src/sys/boot/uboot/lib/disk.c#2 integrate .. //depot/projects/usb/src/sys/boot/uboot/lib/glue.c#4 integrate .. //depot/projects/usb/src/sys/boot/uboot/lib/glue.h#4 integrate .. //depot/projects/usb/src/sys/boot/uboot/lib/libuboot.h#2 integrate .. //depot/projects/usb/src/sys/boot/uboot/lib/net.c#4 integrate .. //depot/projects/usb/src/sys/boot/zfs/Makefile#2 integrate .. //depot/projects/usb/src/sys/boot/zfs/zfs.c#2 integrate .. //depot/projects/usb/src/sys/boot/zfs/zfsimpl.c#2 integrate .. //depot/projects/usb/src/sys/cddl/boot/zfs/zfsimpl.h#2 integrate .. //depot/projects/usb/src/sys/cddl/boot/zfs/zfssubr.c#2 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate .. //depot/projects/usb/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#5 integrate .. //depot/projects/usb/src/sys/compat/ia32/ia32_sysvec.c#8 integrate .. //depot/projects/usb/src/sys/compat/svr4/svr4_sysvec.c#5 integrate .. //depot/projects/usb/src/sys/conf/files#42 integrate .. //depot/projects/usb/src/sys/dev/acpica/acpi_hpet.c#8 integrate .. //depot/projects/usb/src/sys/dev/bce/if_bcereg.h#9 integrate .. //depot/projects/usb/src/sys/dev/cardbus/cardbus_device.c#4 integrate .. //depot/projects/usb/src/sys/dev/cardbus/cardbusvar.h#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_ael1002.c#7 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_common.h#8 integrate .. //depot/projects/usb/src/sys/dev/cxgb/common/cxgb_t3_hw.c#9 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_adapter.h#8 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_config.h#6 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_main.c#11 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_multiq.c#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_osdep.h#9 integrate .. //depot/projects/usb/src/sys/dev/cxgb/cxgb_sge.c#9 integrate .. //depot/projects/usb/src/sys/dev/cxgb/sys/cxgb_support.c#3 integrate .. //depot/projects/usb/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#3 integrate .. //depot/projects/usb/src/sys/dev/dcons/dcons_crom.c#3 integrate .. //depot/projects/usb/src/sys/dev/dcons/dcons_os.c#8 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_arm.c#3 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_ia64.c#3 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_powerpc.c#3 integrate .. //depot/projects/usb/src/sys/dev/hwpmc/hwpmc_sparc64.c#3 integrate .. //depot/projects/usb/src/sys/dev/mxge/if_mxge_var.h#8 integrate .. //depot/projects/usb/src/sys/dev/nmdm/nmdm.c#6 integrate .. //depot/projects/usb/src/sys/dev/nxge/xge-osdep.h#3 integrate .. //depot/projects/usb/src/sys/dev/sound/pci/hda/hdac.c#13 integrate .. //depot/projects/usb/src/sys/dev/uart/uart_dev_quicc.c#2 integrate .. //depot/projects/usb/src/sys/i386/i386/elf_machdep.c#4 integrate .. //depot/projects/usb/src/sys/i386/ibcs2/ibcs2_sysvec.c#4 integrate .. //depot/projects/usb/src/sys/i386/include/atomic.h#4 integrate .. //depot/projects/usb/src/sys/i386/include/xen/xen-os.h#3 integrate .. //depot/projects/usb/src/sys/i386/linux/linux_sysvec.c#8 integrate .. //depot/projects/usb/src/sys/ia64/ia64/elf_machdep.c#5 integrate .. //depot/projects/usb/src/sys/ia64/include/atomic.h#5 integrate .. //depot/projects/usb/src/sys/kern/imgact_aout.c#5 integrate .. //depot/projects/usb/src/sys/kern/kern_thr.c#10 integrate .. //depot/projects/usb/src/sys/kern/subr_bufring.c#1 branch .. //depot/projects/usb/src/sys/kern/uipc_socket.c#14 integrate .. //depot/projects/usb/src/sys/mips/mips/elf_machdep.c#3 integrate .. //depot/projects/usb/src/sys/modules/uart/Makefile#3 integrate .. //depot/projects/usb/src/sys/net/if.c#14 integrate .. //depot/projects/usb/src/sys/net/if_ethersubr.c#12 integrate .. //depot/projects/usb/src/sys/net/if_fddisubr.c#7 integrate .. //depot/projects/usb/src/sys/net/if_fwsubr.c#10 integrate .. //depot/projects/usb/src/sys/net/if_lagg.c#10 integrate .. //depot/projects/usb/src/sys/net/if_tun.c#9 integrate .. //depot/projects/usb/src/sys/net/if_var.h#10 integrate .. //depot/projects/usb/src/sys/net/if_vlan.c#9 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_hostap.c#5 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_output.c#12 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_var.h#11 integrate .. //depot/projects/usb/src/sys/net80211/ieee80211_wds.c#4 integrate .. //depot/projects/usb/src/sys/netgraph/ng_base.c#13 integrate .. //depot/projects/usb/src/sys/netgraph/ng_iface.c#7 integrate .. //depot/projects/usb/src/sys/netgraph/ng_l2tp.c#7 integrate .. //depot/projects/usb/src/sys/netgraph/ng_socket.c#7 integrate .. //depot/projects/usb/src/sys/netinet/ip_divert.c#11 integrate .. //depot/projects/usb/src/sys/netinet/raw_ip.c#14 integrate .. //depot/projects/usb/src/sys/powerpc/include/atomic.h#5 integrate .. //depot/projects/usb/src/sys/powerpc/powerpc/elf_machdep.c#4 integrate .. //depot/projects/usb/src/sys/sparc64/include/atomic.h#3 integrate .. //depot/projects/usb/src/sys/sparc64/include/intr_machdep.h#7 integrate .. //depot/projects/usb/src/sys/sparc64/pci/schizo.c#2 integrate .. //depot/projects/usb/src/sys/sparc64/pci/schizoreg.h#2 integrate .. //depot/projects/usb/src/sys/sparc64/pci/schizovar.h#2 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/elf_machdep.c#6 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/intr_machdep.c#8 integrate .. //depot/projects/usb/src/sys/sparc64/sparc64/nexus.c#4 integrate .. //depot/projects/usb/src/sys/sun4v/include/atomic.h#3 integrate .. //depot/projects/usb/src/sys/sys/buf_ring.h#1 branch .. //depot/projects/usb/src/sys/sys/bus_dma.h#4 edit .. //depot/projects/usb/src/sys/sys/disklabel.h#3 integrate .. //depot/projects/usb/src/sys/sys/mbuf.h#9 integrate .. //depot/projects/usb/src/sys/sys/param.h#16 integrate .. //depot/projects/usb/src/sys/sys/sysent.h#10 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_dirhash.c#6 integrate .. //depot/projects/usb/src/sys/ufs/ufs/ufs_lookup.c#9 integrate Differences ... ==== //depot/projects/usb/src/sys/amd64/amd64/elf_machdep.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.27 2008/09/24 10:14:37 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.28 2008/11/22 12:36:15 kib Exp $"); #include #include @@ -72,7 +72,8 @@ .sv_copyout_strings = exec_copyout_strings, .sv_setregs = exec_setregs, .sv_fixlimit = NULL, - .sv_maxssiz = NULL + .sv_maxssiz = NULL, + .sv_flags = SV_ABI_FREEBSD | SV_LP64 }; static Elf64_Brandinfo freebsd_brand_info = { ==== //depot/projects/usb/src/sys/amd64/include/atomic.h#4 (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/amd64/include/atomic.h,v 1.45 2008/03/16 21:20:48 pjd Exp $ + * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.46 2008/11/22 05:55:56 kmacy Exp $ */ #ifndef _MACHINE_ATOMIC_H_ #define _MACHINE_ATOMIC_H_ @@ -32,6 +32,10 @@ #error this file needs sys/cdefs.h as a prerequisite #endif +#define mb() __asm__ __volatile__ ("mfence;": : :"memory") +#define wmb() __asm__ __volatile__ ("sfence;": : :"memory") +#define rmb() __asm__ __volatile__ ("lfence;": : :"memory") + /* * Various simple operations on memory, each of which is atomic in the * presence of interrupts and multiple processors. ==== //depot/projects/usb/src/sys/amd64/linux32/linux32_sysvec.c#11 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.37 2008/10/19 10:02:26 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.38 2008/11/22 12:36:15 kib Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -1026,6 +1026,7 @@ .sv_setregs = exec_linux_setregs, .sv_fixlimit = linux32_fixlimit, .sv_maxssiz = &linux32_maxssiz, + .sv_flags = SV_ABI_LINUX | SV_ILP32 | SV_IA32 }; static Elf32_Brandinfo linux_brand = { ==== //depot/projects/usb/src/sys/arm/arm/elf_machdep.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.9 2008/10/13 18:59:59 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.10 2008/11/22 12:36:15 kib Exp $"); #include #include @@ -72,7 +72,8 @@ .sv_copyout_strings = exec_copyout_strings, .sv_setregs = exec_setregs, .sv_fixlimit = NULL, - .sv_maxssiz = NULL + .sv_maxssiz = NULL, + .sv_flags = SV_ABI_FREEBSD | SV_ILP32 }; static Elf32_Brandinfo freebsd_brand_info = { ==== //depot/projects/usb/src/sys/arm/include/atomic.h#5 (text+ko) ==== @@ -33,7 +33,7 @@ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/atomic.h,v 1.24 2008/02/05 10:22:33 raj Exp $ + * $FreeBSD: src/sys/arm/include/atomic.h,v 1.25 2008/11/22 05:55:56 kmacy Exp $ */ #ifndef _MACHINE_ATOMIC_H_ @@ -47,6 +47,10 @@ #include #endif +#define mb() +#define wmb() +#define rmb() + #ifndef I32_bit #define I32_bit (1 << 7) /* IRQ disable */ #endif ==== //depot/projects/usb/src/sys/arm/mv/mv_pci.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/mv/mv_pci.c,v 1.1 2008/11/19 11:30:44 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/mv/mv_pci.c,v 1.2 2008/11/19 17:07:01 raj Exp $"); #include #include @@ -369,8 +369,10 @@ &sc->sc_rid, sc->sc_info->op_base, sc->sc_info->op_base + sc->sc_info->op_size - 1, sc->sc_info->op_size, RF_ACTIVE); - if (sc->sc_res == NULL) + if (sc->sc_res == NULL) { device_printf(parent, "Could not map pcib memory\n"); + break; + } sc->sc_bst = rman_get_bustag(sc->sc_res); sc->sc_bsh = rman_get_bushandle(sc->sc_res); ==== //depot/projects/usb/src/sys/boot/arm/uboot/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/arm/uboot/Makefile,v 1.1 2008/10/14 10:11:14 raj Exp $ +# $FreeBSD: src/sys/boot/arm/uboot/Makefile,v 1.2 2008/11/19 17:34:28 raj Exp $ PROG= ubldr NEWVERSWHAT= "U-Boot loader" ${MACHINE_ARCH} @@ -10,8 +10,8 @@ # Architecture-specific loader code SRCS= start.S conf.c vers.c -LOADER_DISK_SUPPORT?= no -LOADER_UFS_SUPPORT?= no +LOADER_DISK_SUPPORT?= yes +LOADER_UFS_SUPPORT?= yes LOADER_CD9660_SUPPORT?= no LOADER_EXT2FS_SUPPORT?= no LOADER_NET_SUPPORT?= yes ==== //depot/projects/usb/src/sys/boot/arm/uboot/conf.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/arm/uboot/conf.c,v 1.1 2008/10/14 10:11:14 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/arm/uboot/conf.c,v 1.2 2008/11/19 17:34:28 raj Exp $"); #include #include "bootstrap.h" @@ -38,7 +38,7 @@ struct devsw *devsw[] = { #if defined(LOADER_DISK_SUPPORT) || defined(LOADER_CD9660_SUPPORT) - &uboot_disk, + &uboot_storage, #endif #if defined(LOADER_NET_SUPPORT) &netdev, ==== //depot/projects/usb/src/sys/boot/arm/uboot/version#2 (text+ko) ==== @@ -1,6 +1,7 @@ -$FreeBSD: src/sys/boot/arm/uboot/version,v 1.1 2008/10/14 10:11:14 raj Exp $ +$FreeBSD: src/sys/boot/arm/uboot/version,v 1.2 2008/11/19 17:34:28 raj Exp $ NOTE ANY CHANGES YOU MAKE TO THE BOOTBLOCKS HERE. The format of this file is important. Make sure the current version number is on line 6. +1.0: Added storage support. Booting from HDD, USB, etc. is now possible. 0.5: Initial U-Boot/arm version (netbooting only). ==== //depot/projects/usb/src/sys/boot/common/interp.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/common/interp.c,v 1.29 2003/08/25 23:30:41 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/interp.c,v 1.30 2008/11/20 14:57:09 luigi Exp $"); /* * Simple commandline interpreter, toplevel and misc. @@ -92,7 +92,7 @@ void interact(void) { - char input[256]; /* big enough? */ + static char input[256]; /* big enough? */ #ifndef BOOT_FORTH int argc; char **argv; @@ -178,14 +178,21 @@ return(res); } +/* + * Header prepended to each line. The text immediately follows the header. + * We try to make this short in order to save memory -- the loader has + * limited memory available, and some of the forth files are very long. + */ struct includeline { - char *text; + struct includeline *next; +#ifndef BOOT_FORTH int flags; int line; #define SL_QUIET (1<<0) #define SL_IGNOREERR (1<<1) - struct includeline *next; +#endif + char text[0]; }; int @@ -236,13 +243,14 @@ } #endif /* Allocate script line structure and copy line, flags */ + if (*cp == '\0') + continue; /* ignore empty line, save memory */ sp = malloc(sizeof(struct includeline) + strlen(cp) + 1); - sp->text = (char *)sp + sizeof(struct includeline); strcpy(sp->text, cp); #ifndef BOOT_FORTH sp->flags = flags; + sp->line = line; #endif - sp->line = line; sp->next = NULL; if (script == NULL) { ==== //depot/projects/usb/src/sys/boot/i386/Makefile#5 (text+ko) ==== @@ -1,7 +1,7 @@ -# $FreeBSD: src/sys/boot/i386/Makefile,v 1.23 2008/11/17 20:49:29 pjd Exp $ +# $FreeBSD: src/sys/boot/i386/Makefile,v 1.26 2008/11/22 14:24:55 dfr Exp $ SUBDIR= mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot zfsboot \ - kgzldr libi386 libfirewire loader + gptzfsboot kgzldr libi386 libfirewire loader # special boot programs, 'self-extracting boot2+loader' SUBDIR+= pxeldr ==== //depot/projects/usb/src/sys/boot/i386/libi386/biosdisk.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.55 2008/02/28 17:49:23 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biosdisk.c,v 1.56 2008/11/19 16:04:07 dfr Exp $"); /* * BIOS disk device handling. @@ -969,8 +969,10 @@ od->od_boff = gp->gp_start; out: - if (error) + if (error) { free(od->od_partitions); + od->od_flags &= ~BD_GPTOK; + } return (error); } @@ -1058,7 +1060,7 @@ switch(rw){ case F_READ: - DEBUG("read %d from %d to %p", blks, dblk, buf); + DEBUG("read %d from %lld to %p", blks, dblk, buf); if (blks && bd_read(od, dblk, blks, buf)) { DEBUG("read error"); ==== //depot/projects/usb/src/sys/boot/i386/zfsboot/zfsboot.c#2 (text+ko) ==== @@ -14,11 +14,14 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/i386/zfsboot/zfsboot.c,v 1.1 2008/11/17 20:49:29 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/zfsboot/zfsboot.c,v 1.2 2008/11/19 16:39:01 dfr Exp $"); #include #include #include +#ifdef GPT +#include +#endif #include #include @@ -32,7 +35,9 @@ #include +#ifndef GPT #include "zfsboot.h" +#endif #include "lib.h" #define IO_KEYBOARD 1 @@ -103,6 +108,9 @@ extern uint32_t _end; +#ifdef GPT +static const uuid_t freebsd_zfs_uuid = GPT_ENT_TYPE_FREEBSD_ZFS; +#endif static const char optstr[NOPT] = "DhaCcdgmnpqrsv"; /* Also 'P', 'S' */ static const unsigned char flags[NOPT] = { RBX_DUAL, @@ -408,6 +416,12 @@ static void probe_drive(struct dsk *dsk, spa_t **spap) { +#ifdef GPT + struct gpt_hdr hdr; + struct gpt_ent *ent; + daddr_t slba, elba; + unsigned part, entries_per_sec; +#endif struct dos_partition *dp; char *sec; unsigned i; @@ -424,6 +438,63 @@ sec = dmadat->secbuf; dsk->start = 0; + +#ifdef GPT + /* + * First check for GPT. + */ + if (drvread(dsk, sec, 1, 1)) { + return; + } + memcpy(&hdr, sec, sizeof(hdr)); + if (memcmp(hdr.hdr_sig, GPT_HDR_SIG, sizeof(hdr.hdr_sig)) != 0 || + hdr.hdr_lba_self != 1 || hdr.hdr_revision < 0x00010000 || + hdr.hdr_entsz < sizeof(*ent) || DEV_BSIZE % hdr.hdr_entsz != 0) { + goto trymbr; + } + + /* + * Probe all GPT partitions for the presense of ZFS pools. We + * return the spa_t for the first we find (if requested). This + * will have the effect of booting from the first pool on the + * disk. + */ + entries_per_sec = DEV_BSIZE / hdr.hdr_entsz; + slba = hdr.hdr_lba_table; + elba = slba + hdr.hdr_entries / entries_per_sec; + while (slba < elba) { + if (drvread(dsk, sec, slba, 1)) + return; + for (part = 0; part < entries_per_sec; part++) { + ent = (struct gpt_ent *)(sec + part * hdr.hdr_entsz); + if (memcmp(&ent->ent_type, &freebsd_zfs_uuid, + sizeof(uuid_t)) == 0) { + dsk->start = ent->ent_lba_start; + if (vdev_probe(vdev_read, dsk, spap) == 0) { + /* + * We record the first pool we find (we will try + * to boot from that one. + */ + spap = 0; + + /* + * This slice had a vdev. We need a new dsk + * structure now since the vdev now owns this one. + */ + struct dsk *newdsk; + newdsk = malloc(sizeof(struct dsk)); + *newdsk = *dsk; + dsk = newdsk; + } + break; + } + } + slba++; + } + return; +trymbr: +#endif + if (drvread(dsk, sec, DOSBBSECTOR, 1)) return; dp = (void *)(sec + DOSPARTOFF); @@ -441,7 +512,7 @@ /* * This slice had a vdev. We need a new dsk structure now - * sice the vdev now owns this one. + * since the vdev now owns this one. */ struct dsk *newdsk; newdsk = malloc(sizeof(struct dsk)); @@ -859,9 +930,42 @@ xputc(c); } +#ifdef GPT +static struct { + uint16_t len; + uint16_t count; + uint16_t seg; + uint16_t off; + uint64_t lba; +} packet; +#endif + static int drvread(struct dsk *dsk, void *buf, unsigned lba, unsigned nblk) { +#ifdef GPT + static unsigned c = 0x2d5c7c2f; + + if (!OPT_CHECK(RBX_QUIET)) + printf("%c\b", c = c << 8 | c >> 24); + packet.len = 0x10; + packet.count = nblk; + packet.seg = VTOPOFF(buf); + packet.off = VTOPSEG(buf); + packet.lba = lba + dsk->start; + v86.ctl = V86_FLAGS; + v86.addr = 0x13; + v86.eax = 0x4200; + v86.edx = dsk->drive; + v86.ds = VTOPSEG(&packet); + v86.esi = VTOPOFF(&packet); + v86int(); + if (V86_CY(v86.efl)) { + printf("error %u lba %u\n", v86.eax >> 8 & 0xff, lba); + return -1; + } + return 0; +#else static unsigned c = 0x2d5c7c2f; lba += dsk->start; @@ -881,6 +985,7 @@ return -1; } return 0; +#endif } static int ==== //depot/projects/usb/src/sys/boot/uboot/lib/devicename.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/devicename.c,v 1.2 2008/03/13 17:54:21 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/devicename.c,v 1.3 2008/11/19 17:34:28 raj Exp $"); #include @@ -64,7 +64,7 @@ /* * Try to parse the device name off the beginning of the devspec. */ - return(uboot_parsedev(dev, devspec, path)); + return (uboot_parsedev(dev, devspec, path)); } /* @@ -78,7 +78,7 @@ * * For disk-type devices, the syntax is: * - * disk[s][]: + * disk[]: * */ static int @@ -86,10 +86,10 @@ const char **path) { struct uboot_devdesc *idev; - struct devsw *dv; - char *cp; - const char *np; - int i, unit, slice, partition, err; + struct devsw *dv; + char *cp; + const char *np; + int i, unit, partition, err; /* minimum length check */ if (strlen(devspec) < 2) @@ -110,12 +110,11 @@ np = (devspec + strlen(dv->dv_name)); switch(dv->dv_type) { - case DEVT_NONE: /* XXX what to do here? Do we care? */ + case DEVT_NONE: break; case DEVT_DISK: unit = -1; - slice = -1; partition = -1; if (*np && (*np != ':')) { /* next comes the unit number */ @@ -124,16 +123,8 @@ err = EUNIT; goto fail; } - if (*cp == 's') { /* got a slice number */ - np = cp + 1; - slice = strtol(np, &cp, 10); - if (cp == np) { - err = ESLICE; - goto fail; - } - } if (*cp && (*cp != ':')) { - /* get a partition number */ + /* get partition */ partition = *cp - 'a'; if ((partition < 0) || (partition >= MAXPARTITIONS)) { @@ -145,12 +136,12 @@ } if (*cp && (*cp != ':')) { err = EINVAL; - goto fail; + goto fail; } idev->d_unit = unit; - idev->d_kind.disk.slice = slice; - idev->d_kind.disk.partition = partition; + idev->d_disk.partition = partition; + idev->d_disk.data = NULL; if (path != NULL) *path = (*cp == 0) ? cp : cp + 1; break; @@ -170,10 +161,8 @@ err = EINVAL; goto fail; } + idev->d_unit = unit; - if (dv->dv_type == DEVT_NET) - idev->d_unit = unit; - if (path != NULL) *path = (*cp == 0) ? cp : cp + 1; break; @@ -212,8 +201,6 @@ case DEVT_DISK: cp = buf; cp += sprintf(cp, "%s%d", dev->d_dev->dv_name, dev->d_unit); - if (dev->d_kind.disk.slice > 0) - cp += sprintf(cp, "s%d", dev->d_kind.disk.slice); if (dev->d_kind.disk.partition >= 0) cp += sprintf(cp, "%c", dev->d_kind.disk.partition + 'a'); ==== //depot/projects/usb/src/sys/boot/uboot/lib/disk.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /*- - * Copyright (C) 2000 Benno Rice. + * Copyright (c) 2008 Semihalf, Rafal Jaworowski * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -11,99 +11,453 @@ * 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 Benno Rice ``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 TOOLS GMBH 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. + * 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. + * */ -#include -__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/disk.c,v 1.2 2008/03/13 17:54:21 obrien Exp $"); - /* - * Disk I/O routines using U-Boot - TODO + * Block storage I/O routines for U-Boot */ +#include +__FBSDID("$FreeBSD: src/sys/boot/uboot/lib/disk.c,v 1.3 2008/11/19 17:34:28 raj Exp $"); + #include #include - #include #include #include +#include + +#define FSTYPENAMES +#include +#include "api_public.h" #include "bootstrap.h" +#include "glue.h" +#include "libuboot.h" + +#define DEBUG +#undef DEBUG -static int d_init(void); -static int d_strategy(void *devdata, int flag, daddr_t dblk, - size_t size, char *buf, size_t *rsize); -static int d_open(struct open_file *f, ...); -static int d_close(struct open_file *f); -static int d_ioctl(struct open_file *f, u_long cmd, void *data); -static void d_print(int verbose); +#define stor_printf(fmt, args...) do { \ + printf("%s%d: ", dev->d_dev->dv_name, dev->d_unit); \ + printf(fmt, ##args); \ +} while (0) + +#ifdef DEBUG +#define debugf(fmt, args...) do { printf("%s(): ", __func__); \ + printf(fmt,##args); } while (0) +#else +#define debugf(fmt, args...) +#endif -struct devsw uboot_disk = { - "block", - DEVT_DISK, - d_init, - d_strategy, - d_open, - d_close, - d_ioctl, - d_print +struct gpt_part { + int gp_index; + uuid_t gp_type; + uint64_t gp_start; + uint64_t gp_end; }; -struct opened_dev { - u_int count; - SLIST_ENTRY(opened_dev) link; +struct open_dev { + int od_bsize; /* block size */ + int od_bstart; /* start block offset from beginning of disk */ + int od_type; +#define OD_BSDLABEL 0x0001 +#define OD_GPT 0x0002 + union { + struct { + struct disklabel bsdlabel; + } _bsd; + struct { + struct gpt_part *gpt_partitions; + int gpt_nparts; + } _gpt; + } _data; }; -SLIST_HEAD(, opened_dev) opened_devs = SLIST_HEAD_INITIALIZER(opened_dev); +#define od_bsdlabel _data._bsd.bsdlabel +#define od_nparts _data._gpt.gpt_nparts +#define od_partitions _data._gpt.gpt_partitions + +static int stor_info[UB_MAX_DEV]; +static int stor_info_no = 0; +static int stor_opendev(struct open_dev **, struct uboot_devdesc *); +static int stor_closedev(struct uboot_devdesc *); +static int stor_readdev(struct uboot_devdesc *, daddr_t, size_t, char *); +static int stor_open_count = 0; + +/* devsw I/F */ +static int stor_init(void); +static int stor_strategy(void *, int, daddr_t, size_t, char *, size_t *); +static int stor_open(struct open_file *, ...); +static int stor_close(struct open_file *); +static void stor_print(int); + +struct devsw uboot_storage = { + "disk", + DEVT_DISK, + stor_init, + stor_strategy, + stor_open, + stor_close, + noioctl, + stor_print +}; static int -d_init(void) +stor_init(void) { + struct device_info *di; + int i, found = 0; + + if (devs_no == 0) { + printf("No U-Boot devices! Really enumerated?\n"); + return (-1); + } + + for (i = 0; i < devs_no; i++) { + di = ub_dev_get(i); + if ((di != NULL) && (di->type & DEV_TYP_STOR)) { + if (stor_info_no >= UB_MAX_DEV) { + printf("Too many storage devices: %d\n", + stor_info_no); + return (-1); + } + stor_info[stor_info_no++] = i; + found = 1; + } + } + + if (!found) { + printf("No storage devices\n"); + return (-1); + } - return 0; + debugf("storage devices found: %d\n", stor_info_no); + return (0); } static int -d_strategy(void *devdata, int flag, daddr_t dblk, size_t size, char *buf, +stor_strategy(void *devdata, int rw, daddr_t blk, size_t size, char *buf, size_t *rsize) { + struct uboot_devdesc *dev = (struct uboot_devdesc *)devdata; + struct open_dev *od = (struct open_dev *)dev->d_disk.data; + int bcount, err; + + debugf("od=%p, size=%d, bsize=%d\n", od, size, od->od_bsize); + + if (rw != F_READ) { + stor_printf("write attempt, operation not supported!\n"); + return (EROFS); + } + + if (size % od->od_bsize) { + stor_printf("size=%d not multiple of device block size=%d\n", + size, od->od_bsize); + return (EIO); + } + bcount = size / od->od_bsize; + + if (rsize) + *rsize = 0; + + err = stor_readdev(dev, blk + od->od_bstart, bcount, buf); + if (!err && rsize) + *rsize = size; + + return (err); +} + +static int +stor_open(struct open_file *f, ...) +{ + va_list ap; + struct open_dev *od; + struct uboot_devdesc *dev; + int err; + + va_start(ap, f); + dev = va_arg(ap, struct uboot_devdesc *); + va_end(ap); + + if ((err = stor_opendev(&od, dev)) != 0) + return (err); + + ((struct uboot_devdesc *)(f->f_devdata))->d_disk.data = od; + + return (0); +} + +static int +stor_close(struct open_file *f) +{ + struct uboot_devdesc *dev; + + dev = (struct uboot_devdesc *)(f->f_devdata); + + return (stor_closedev(dev)); +} + +static int +stor_open_gpt(struct open_dev *od, struct uboot_devdesc *dev) +{ + + /* TODO */ + return (ENXIO); +} + +static int +stor_open_bsdlabel(struct open_dev *od, struct uboot_devdesc *dev) +{ + char *buf; + struct disklabel *dl; + int err = 0; + + /* Allocate 1 block */ + buf = malloc(od->od_bsize); + if (!buf) { + stor_printf("could not allocate memory for disklabel\n"); + return (ENOMEM); + } - return (EINVAL); + /* Read disklabel */ + err = stor_readdev(dev, LABELSECTOR, 1, buf); + if (err) { + stor_printf("disklabel read error=%d\n", err); + err = ERDLAB; + goto out; + } + bcopy(buf + LABELOFFSET, &od->od_bsdlabel, sizeof(struct disklabel)); + dl = &od->od_bsdlabel; + + if (dl->d_magic != DISKMAGIC) { + stor_printf("no disklabel magic!\n"); + err = EUNLAB; + goto out; + } + od->od_type = OD_BSDLABEL; + od->od_bstart = dl->d_partitions[dev->d_disk.partition].p_offset; + + debugf("bstart=%d\n", od->od_bstart); + +out: + free(buf); + return (err); } >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sun Nov 23 17:41:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3C7DE1065672; Sun, 23 Nov 2008 17:41:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 011921065674 for ; Sun, 23 Nov 2008 17:41:24 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E5F588FC18 for ; Sun, 23 Nov 2008 17:41:23 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mANHfHba068779 for ; Sun, 23 Nov 2008 17:41:17 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mANHfGFx068775 for perforce@freebsd.org; Sun, 23 Nov 2008 17:41:16 GMT (envelope-from nwhitehorn@freebsd.org) Date: Sun, 23 Nov 2008 17:41:16 GMT Message-Id: <200811231741.mANHfGFx068775@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 153397 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, 23 Nov 2008 17:41:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=153397 Change 153397 by nwhitehorn@nwhitehorn_trantor on 2008/11/23 17:41:02 Hose kobj_machdep_init(). The changes required to support pluggable Open Firmware on sparc64 make it redundant. sun4v is not changed since I apparently forgot to call it there. Affected files ... .. //depot/projects/ppc-g5/sys/kern/subr_kobj.c#3 edit .. //depot/projects/ppc-g5/sys/powerpc/aim/machdep.c#7 edit .. //depot/projects/ppc-g5/sys/powerpc/booke/machdep.c#4 edit .. //depot/projects/ppc-g5/sys/sparc64/sparc64/machdep.c#7 edit .. //depot/projects/ppc-g5/sys/sys/kobj.h#2 edit Differences ... ==== //depot/projects/ppc-g5/sys/kern/subr_kobj.c#3 (text+ko) ==== @@ -78,12 +78,6 @@ SYSINIT(kobj, SI_SUB_LOCK, SI_ORDER_ANY, kobj_init_mutex, NULL); -void -kobj_machdep_init(void) -{ - kobj_init_mutex(NULL); -} - /* * This method structure is used to initialise new caches. Since the * desc pointer is NULL, it is guaranteed never to match any read ==== //depot/projects/ppc-g5/sys/powerpc/aim/machdep.c#7 (text+ko) ==== @@ -301,11 +301,10 @@ __asm __volatile("mtsprg 0, %0" :: "r"(pc)); /* - * Init mutexes and KOBJ + * Init mutexes, which we use heavily in PMAP */ mutex_init(); - kobj_machdep_init(); /* * Install the OF client interface ==== //depot/projects/ppc-g5/sys/powerpc/booke/machdep.c#4 (text+ko) ==== @@ -430,7 +430,6 @@ if (boothowto & RB_KDB) kdb_enter(KDB_WHY_BOOTFLAGS, "Boot flags requested debugger"); #endif - kobj_machdep_init(); /* Initialise virtual memory. */ pmap_mmu_install(MMU_TYPE_BOOKE, 0); ==== //depot/projects/ppc-g5/sys/sparc64/sparc64/machdep.c#7 (text+ko) ==== @@ -476,7 +476,6 @@ * Finish pmap initialization now that we're ready for mutexes. */ PMAP_LOCK_INIT(kernel_pmap); - kobj_machdep_init(); OF_getprop(root, "name", sparc64_model, sizeof(sparc64_model) - 1); ==== //depot/projects/ppc-g5/sys/sys/kobj.h#2 (text+ko) ==== @@ -246,9 +246,4 @@ */ int kobj_error_method(void); -/* - * Machine-dependent initialisation call for boot-time kobj clients - */ -void kobj_machdep_init(void); - #endif /* !_SYS_KOBJ_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Nov 23 17:45:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A8D831065673; Sun, 23 Nov 2008 17:45:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 69E681065670 for ; Sun, 23 Nov 2008 17:45:28 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 503478FC12 for ; Sun, 23 Nov 2008 17:45:28 +0000 (UTC) (envelope-from nwhitehorn@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mANHjSV7069854 for ; Sun, 23 Nov 2008 17:45:28 GMT (envelope-from nwhitehorn@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mANHjSkP069852 for perforce@freebsd.org; Sun, 23 Nov 2008 17:45:28 GMT (envelope-from nwhitehorn@freebsd.org) Date: Sun, 23 Nov 2008 17:45:28 GMT Message-Id: <200811231745.mANHjSkP069852@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to nwhitehorn@freebsd.org using -f From: Nathan Whitehorn To: Perforce Change Reviews Cc: Subject: PERFORCE change 153399 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, 23 Nov 2008 17:45:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=153399 Change 153399 by nwhitehorn@nwhitehorn_trantor on 2008/11/23 17:44:49 Remove a no longer true statement in a comment that kobj_machdep_init() must be called in order to bring up the PowerPC PMAP layer. Affected files ... .. //depot/projects/ppc-g5/sys/powerpc/powerpc/pmap_dispatch.c#5 edit Differences ... ==== //depot/projects/ppc-g5/sys/powerpc/powerpc/pmap_dispatch.c#5 (text+ko) ==== @@ -37,9 +37,8 @@ * the highest priority call will be installed as the default * MMU handler when pmap_bootstrap() is called. * - * It is required that kobj_machdep_init() be called before - * pmap_bootstrap() to allow the kobj subsystem to initialise. This - * in turn requires that mutex_init() has been called. + * It is required that mutex_init() be called before pmap_bootstrap(), + * as the PMAP layer makes extensive use of mutexes. */ #include From owner-p4-projects@FreeBSD.ORG Sun Nov 23 18:29:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D3B4C1065676; Sun, 23 Nov 2008 18:29:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 97C941065675 for ; Sun, 23 Nov 2008 18:29:12 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 863168FC0A for ; Sun, 23 Nov 2008 18:29:12 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mANITCc6000114 for ; Sun, 23 Nov 2008 18:29:12 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mANITCTu000112 for perforce@freebsd.org; Sun, 23 Nov 2008 18:29:12 GMT (envelope-from sam@freebsd.org) Date: Sun, 23 Nov 2008 18:29:12 GMT Message-Id: <200811231829.mANITCTu000112@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 153400 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, 23 Nov 2008 18:29:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=153400 Change 153400 by sam@sam_ebb on 2008/11/23 18:29:01 First pass of mostly style cleanups: o honor INET and INET6 o fix vimage o don't panic unless necessary o add locking assertions (breaks use as lla_lookup is not properly locked in in_arpinput) o lock ifnet list walks o check ptr's against NULL instead of zero o fix af matching in lltable_drain o be consistent with return (e) vs return e o kill trailing whitespace at EOL Note this compiles but is untested. Approved by: qingli Affected files ... .. //depot/projects/arp-v2/src/sys/net/if_llatbl.c#4 edit .. //depot/projects/arp-v2/src/sys/net/if_llatbl.h#3 edit Differences ... ==== //depot/projects/arp-v2/src/sys/net/if_llatbl.c#4 (text+ko) ==== @@ -22,6 +22,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ +#include "opt_inet.h" +#include "opt_inet6.h" #include #include @@ -32,6 +34,7 @@ #include #include #include +#include #include @@ -45,56 +48,63 @@ #include #include - uma_zone_t llezone; uma_zone_t lltzone; - static struct lltable *lltable_new(struct ifnet *ifp, int af); - - int sysctl_dumparp(int af, struct sysctl_req *wr); +extern void arprequest(struct ifnet *, struct in_addr *, struct in_addr *, + u_char *); -extern void arprequest(struct ifnet *, struct in_addr *, struct in_addr *, u_char *); - - static int -dump_llcache(struct ifnet *ifp, int af, struct llentries *head, struct sysctl_req *wr) +dump_llcache(struct ifnet *ifp, int af, struct llentries *head, + struct sysctl_req *wr) { struct llentry *lle; - int error = 0; - struct rt_msghdr *rtm=NULL; - struct sockaddr_dl *sdl=NULL; - uint8_t *msg=NULL; - int msgsize=0; - + struct rt_msghdr *rtm; + struct sockaddr_dl *sdl; + uint8_t *msg; + int msgsize, error; +#ifdef INET struct { struct rt_msghdr rtm; struct sockaddr_inarp sin; struct sockaddr_dl sdl; } arpc; - +#endif +#ifdef INET6 struct { struct rt_msghdr rtm; struct sockaddr_in6 sin6; struct sockaddr_dl sdl; } ndpc; +#endif - if (af == AF_INET) { + switch (af) { +#ifdef INET + case AF_INET: rtm = &arpc.rtm; sdl = &arpc.sdl; msgsize = sizeof(arpc); msg = (uint8_t *)&arpc; - } - else if (af == AF_INET6) { + break; +#endif +#ifdef INET6 + case AF_INET6: rtm = &ndpc.rtm; sdl = &ndpc.sdl; msgsize = sizeof(ndpc); msg = (uint8_t *)&ndpc; + break; +#endif + default: + printf("%s: unknown address family", __func__); + return EINVAL; } - else - panic("%s: unknown address family", __func__); + + IF_LLTBLS_LOCK_ASSERT(ifp); + error = 0; LIST_FOREACH(lle, head, lle_next) { if (lle->la_flags & LLE_DELETED) /* skip deleted entries */ continue; @@ -106,22 +116,28 @@ */ bzero(msg, msgsize); rtm->rtm_msglen = msgsize; - if (af == AF_INET) { + switch (af) { +#ifdef INET + case AF_INET: arpc.sin.sin_family = AF_INET; arpc.sin.sin_len = sizeof(arpc.sin); arpc.sin.sin_addr.s_addr = lle->l3_addr4.sin_addr.s_addr; - } - else if (af == AF_INET6) { + break; +#endif +#ifdef INET6 + case AF_INET6: ndpc.sin6.sin6_family = AF_INET6; ndpc.sin6.sin6_len = sizeof(ndpc.sin6); bcopy(&lle->l3_addr6, &ndpc.sin6, lle->l3_addr6.sin6_len); + break; +#endif } /* publish */ if (lle->la_flags & LLE_PUB) { rtm->rtm_flags |= RTF_ANNOUNCE; /* proxy only */ - if ((af == AF_INET) && (lle->la_flags & LLE_PROXY)) - arpc.sin.sin_other = SIN_PROXY; + if ((af == AF_INET) && (lle->la_flags & LLE_PROXY)) + arpc.sin.sin_other = SIN_PROXY; } if (lle->la_flags & LLE_VALID) { /* valid MAC */ @@ -145,7 +161,6 @@ return error; } - /* * glue to dump arp tables */ @@ -154,16 +169,17 @@ { struct lltable *llt; struct ifnet *ifp; - register int i; - int error = 0; + int i, error = 0; - TAILQ_FOREACH(ifp, &ifnet, if_link) { + IFNET_RLOCK(); + TAILQ_FOREACH(ifp, &V_ifnet, if_link) { IF_LLTBLS_LOCK(ifp); TAILQ_FOREACH(llt, &ifp->if_lltables, llt_link) { if (llt->llt_af != af) continue; - for (i=0; i < LLTBL_HASHTBL_SIZE; i++) { - error = dump_llcache(ifp, af, &llt->lle_head[i], wr); + for (i = 0; i < LLTBL_HASHTBL_SIZE; i++) { + error = dump_llcache(ifp, af, + &llt->lle_head[i], wr); if (error) { IF_LLTBLS_UNLOCK(ifp); goto done; @@ -173,102 +189,112 @@ IF_LLTBLS_UNLOCK(ifp); } done: - return (error); + IFNET_RUNLOCK(); + return error; } - /* * delete an address from the address table */ -int llentry_free(struct llentry *lle) +int +llentry_free(struct llentry *lle) { - KASSERT(lle != NULL, ("%s: lle is NULL", __func__)); + + KASSERT(lle != NULL, ("null lle")); + IF_LLTBLS_LOCK_ASSERT(lle->lle_tbl->llt_ifp); LIST_REMOVE(lle, lle_next); IF_LLE_LOCK_DESTROY(lle); - if (lle->la_hold) + if (lle->la_hold != NULL) m_freem(lle->la_hold); uma_zfree(llezone, lle); return 0; } - /* * delete an address table from the interface ifp */ -int lltable_free(struct ifnet *ifp, int af) +int +lltable_free(struct ifnet *ifp, int af) { struct lltable *llt; struct llentry *lle; - register int i; + int i; + + KASSERT(ifp != NULL, ("null ifp")); - KASSERT(ifp != NULL, ("%s: ifp is NULL", __func__)); + IF_LLTBLS_LOCK_ASSERT(ifp); - TAILQ_FOREACH(llt, &ifp->if_lltables, llt_link) + TAILQ_FOREACH(llt, &ifp->if_lltables, llt_link) { if (llt->llt_af != af) continue; - for (i=0; i < LLTBL_HASHTBL_SIZE; i++) - LIST_FOREACH(lle, &llt->lle_head[i], lle_next) - llentry_free(lle); - TAILQ_REMOVE(&ifp->if_lltables, llt, llt_link); - uma_zfree(lltzone, llt); + for (i = 0; i < LLTBL_HASHTBL_SIZE; i++) { + LIST_FOREACH(lle, &llt->lle_head[i], lle_next) + llentry_free(lle); + } + TAILQ_REMOVE(&ifp->if_lltables, llt, llt_link); + uma_zfree(lltzone, llt); + break; + } return 0; } - -void lltable_drain(int af) +void +lltable_drain(int af) { struct ifnet *ifp; struct lltable *llt = NULL; struct llentry *lle; - register int i; + int i; TAILQ_FOREACH(ifp, &ifnet, if_link) { IF_LLTBLS_LOCK(ifp); TAILQ_FOREACH(llt, &ifp->if_lltables, llt_link) { - if (llt->llt_af != af) { - IF_LLTBLS_UNLOCK(ifp); + if (llt->llt_af != af) continue; + for (i = 0; i < LLTBL_HASHTBL_SIZE; i++) { + LIST_FOREACH(lle, &llt->lle_head[i], + lle_next) { + if (lle->la_hold != NULL) { + m_freem(lle->la_hold); + lle->la_hold = NULL; + } + } } + break; } - - for (i=0; i < LLTBL_HASHTBL_SIZE; i++) { - LIST_FOREACH(lle, &llt->lle_head[i], lle_next) - if (lle->la_hold) { - m_freem(lle->la_hold); - lle->la_hold = NULL; - } - } IF_LLTBLS_LOCK(ifp); } } - /* - * Add a new table at the head of the list for interface ifp + * Add a new table at the head of the list for interface ifp */ static struct lltable * lltable_new(struct ifnet *ifp, int af) { struct lltable *llt; - register int i; + int i; + /* XXX can this happen? */ if (ifp == NULL) - return (NULL); + return NULL; llt = uma_zalloc(lltzone, M_DONTWAIT | M_ZERO); - if (llt != NULL) { - llt->llt_af = af; - llt->llt_ifp = ifp; - TAILQ_INSERT_HEAD(&ifp->if_lltables, llt, llt_link); - for (i=0; i < LLTBL_HASHTBL_SIZE; i++) - LIST_INIT(&llt->lle_head[i]); + if (llt == NULL) { + log(LOG_INFO, "lltable_new: malloc failed for new lla-table\n"); + return NULL; } - else - log(LOG_INFO, "lltable_new: malloc failed for new lla-table\n"); - return (llt); + llt->llt_af = af; + llt->llt_ifp = ifp; + for (i = 0; i < LLTBL_HASHTBL_SIZE; i++) + LIST_INIT(&llt->lle_head[i]); + + IF_LLTBLS_LOCK_ASSERT(ifp); + TAILQ_INSERT_HEAD(&ifp->if_lltables, llt, llt_link); + + return llt; } - /* * Generic link layer address lookup function, replacement * of the old "arplookup" @@ -276,35 +302,40 @@ struct llentry * lla_lookup(struct ifnet *ifp, u_int flags, struct sockaddr *l3addr) { - struct llentry *lle; + struct llentry *lle; struct llentries *lleh; - struct lltable *llt; - struct rtentry *rt; + struct lltable *llt; + struct rtentry *rt; u_int hashkey; #ifdef INET6 char ip6buf[INET6_ADDRSTRLEN]; #endif - KASSERT(ifp != NULL, ("%s: ifp is NULL", __func__)); - KASSERT(l3addr != NULL, ("%s: L3 address is NULL", __func__)); + KASSERT(ifp != NULL, ("null ifp")); + KASSERT(l3addr != NULL, ("null L3 address")); + + IF_LLTBLS_LOCK_ASSERT(ifp); TAILQ_FOREACH(llt, &ifp->if_lltables, llt_link) if (llt->llt_af == l3addr->sa_family) break; - if ((flags & LLE_CREATE) && (llt == NULL)) + if ((flags & LLE_CREATE) && llt == NULL) { llt = lltable_new(ifp, l3addr->sa_family); - if (llt == NULL) - return (NULL); + if (llt == NULL) + return NULL; + } switch (l3addr->sa_family) { +#ifdef INET case AF_INET: hashkey = ((struct sockaddr_in *)l3addr)->sin_addr.s_addr; break; - +#endif +#ifdef INET6 case AF_INET6: hashkey = ((struct sockaddr_in6 *)l3addr)->sin6_addr.s6_addr32[3]; break; - +#endif default: return NULL; } @@ -315,37 +346,43 @@ continue; if (bcmp((void *)&lle->l3_addr, l3addr, l3addr->sa_len) == 0) break; - } + } if (lle == NULL) { if (!(flags & LLE_CREATE)) - return (NULL); + return NULL; /* - * a route that covers the given address must have been - * installed 1st because we are doing a resolution + * A route that covers the given address must have been + * installed 1st because we are doing a resolution. */ if (!(flags & LLE_IFADDR)) { rt = rtalloc1(l3addr, 0, 0); - if ((rt == NULL) || (rt->rt_flags & RTF_GATEWAY) || (rt->rt_ifp != ifp)) { + if (rt == NULL || (rt->rt_flags & RTF_GATEWAY) || + rt->rt_ifp != ifp) { if (l3addr->sa_family == AF_INET6) { /* - * Creating a ND6 cache for an IPv6 neighbor - * that is not covered by our own prefix. + * Creating an ND6 cache for an IPv6 + * neighbor that is not covered by our + * own prefix. */ - struct ifaddr *ifa = - ifaof_ifpforaddr((struct sockaddr *)l3addr, ifp); + struct ifaddr *ifa = ifaof_ifpforaddr( + (struct sockaddr *)l3addr, ifp); if (ifa != NULL) goto lla_lookup_1; } switch (l3addr->sa_family) { +#ifdef INET case AF_INET: - log(LOG_INFO, "IPv4 address: \"%s\" is not on the network\n", \ + log(LOG_INFO, "IPv4 address: \"%s\" is " + "not on the network\n", inet_ntoa(((struct sockaddr_in *)l3addr)->sin_addr)); break; +#endif #ifdef INET6 case AF_INET6: - log(LOG_INFO, "IPv6 address: \"%s\" is not on the network\n", \ + log(LOG_INFO, "IPv6 address: \"%s\" is " + "not on the network\n", ip6_sprintf(ip6buf, &((struct sockaddr_in6 *)l3addr)->sin6_addr)); break; #endif @@ -360,14 +397,14 @@ lla_lookup_1: lle = uma_zalloc(llezone, M_DONTWAIT | M_ZERO); if (lle == NULL) { - log(LOG_INFO, "lla_lookup: new lle malloc failed\n"); + log(LOG_INFO, "%s: malloc failed\n", __func__); return (NULL); } IF_LLE_LOCK_INIT(lle); - callout_init_mtx(&lle->la_timer, &lle->lle_mtx, 0); + callout_init_mtx(&lle->la_timer, &ifp->if_lltbls_mtx, 0); - /* qing + /* * For IPv4 this will trigger "arpresolve" to generate * an ARP request */ @@ -378,9 +415,9 @@ if ((flags & (LLE_CREATE | LLE_IFADDR)) == (LLE_CREATE | LLE_IFADDR)) { bcopy(IF_LLADDR(ifp), &lle->ll_addr, ifp->if_addrlen); - lle->la_flags |= (LLE_VALID | LLE_STATIC); + lle->la_flags |= LLE_VALID | LLE_STATIC; } - + lle->lle_tbl = llt; lle->lle_head = lleh; LIST_INSERT_HEAD(lleh, lle, lle_next); @@ -391,7 +428,6 @@ return (lle); } - /* * Called in route_output when adding/deleting a route to an interface. */ @@ -404,33 +440,37 @@ struct llentry *lle; u_int flags = 0; - if ((dl == NULL) || (dl->sdl_family != AF_LINK)) { - log(LOG_INFO, "invalid dl in lla_rt_output\n"); + if (dl == NULL || dl->sdl_family != AF_LINK) { + log(LOG_INFO, "%s: invalid dl\n", __func__); return EINVAL; } ifp = ifnet_byindex(dl->sdl_index); if (ifp == NULL) { - log(LOG_INFO, "invalid ifp in lla_rt_output\n"); + log(LOG_INFO, "%s: invalid ifp (sdl_index %d)\n", + __func__, dl->sdl_index); return EINVAL; } switch (rtm->rtm_type) { case RTM_ADD: if (rtm->rtm_flags & RTF_ANNOUNCE) { - struct rtentry *rt; - flags |= LLE_PUB; - if ((dst->sa_family == AF_INET) && - (((struct sockaddr_inarp *)dst)->sin_other != 0)) { - flags |= LLE_PROXY; - rt = rtalloc1(dst, 0, 0); - if ((rt == NULL) || !(rt->rt_flags & RTF_HOST)) { - log(LOG_INFO, "lla_rt_output: RTM_ADD publish (proxy only) is invalid\n"); +#ifdef INET + if (dst->sa_family == AF_INET && + ((struct sockaddr_inarp *)dst)->sin_other != 0) { + struct rtentry *rt = rtalloc1(dst, 0, 0); + if (rt == NULL || !(rt->rt_flags & RTF_HOST)) { + log(LOG_INFO, "%s: RTM_ADD publish " + "(proxy only) is invalid\n", + __func__); rtfree(rt); return EINVAL; } rtfree(rt); + + flags |= LLE_PROXY; } +#endif } flags |= LLE_CREATE; break; @@ -457,29 +497,33 @@ bcopy(LLADDR(dl), &lle->ll_addr, ifp->if_addrlen); lle->la_flags |= LLE_VALID; lle->la_flags &= ~LLE_DELETED; +#ifdef INET6 /* * ND6 */ if (dst->sa_family == AF_INET6) lle->ln_state = ND6_LLINFO_REACHABLE; +#endif /* * "arp" and "ndp" always sets the (RTF_STATIC | RTF_HOST) flags */ if (rtm->rtm_rmx.rmx_expire == 0) { lle->la_flags |= LLE_STATIC; lle->la_expire = 0; - } - else + } else lle->la_expire = rtm->rtm_rmx.rmx_expire; +#ifdef INET /* gratuious ARP */ - if (lle->la_flags & LLE_PUB) { - if (dst->sa_family == AF_INET) - arprequest(ifp, - &((struct sockaddr_in *)dst)->sin_addr, - &((struct sockaddr_in *)dst)->sin_addr, - ((lle->la_flags & LLE_PROXY) ? (u_char *)IF_LLADDR(ifp) : - (u_char *)LLADDR(dl))); + if ((lle->la_flags & LLE_PUB) && + dst->sa_family == AF_INET) { + arprequest(ifp, + &((struct sockaddr_in *)dst)->sin_addr, + &((struct sockaddr_in *)dst)->sin_addr, + ((lle->la_flags & LLE_PROXY) ? + (u_char *)IF_LLADDR(ifp) : + (u_char *)LLADDR(dl))); } +#endif } } else { if (flags & LLE_DELETE) { @@ -490,5 +534,3 @@ IF_LLTBLS_UNLOCK(ifp); return 0; } - - ==== //depot/projects/arp-v2/src/sys/net/if_llatbl.h#3 (text+ko) ==== @@ -45,7 +45,7 @@ uint16_t la_asked; uint16_t la_preempt; uint16_t ln_byhint; - int16_t ln_state; /* IPv6 has ND6_LLINFO_NOSTATE == -2 */ + int16_t ln_state; /* IPv6 has ND6_LLINFO_NOSTATE == -2 */ uint16_t ln_router; time_t ln_ntick; union { @@ -63,18 +63,18 @@ struct mtx lle_mtx; /* mutex for lle entry */ }; -#define ln_timer_ch lle_timer.ln_timer_ch -#define la_timer lle_timer.la_timer +#define ln_timer_ch lle_timer.ln_timer_ch +#define la_timer lle_timer.la_timer -#define l3_addr4 l3_addr.addr4 -#define l3_addr6 l3_addr.addr6 +#define l3_addr4 l3_addr.addr4 +#define l3_addr6 l3_addr.addr6 #ifndef LLTBL_HASHTBL_SIZE -#define LLTBL_HASHTBL_SIZE 32 /* default 32 ? */ +#define LLTBL_HASHTBL_SIZE 32 /* default 32 ? */ #endif #ifndef LLTBL_HASHMASK -#define LLTBL_HASHMASK (LLTBL_HASHTBL_SIZE - 1) +#define LLTBL_HASHMASK (LLTBL_HASHTBL_SIZE - 1) #endif struct lltable { @@ -87,29 +87,28 @@ /* * flags to be passed to arplookup. */ -#define LLE_DELETED 0x0001 /* entry must be deleted */ -#define LLE_STATIC 0x0002 /* entry is static */ -#define LLE_IFADDR 0x0004 /* entry is interface addr */ -#define LLE_VALID 0x0008 /* ll_addr is valid */ -#define LLE_PROXY 0x0010 /* proxy entry ??? */ -#define LLE_PUB 0x0020 /* publish entry ??? */ -#define LLE_CREATE 0x8000 /* create on a lookup miss */ -#define LLE_DELETE 0x4000 /* delete on a lookup - match LLE_IFADDR */ +#define LLE_DELETED 0x0001 /* entry must be deleted */ +#define LLE_STATIC 0x0002 /* entry is static */ +#define LLE_IFADDR 0x0004 /* entry is interface addr */ +#define LLE_VALID 0x0008 /* ll_addr is valid */ +#define LLE_PROXY 0x0010 /* proxy entry ??? */ +#define LLE_PUB 0x0020 /* publish entry ??? */ +#define LLE_CREATE 0x8000 /* create on a lookup miss */ +#define LLE_DELETE 0x4000 /* delete on a lookup - match LLE_IFADDR */ -#define LLATBL_HASH(key, mask) (((((((key >> 8) ^ key) >> 8) ^ key) >> 8) ^ key) & mask) +#define LLATBL_HASH(key, mask) \ + (((((((key >> 8) ^ key) >> 8) ^ key) >> 8) ^ key) & mask) -#define IF_LLE_LOCK_INIT(lle) mtx_init(&(lle)->lle_mtx, \ - "if_llentry_mtx", NULL, MTX_DEF | MTX_RECURSE) +#define IF_LLE_LOCK_INIT(lle) \ + mtx_init(&(lle)->lle_mtx, "if_llentry_mtx", NULL, MTX_DEF | MTX_RECURSE) #define IF_LLE_LOCK_DESTROY(lle) mtx_destroy(&(lle)->lle_mtx) #define IF_LLE_LOCK(lle) mtx_lock(&(lle)->lle_mtx) #define IF_LLE_UNLOCK(lle) mtx_unlock(&(lle)->lle_mtx) -extern struct llentry *lla_lookup(struct ifnet *ifp, u_int flags, struct sockaddr *l3addr); -extern int lla_rt_output(struct rt_msghdr *rtm, struct rt_addrinfo *info); -extern int llentry_free(struct llentry *lle); -extern int lltable_free(struct ifnet *ifp, int af); -extern void lltable_drain(int af); - -#endif - - +struct llentry *lla_lookup(struct ifnet *, u_int flags, + struct sockaddr *l3addr); +int lla_rt_output(struct rt_msghdr *rtm, struct rt_addrinfo *info); +int llentry_free(struct llentry *lle); +int lltable_free(struct ifnet *ifp, int af); +void lltable_drain(int af); +#endif /* _NET_IF_LLATBL_H_ */ From owner-p4-projects@FreeBSD.ORG Sun Nov 23 19:23:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 50BC81065673; Sun, 23 Nov 2008 19:23:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1498B106564A for ; Sun, 23 Nov 2008 19:23:08 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 026F28FC0A for ; Sun, 23 Nov 2008 19:23:08 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mANJN7LU005338 for ; Sun, 23 Nov 2008 19:23:07 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mANJN7D1005336 for perforce@freebsd.org; Sun, 23 Nov 2008 19:23:07 GMT (envelope-from trasz@freebsd.org) Date: Sun, 23 Nov 2008 19:23:07 GMT Message-Id: <200811231923.mANJN7D1005336@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 153402 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, 23 Nov 2008 19:23:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=153402 Change 153402 by trasz@trasz_strashydlo on 2008/11/23 19:22:47 Update TODO. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/TODO#52 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/TODO#52 (text+ko) ==== @@ -1,5 +1,8 @@ Things that need to be done before this goes into -CURRENT: +- Don't use fpathconf(..., _PC_EXTENDED_SECURITY_NP); instead just call + acl_set_file(3) or acl_get_file(3) with ACL_TYPE_NFS4 and handle EOPNOTSUPP. + - Fix Vflags abuse (mostly done, only one left is unionfs). - MFP4 of the above. @@ -13,6 +16,11 @@ - MFP4 of the above. +- Talk about semantics. Do whatever is needed. + +- Figure out whether this thing should be called 'NFS4' or 'NFSv4'. + Use this name consistently. + - Review. Things to do, in no particular order: From owner-p4-projects@FreeBSD.ORG Mon Nov 24 03:02:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5AB3A1065675; Mon, 24 Nov 2008 03:02:01 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0F5D8106564A for ; Mon, 24 Nov 2008 03:02:01 +0000 (UTC) (envelope-from qingli@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EB15F8FC0A for ; Mon, 24 Nov 2008 03:02:00 +0000 (UTC) (envelope-from qingli@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAO320E0080769 for ; Mon, 24 Nov 2008 03:02:00 GMT (envelope-from qingli@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAO320N8080767 for perforce@freebsd.org; Mon, 24 Nov 2008 03:02:00 GMT (envelope-from qingli@freebsd.org) Date: Mon, 24 Nov 2008 03:02:00 GMT Message-Id: <200811240302.mAO320N8080767@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to qingli@freebsd.org using -f From: Qing Li To: Perforce Change Reviews Cc: Subject: PERFORCE change 153420 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, 24 Nov 2008 03:02:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=153420 Change 153420 by qingli@FreeBSD-newarp on 2008/11/24 03:01:52 1. removed the unnecessary lle_mtx as noted by Sam 2. removed the if_lltbls_mtx from the ifnet{} 3. incorporate previous review comments from Gleb Smirnoff 4. the L2 tables (for AF_INET and AF_INET6) now live under the per ifnet{} if_afdata[] member field 5. access to the L2 tables is synchronized through the IF_AFDATA_LOCK 6. changed the if_afdata_mtx to a MTX_RECURSE lock due to the recursive locking challenges in IPv6 Unit Testing: 1. ping (x.x.x.255) 2. ping6 3. arp (various combo of -an, -s, -d, -ad) 4. ndp (various combo of -s, -d) 5. netperf (TCP_STREAM) test Immediate issue to be resolved: Now a global "lltables" is used to track all of L2 tables (both AF_INET and AF_INET6) for dumping these tables (e.g. for "arp" and "ndp" output). Not sure how to synchronize this list. Affected files ... .. //depot/projects/arp-v2/src/sys/net/if.c#7 edit .. //depot/projects/arp-v2/src/sys/net/if_llatbl.c#5 edit .. //depot/projects/arp-v2/src/sys/net/if_llatbl.h#4 edit .. //depot/projects/arp-v2/src/sys/net/if_var.h#8 edit .. //depot/projects/arp-v2/src/sys/netinet/if_ether.c#15 edit .. //depot/projects/arp-v2/src/sys/netinet/in.c#6 edit .. //depot/projects/arp-v2/src/sys/netinet/in_proto.c#3 edit .. //depot/projects/arp-v2/src/sys/netinet/in_var.h#4 edit .. //depot/projects/arp-v2/src/sys/netinet6/icmp6.c#7 edit .. //depot/projects/arp-v2/src/sys/netinet6/in6.c#8 edit .. //depot/projects/arp-v2/src/sys/netinet6/in6_var.h#2 edit .. //depot/projects/arp-v2/src/sys/netinet6/ip6_forward.c#5 edit .. //depot/projects/arp-v2/src/sys/netinet6/ip6_input.c#6 edit .. //depot/projects/arp-v2/src/sys/netinet6/ip6_mroute.c#5 edit .. //depot/projects/arp-v2/src/sys/netinet6/ip6_output.c#7 edit .. //depot/projects/arp-v2/src/sys/netinet6/nd6.c#8 edit .. //depot/projects/arp-v2/src/sys/netinet6/nd6_nbr.c#7 edit .. //depot/projects/arp-v2/src/sys/netinet6/nd6_rtr.c#6 edit Differences ... ==== //depot/projects/arp-v2/src/sys/net/if.c#7 (text+ko) ==== @@ -137,7 +137,7 @@ #endif extern uma_zone_t llezone; -extern uma_zone_t lltzone; +extern struct mtx lltables_mtx; int if_index = 0; int ifqmaxlen = IFQ_MAXLEN; @@ -375,8 +375,6 @@ */ llezone = uma_zcreate("llentry", sizeof(struct llentry), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); - lltzone = uma_zcreate("lltable", sizeof(struct lltable), NULL, NULL, - NULL, NULL, UMA_ALIGN_PTR, 0); } static void @@ -518,13 +516,11 @@ TASK_INIT(&ifp->if_starttask, 0, if_start_deferred, ifp); TASK_INIT(&ifp->if_linktask, 0, do_link_state_change, ifp); IF_AFDATA_LOCK_INIT(ifp); - IF_LLTBLS_LOCK_INIT(ifp); ifp->if_afdata_initialized = 0; TAILQ_INIT(&ifp->if_addrhead); TAILQ_INIT(&ifp->if_prefixhead); TAILQ_INIT(&ifp->if_multiaddrs); - TAILQ_INIT(&ifp->if_lltables); TAILQ_INIT(&ifp->if_groups); if_addgroup(ifp, IFG_ALL); ==== //depot/projects/arp-v2/src/sys/net/if_llatbl.c#5 (text+ko) ==== @@ -22,6 +22,9 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD$"); + #include "opt_inet.h" #include "opt_inet6.h" @@ -48,23 +51,27 @@ #include #include +MALLOC_DEFINE(M_LLTABLE, "lltable", "link level address tables"); uma_zone_t llezone; -uma_zone_t lltzone; + +SLIST_HEAD(, lltable) lltables = SLIST_HEAD_INITIALIZER(lltables); -static struct lltable *lltable_new(struct ifnet *ifp, int af); int sysctl_dumparp(int af, struct sysctl_req *wr); extern void arprequest(struct ifnet *, struct in_addr *, struct in_addr *, u_char *); + static int -dump_llcache(struct ifnet *ifp, int af, struct llentries *head, - struct sysctl_req *wr) +dump_llcache(struct lltable *llt, int af, struct sysctl_req *wr) { + struct ifnet *ifp = llt->llt_ifp; struct llentry *lle; - struct rt_msghdr *rtm; - struct sockaddr_dl *sdl; - uint8_t *msg; - int msgsize, error; + struct rt_msghdr *rtm = NULL; + struct sockaddr_dl *sdl = NULL; + uint8_t *msg = NULL; + int msgsize = 0; + int error = 0; + int i; #ifdef INET struct { struct rt_msghdr rtm; @@ -102,63 +109,71 @@ return EINVAL; } - IF_LLTBLS_LOCK_ASSERT(ifp); + /* XXXXX + * current IFNET_RLOCK() is mapped to IFNET_WLOCK() + * so it is okay to use this ASSERT, change it when + * IFNET lock is finalized + */ + IFNET_WLOCK_ASSERT(); + + for (i = 0; i < LLTBL_HASHTBL_SIZE; i++) { + LIST_FOREACH(lle, &llt->lle_head[i], lle_next) { + if (lle->la_flags & LLE_DELETED) /* skip deleted entries */ + continue; + /* + * produce a msg made of: + * struct rt_msghdr; + * struct sockaddr_inarp; (IPv4) struct sockaddr_in6 (IPv6) + * struct sockaddr_dl; + */ + bzero(msg, msgsize); + rtm->rtm_msglen = msgsize; - error = 0; - LIST_FOREACH(lle, head, lle_next) { - if (lle->la_flags & LLE_DELETED) /* skip deleted entries */ - continue; - /* - * produce a msg made of: - * struct rt_msghdr; - * struct sockaddr_inarp; (IPv4) struct sockaddr_in6 (IPv6) - * struct sockaddr_dl; - */ - bzero(msg, msgsize); - rtm->rtm_msglen = msgsize; - switch (af) { + switch (af) { #ifdef INET - case AF_INET: - arpc.sin.sin_family = AF_INET; - arpc.sin.sin_len = sizeof(arpc.sin); - arpc.sin.sin_addr.s_addr = lle->l3_addr4.sin_addr.s_addr; - break; + case AF_INET: + arpc.sin.sin_family = AF_INET; + arpc.sin.sin_len = sizeof(arpc.sin); + arpc.sin.sin_addr.s_addr = lle->l3_addr4.sin_addr.s_addr; + break; #endif #ifdef INET6 - case AF_INET6: - ndpc.sin6.sin6_family = AF_INET6; - ndpc.sin6.sin6_len = sizeof(ndpc.sin6); - bcopy(&lle->l3_addr6, &ndpc.sin6, lle->l3_addr6.sin6_len); - break; + case AF_INET6: + ndpc.sin6.sin6_family = AF_INET6; + ndpc.sin6.sin6_len = sizeof(ndpc.sin6); + bcopy(&lle->l3_addr6, &ndpc.sin6, lle->l3_addr6.sin6_len); + break; #endif - } - /* publish */ - if (lle->la_flags & LLE_PUB) { - rtm->rtm_flags |= RTF_ANNOUNCE; - /* proxy only */ - if ((af == AF_INET) && (lle->la_flags & LLE_PROXY)) - arpc.sin.sin_other = SIN_PROXY; - } + } + /* publish */ + if (lle->la_flags & LLE_PUB) { + rtm->rtm_flags |= RTF_ANNOUNCE; + /* proxy only */ + if ((af == AF_INET) && (lle->la_flags & LLE_PROXY)) + arpc.sin.sin_other = SIN_PROXY; + } - if (lle->la_flags & LLE_VALID) { /* valid MAC */ - sdl->sdl_family = AF_LINK; - sdl->sdl_len = sizeof(*sdl); - sdl->sdl_alen = ifp->if_addrlen; - sdl->sdl_index = ifp->if_index; - sdl->sdl_type = ifp->if_type; - bcopy(&lle->ll_addr, LLADDR(sdl), ifp->if_addrlen); + if (lle->la_flags & LLE_VALID) { /* valid MAC */ + sdl->sdl_family = AF_LINK; + sdl->sdl_len = sizeof(*sdl); + sdl->sdl_alen = ifp->if_addrlen; + sdl->sdl_index = ifp->if_index; + sdl->sdl_type = ifp->if_type; + bcopy(&lle->ll_addr, LLADDR(sdl), ifp->if_addrlen); + } + rtm->rtm_rmx.rmx_expire = + lle->la_flags & LLE_STATIC ? 0 : lle->la_expire; + rtm->rtm_flags |= (RTF_LLINFO | RTF_HOST); + if (lle->la_flags & LLE_STATIC) + rtm->rtm_flags |= RTF_STATIC; + rtm->rtm_index = ifp->if_index; + error = SYSCTL_OUT(wr, msg, msgsize); + if (error) + break; } - rtm->rtm_rmx.rmx_expire = - lle->la_flags & LLE_STATIC ? 0 : lle->la_expire; - rtm->rtm_flags |= (RTF_LLINFO | RTF_HOST); - if (lle->la_flags & LLE_STATIC) - rtm->rtm_flags |= RTF_STATIC; - rtm->rtm_index = ifp->if_index; - error = SYSCTL_OUT(wr, msg, msgsize); - if (error) - break; } - return error; + + return (error); } /* @@ -168,43 +183,34 @@ sysctl_dumparp(int af, struct sysctl_req *wr) { struct lltable *llt; - struct ifnet *ifp; - int i, error = 0; + int error = 0; IFNET_RLOCK(); - TAILQ_FOREACH(ifp, &V_ifnet, if_link) { - IF_LLTBLS_LOCK(ifp); - TAILQ_FOREACH(llt, &ifp->if_lltables, llt_link) { - if (llt->llt_af != af) - continue; - for (i = 0; i < LLTBL_HASHTBL_SIZE; i++) { - error = dump_llcache(ifp, af, - &llt->lle_head[i], wr); - if (error) { - IF_LLTBLS_UNLOCK(ifp); - goto done; - } - } + SLIST_FOREACH(llt, &lltables, llt_link) { + if (llt->llt_af == af) { + error = dump_llcache(llt, af, wr); + if (error != 0) + goto done; } - IF_LLTBLS_UNLOCK(ifp); } done: IFNET_RUNLOCK(); - return error; + return (error); } /* - * delete an address from the address table + * Deletes an address from the address table. + * This function is called by the timer functions + * such as arptimer() and nd6_llinfo_timer(), and + * the caller does the locking. */ int llentry_free(struct llentry *lle) { + KASSERT(lle != NULL, ("%s: lle is NULL", __func__)); - KASSERT(lle != NULL, ("null lle")); - IF_LLTBLS_LOCK_ASSERT(lle->lle_tbl->llt_ifp); + LIST_REMOVE(lle, lle_next); - LIST_REMOVE(lle, lle_next); - IF_LLE_LOCK_DESTROY(lle); if (lle->la_hold != NULL) m_freem(lle->la_hold); uma_zfree(llezone, lle); @@ -212,130 +218,111 @@ } /* - * delete an address table from the interface ifp + * Free all entries from given table and free itself. + * Since lltables collects from all of the intefaces, + * the caller of this function must acquire IFNET_WLOCK(). */ -int -lltable_free(struct ifnet *ifp, int af) +void lltable_free(struct lltable *llt) { - struct lltable *llt; struct llentry *lle; int i; - KASSERT(ifp != NULL, ("null ifp")); + KASSERT(llt != NULL, ("%s: llt is NULL", __func__)); - IF_LLTBLS_LOCK_ASSERT(ifp); + IFNET_WLOCK(); + SLIST_REMOVE(&lltables, llt, lltable, llt_link); + IFNET_WUNLOCK(); - TAILQ_FOREACH(llt, &ifp->if_lltables, llt_link) { - if (llt->llt_af != af) - continue; - for (i = 0; i < LLTBL_HASHTBL_SIZE; i++) { - LIST_FOREACH(lle, &llt->lle_head[i], lle_next) - llentry_free(lle); + for (i=0; i < LLTBL_HASHTBL_SIZE; i++) { + LIST_FOREACH(lle, &llt->lle_head[i], lle_next) { + callout_drain(&lle->la_timer); + llentry_free(lle); } - TAILQ_REMOVE(&ifp->if_lltables, llt, llt_link); - uma_zfree(lltzone, llt); - break; } - return 0; + + free(llt, M_LLTABLE); } void lltable_drain(int af) { - struct ifnet *ifp; - struct lltable *llt = NULL; - struct llentry *lle; - int i; + struct lltable *llt; + struct llentry *lle; + register int i; + + IFNET_RLOCK(); + SLIST_FOREACH(llt, &lltables, llt_link) { + if (llt->llt_af != af) + continue; - TAILQ_FOREACH(ifp, &ifnet, if_link) { - IF_LLTBLS_LOCK(ifp); - TAILQ_FOREACH(llt, &ifp->if_lltables, llt_link) { - if (llt->llt_af != af) - continue; - for (i = 0; i < LLTBL_HASHTBL_SIZE; i++) { - LIST_FOREACH(lle, &llt->lle_head[i], - lle_next) { - if (lle->la_hold != NULL) { - m_freem(lle->la_hold); - lle->la_hold = NULL; - } + for (i=0; i < LLTBL_HASHTBL_SIZE; i++) { + LIST_FOREACH(lle, &llt->lle_head[i], lle_next) { + if (lle->la_hold) { + m_freem(lle->la_hold); + lle->la_hold = NULL; } } - break; } - IF_LLTBLS_LOCK(ifp); } + IFNET_RUNLOCK(); } + /* - * Add a new table at the head of the list for interface ifp + * Create a new lltable. */ -static struct lltable * -lltable_new(struct ifnet *ifp, int af) +struct lltable * +lltable_init(struct ifnet *ifp, int af) { struct lltable *llt; - int i; + register int i; + + llt = malloc(sizeof(struct lltable), M_LLTABLE, M_WAITOK); + if (llt == NULL) + return (NULL); - /* XXX can this happen? */ - if (ifp == NULL) - return NULL; - llt = uma_zalloc(lltzone, M_DONTWAIT | M_ZERO); - if (llt == NULL) { - log(LOG_INFO, "lltable_new: malloc failed for new lla-table\n"); - return NULL; - } - llt->llt_af = af; + llt->llt_af = af; llt->llt_ifp = ifp; for (i = 0; i < LLTBL_HASHTBL_SIZE; i++) LIST_INIT(&llt->lle_head[i]); - IF_LLTBLS_LOCK_ASSERT(ifp); - TAILQ_INSERT_HEAD(&ifp->if_lltables, llt, llt_link); + IFNET_WLOCK(); + SLIST_INSERT_HEAD(&lltables, llt, llt_link); + IFNET_WUNLOCK(); - return llt; + return (llt); } + /* * Generic link layer address lookup function, replacement * of the old "arplookup" */ struct llentry * -lla_lookup(struct ifnet *ifp, u_int flags, struct sockaddr *l3addr) +lla_lookup(struct lltable *llt, u_int flags, struct sockaddr *l3addr) { - struct llentry *lle; + struct ifnet *ifp; + struct llentry *lle; struct llentries *lleh; - struct lltable *llt; - struct rtentry *rt; + struct rtentry *rt; u_int hashkey; #ifdef INET6 char ip6buf[INET6_ADDRSTRLEN]; #endif - KASSERT(ifp != NULL, ("null ifp")); - KASSERT(l3addr != NULL, ("null L3 address")); + KASSERT(llt != NULL, ("%s: llt is NULL", __func__)); + KASSERT(l3addr != NULL, ("%s: L3 address is NULL", __func__)); - IF_LLTBLS_LOCK_ASSERT(ifp); - - TAILQ_FOREACH(llt, &ifp->if_lltables, llt_link) - if (llt->llt_af == l3addr->sa_family) - break; - if ((flags & LLE_CREATE) && llt == NULL) { - llt = lltable_new(ifp, l3addr->sa_family); - if (llt == NULL) - return NULL; - } - + ifp = llt->llt_ifp; switch (l3addr->sa_family) { -#ifdef INET case AF_INET: hashkey = ((struct sockaddr_in *)l3addr)->sin_addr.s_addr; break; -#endif -#ifdef INET6 + case AF_INET6: hashkey = ((struct sockaddr_in6 *)l3addr)->sin6_addr.s6_addr32[3]; break; -#endif + default: return NULL; } @@ -346,43 +333,40 @@ continue; if (bcmp((void *)&lle->l3_addr, l3addr, l3addr->sa_len) == 0) break; - } + } if (lle == NULL) { if (!(flags & LLE_CREATE)) - return NULL; + return (NULL); /* - * A route that covers the given address must have been - * installed 1st because we are doing a resolution. + * a route that covers the given address must have been + * installed 1st because we are doing a resolution */ if (!(flags & LLE_IFADDR)) { rt = rtalloc1(l3addr, 0, 0); - if (rt == NULL || (rt->rt_flags & RTF_GATEWAY) || - rt->rt_ifp != ifp) { + if ((rt == NULL) || (rt->rt_flags & RTF_GATEWAY) || (rt->rt_ifp != ifp)) { if (l3addr->sa_family == AF_INET6) { /* - * Creating an ND6 cache for an IPv6 - * neighbor that is not covered by our - * own prefix. + * Creating a ND6 cache for an IPv6 neighbor + * that is not covered by our own prefix. */ - struct ifaddr *ifa = ifaof_ifpforaddr( - (struct sockaddr *)l3addr, ifp); - if (ifa != NULL) + struct ifaddr *ifa = + ifaof_ifpforaddr((struct sockaddr *)l3addr, ifp); + if (ifa != NULL) { + if (rt) + rtfree(rt); goto lla_lookup_1; + } } switch (l3addr->sa_family) { -#ifdef INET case AF_INET: - log(LOG_INFO, "IPv4 address: \"%s\" is " - "not on the network\n", + log(LOG_INFO, "IPv4 address: \"%s\" is not on the network\n", \ inet_ntoa(((struct sockaddr_in *)l3addr)->sin_addr)); break; -#endif #ifdef INET6 case AF_INET6: - log(LOG_INFO, "IPv6 address: \"%s\" is " - "not on the network\n", + log(LOG_INFO, "IPv6 address: \"%s\" is not on the network\n", \ ip6_sprintf(ip6buf, &((struct sockaddr_in6 *)l3addr)->sin6_addr)); break; #endif @@ -397,14 +381,13 @@ lla_lookup_1: lle = uma_zalloc(llezone, M_DONTWAIT | M_ZERO); if (lle == NULL) { - log(LOG_INFO, "%s: malloc failed\n", __func__); + log(LOG_INFO, "lla_lookup: new lle malloc failed\n"); return (NULL); } - IF_LLE_LOCK_INIT(lle); - callout_init_mtx(&lle->la_timer, &ifp->if_lltbls_mtx, 0); + callout_init(&lle->la_timer, CALLOUT_MPSAFE); - /* + /* qing * For IPv4 this will trigger "arpresolve" to generate * an ARP request */ @@ -415,9 +398,9 @@ if ((flags & (LLE_CREATE | LLE_IFADDR)) == (LLE_CREATE | LLE_IFADDR)) { bcopy(IF_LLADDR(ifp), &lle->ll_addr, ifp->if_addrlen); - lle->la_flags |= LLE_VALID | LLE_STATIC; + lle->la_flags |= (LLE_VALID | LLE_STATIC); } - + lle->lle_tbl = llt; lle->lle_head = lleh; LIST_INSERT_HEAD(lleh, lle, lle_next); @@ -425,9 +408,11 @@ if (flags & LLE_DELETE) lle->la_flags = LLE_DELETED; } + return (lle); } + /* * Called in route_output when adding/deleting a route to an interface. */ @@ -437,6 +422,7 @@ struct sockaddr_dl *dl = (struct sockaddr_dl *)info->rti_info[RTAX_GATEWAY]; struct sockaddr *dst = (struct sockaddr *)info->rti_info[RTAX_DST]; struct ifnet *ifp; + struct lltable *llt; struct llentry *lle; u_int flags = 0; @@ -486,8 +472,22 @@ return EINVAL; /* XXX not implemented yet */ } - IF_LLTBLS_LOCK(ifp); - lle = lla_lookup(ifp, flags, dst); + /* + * XXXXXXXX: A big and ugly hack! + * I must redesign this before even committing to perforce. This is + * just a hack to make new design working. + */ + IFNET_WLOCK(); + SLIST_FOREACH(llt, &lltables, llt_link) { + if (llt->llt_af == dst->sa_family && + llt->llt_ifp == ifp) + break; + } + IFNET_WUNLOCK(); + KASSERT(llt != NULL, ("Yep, ugly hacks are bad\n")); + + IF_AFDATA_LOCK(ifp); + lle = lla_lookup(llt, flags, dst); if (lle != NULL) { if (flags & LLE_CREATE) { /* qing: if we delay the delete, then if a subsequent @@ -527,10 +527,11 @@ } } else { if (flags & LLE_DELETE) { - IF_LLTBLS_UNLOCK(ifp); + IF_AFDATA_UNLOCK(ifp); return EINVAL; } } - IF_LLTBLS_UNLOCK(ifp); + + IF_AFDATA_UNLOCK(ifp); return 0; } ==== //depot/projects/arp-v2/src/sys/net/if_llatbl.h#4 (text+ko) ==== @@ -22,6 +22,8 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD$"); #ifndef _NET_IF_LLATBL_H_ #define _NET_IF_LLATBL_H_ @@ -37,9 +39,9 @@ struct llentry { LIST_ENTRY(llentry) lle_next; - struct lltable *lle_tbl; - struct llentries *lle_head; - struct mbuf *la_hold; + struct lltable *lle_tbl; + struct llentries *lle_head; + struct mbuf *la_hold; time_t la_expire; uint16_t la_flags; uint16_t la_asked; @@ -60,7 +62,6 @@ struct callout ln_timer_ch; struct callout la_timer; } lle_timer; - struct mtx lle_mtx; /* mutex for lle entry */ }; #define ln_timer_ch lle_timer.ln_timer_ch @@ -78,12 +79,13 @@ #endif struct lltable { - TAILQ_ENTRY(lltable) llt_link; + SLIST_ENTRY(lltable) llt_link; struct llentries lle_head[LLTBL_HASHTBL_SIZE]; int llt_af; - struct ifnet *llt_ifp; + struct ifnet *llt_ifp; }; + /* * flags to be passed to arplookup. */ @@ -99,16 +101,14 @@ #define LLATBL_HASH(key, mask) \ (((((((key >> 8) ^ key) >> 8) ^ key) >> 8) ^ key) & mask) -#define IF_LLE_LOCK_INIT(lle) \ - mtx_init(&(lle)->lle_mtx, "if_llentry_mtx", NULL, MTX_DEF | MTX_RECURSE) -#define IF_LLE_LOCK_DESTROY(lle) mtx_destroy(&(lle)->lle_mtx) -#define IF_LLE_LOCK(lle) mtx_lock(&(lle)->lle_mtx) -#define IF_LLE_UNLOCK(lle) mtx_unlock(&(lle)->lle_mtx) +struct llentry *lla_lookup(struct lltable *, u_int, struct sockaddr *); +int lla_rt_output(struct rt_msghdr *, struct rt_addrinfo *); +int llentry_free(struct llentry *); + +struct lltable *lltable_init(struct ifnet *, int); +void lltable_free(struct lltable *); +void lltable_drain(int); + +#endif /* _NET_IF_LLATBL_H_ */ + -struct llentry *lla_lookup(struct ifnet *, u_int flags, - struct sockaddr *l3addr); -int lla_rt_output(struct rt_msghdr *rtm, struct rt_addrinfo *info); -int llentry_free(struct llentry *lle); -int lltable_free(struct ifnet *ifp, int af); -void lltable_drain(int af); -#endif /* _NET_IF_LLATBL_H_ */ ==== //depot/projects/arp-v2/src/sys/net/if_var.h#8 (text+ko) ==== @@ -93,7 +93,6 @@ TAILQ_HEAD(ifprefixhead, ifprefix); TAILQ_HEAD(ifmultihead, ifmultiaddr); TAILQ_HEAD(ifgrouphead, ifg_group); -TAILQ_HEAD(lltables, lltable); /* L2/L3 address resolution table */ /* * Structure defining a queue for a network interface. @@ -171,8 +170,6 @@ void *if_bridge; /* bridge glue */ - struct lltables if_lltables; /* list of L3-L2 resolution tables */ - struct label *if_label; /* interface MAC label */ /* these are only used by IPv6 */ @@ -183,8 +180,7 @@ struct task if_starttask; /* task for IFF_NEEDSGIANT */ struct task if_linktask; /* task for link change events */ struct mtx if_addr_mtx; /* mutex to protect address lists */ - struct mtx if_lltbls_mtx; /* mutex to protect link-layer - address tables */ + LIST_ENTRY(ifnet) if_clones; /* interfaces of a cloner */ TAILQ_HEAD(, ifg_list) if_groups; /* linked list of groups per if */ /* protected by if_addr_mtx */ @@ -239,17 +235,6 @@ #define IF_ADDR_LOCK_ASSERT(if) mtx_assert(&(if)->if_addr_mtx, MA_OWNED) /* - * Locks for link-layer address tables on the network interface. - */ -#define IF_LLTBLS_LOCK_INIT(if) mtx_init(&(if)->if_lltbls_mtx, \ - "if_lltbls_mtx", NULL, MTX_DEF | MTX_RECURSE) -#define IF_LLTBLS_LOCK_DESTROY(if) mtx_destroy(&(if)->if_lltbls_mtx) -#define IF_LLTBLS_LOCK(if) mtx_lock(&(if)->if_lltbls_mtx) -#define IF_LLTBLS_UNLOCK(if) mtx_unlock(&(if)->if_lltbls_mtx) -#define IF_LLTBLS_LOCK_ASSERT(if) mtx_assert(&(if)->if_lltbls_mtx, MA_OWNED) - - -/* * Output queues (ifp->if_snd) and slow device input queues (*ifp->if_slowq) * are queues of messages stored on ifqueue structures * (defined above). Entries are added to and deleted from these structures @@ -370,7 +355,8 @@ EVENTHANDLER_DECLARE(group_change_event, group_change_event_handler_t); #define IF_AFDATA_LOCK_INIT(ifp) \ - mtx_init(&(ifp)->if_afdata_mtx, "if_afdata", NULL, MTX_DEF) + mtx_init(&(ifp)->if_afdata_mtx, "if_afdata", NULL, \ + (MTX_DEF | MTX_RECURSE)) #define IF_AFDATA_LOCK(ifp) mtx_lock(&(ifp)->if_afdata_mtx) #define IF_AFDATA_TRYLOCK(ifp) mtx_trylock(&(ifp)->if_afdata_mtx) #define IF_AFDATA_UNLOCK(ifp) mtx_unlock(&(ifp)->if_afdata_mtx) ==== //depot/projects/arp-v2/src/sys/netinet/if_ether.c#15 (text+ko) ==== @@ -78,6 +78,7 @@ #define SIN(s) ((struct sockaddr_in *)s) #define SDL(s) ((struct sockaddr_dl *)s) +#define LLTABLE(ifp) ((struct lltable *)(ifp)->if_afdata[AF_INET]) SYSCTL_DECL(_net_link_ether); SYSCTL_NODE(_net_link_ether, PF_INET, inet, CTLFLAG_RW, 0, ""); @@ -130,9 +131,10 @@ addr4.sin_len = sizeof(addr4); addr4.sin_family = AF_INET; addr4.sin_addr.s_addr = addr; - IF_LLTBLS_LOCK(ifp); - lle = lla_lookup(ifp, (LLE_DELETE | LLE_IFADDR), (struct sockaddr *)&addr4); - IF_LLTBLS_UNLOCK(ifp); + IF_AFDATA_LOCK(ifp); + lle = lla_lookup(LLTABLE(ifp), (LLE_DELETE | LLE_IFADDR), + (struct sockaddr *)&addr4); + IF_AFDATA_UNLOCK(ifp); #if 0 if (lle == NULL) log(LOG_INFO, "arp_ifscrub: interface address is missing from cache\n"); @@ -150,19 +152,19 @@ struct llentry *lle = (struct llentry *)arg; if (lle == NULL) { - panic("arptimer: NULL entry!\n"); + panic("%s: NULL entry!\n", __func__); return; } ifp = lle->lle_tbl->llt_ifp; - IF_LLTBLS_LOCK(ifp); - if ((lle->la_flags & LLE_DELETED) && - !(lle->la_flags & LLE_STATIC)) { + IF_AFDATA_LOCK(ifp); + if ((lle->la_flags & LLE_DELETED) || + (time_second >= lle->la_expire)) { if (!callout_pending(&lle->la_timer) && (callout_active(&lle->la_timer))) { (void)llentry_free(lle); } } - IF_LLTBLS_UNLOCK(ifp); + IF_AFDATA_UNLOCK(ifp); } @@ -271,11 +273,11 @@ flags = (ifp->if_flags & (IFF_NOARP | IFF_STATICARP)) ? 0 : LLE_CREATE; - /* Qing - * because this function returns an llentry, - * the IF LLTBLS lock is held by the caller + /* XXXXX + * Since this function returns an llentry, the + * lock is held by the caller. */ - la = lla_lookup(ifp, flags, dst); + la = lla_lookup(LLTABLE(ifp), flags, dst); if (la == NULL) { if (flags & LLE_CREATE) log(LOG_DEBUG, @@ -559,8 +561,8 @@ sin.sin_family = AF_INET; sin.sin_addr = isaddr; flag = (itaddr.s_addr == myaddr.s_addr) ? LLE_CREATE : 0; -/* IF_LLTBLS_LOCK(ifp); */ - la = lla_lookup(ifp, flag, (struct sockaddr *)&sin); +/* Qing IF_AFDATA_LOCK(ifp); */ + la = lla_lookup(LLTABLE(ifp), flag, (struct sockaddr *)&sin); if (la != NULL) { /* the following is not an error when doing bridging */ if (!bridged && la->lle_tbl->llt_ifp != ifp @@ -693,7 +695,7 @@ } (void)memcpy(ar_tha(ah), ar_sha(ah), ah->ar_hln); (void)memcpy(ar_sha(ah), &la->ll_addr, ah->ar_hln); -/* IF_LLTBLS_UNLOCK(ifp);*/ +/* QING IF_AFDATA_UNLOCK(ifp); */ } } @@ -722,10 +724,8 @@ return; drop: -/* - if (la != NULL) - IF_LLTBLS_UNLOCK(ifp); -*/ +/* if (la != NULL) + IF_AFDATA_UNLOCK(ifp); */ m_freem(m); } #endif @@ -738,13 +738,15 @@ if (ntohl(IA_SIN(ifa)->sin_addr.s_addr) != INADDR_ANY) arprequest(ifp, &IA_SIN(ifa)->sin_addr, &IA_SIN(ifa)->sin_addr, IF_LLADDR(ifp)); - /* Qing - * interface address is considered static entry (true ??) + /* + * interface address is considered static entry + * because the output of the arp utility shows + * that L2 entry as permanent */ - IF_LLTBLS_LOCK(ifp); - lle = lla_lookup(ifp, (LLE_CREATE | LLE_IFADDR | LLE_STATIC), + IF_AFDATA_LOCK(ifp); + lle = lla_lookup(LLTABLE(ifp), (LLE_CREATE | LLE_IFADDR | LLE_STATIC), (struct sockaddr *)IA_SIN(ifa)); - IF_LLTBLS_UNLOCK(ifp); + IF_AFDATA_UNLOCK(ifp); if (lle == NULL) log(LOG_INFO, "arp_ifinit: cannot create arp " "entry for interface address\n"); ==== //depot/projects/arp-v2/src/sys/netinet/in.c#6 (text+ko) ==== @@ -46,6 +46,7 @@ #include #include +#include #include #include @@ -1017,3 +1018,19 @@ in_pcbpurgeif0(&V_udbinfo, ifp); in_purgemaddrs(ifp); } + +void * +in_domifattach(struct ifnet *ifp) +{ + struct lltable *llt = lltable_init(ifp, AF_INET); + + return (llt); +} + +void +in_domifdetach(struct ifnet *ifp __unused, void *aux) +{ + struct lltable *llt = (struct lltable *)aux; + + lltable_free(llt); +} ==== //depot/projects/arp-v2/src/sys/netinet/in_proto.c#3 (text+ko) ==== @@ -362,7 +362,9 @@ .dom_rtattach = in_inithead, #endif .dom_rtoffset = 32, - .dom_maxrtkey = sizeof(struct sockaddr_in) + .dom_maxrtkey = sizeof(struct sockaddr_in), + .dom_ifattach = in_domifattach, + .dom_ifdetach = in_domifdetach }; DOMAIN_SET(inet); ==== //depot/projects/arp-v2/src/sys/netinet/in_var.h#4 (text+ko) ==== @@ -305,6 +305,9 @@ int in_ifadown(struct ifaddr *ifa, int); void in_ifscrub(struct ifnet *, struct in_ifaddr *); struct mbuf *ip_fastforward(struct mbuf *); +void *in_domifattach(struct ifnet *); +void in_domifdetach(struct ifnet *, void *); + /* XXX */ void in_rtalloc_ign(struct route *ro, u_long ignflags, u_int fibnum); ==== //depot/projects/arp-v2/src/sys/netinet6/icmp6.c#7 (text+ko) ==== @@ -2389,10 +2389,10 @@ } /* RFC 2461 8.3 */ - IF_LLTBLS_LOCK(ifp); + IF_AFDATA_LOCK(ifp); nd6_cache_lladdr(ifp, &redtgt6, lladdr, lladdrlen, ND_REDIRECT, is_onlink ? ND_REDIRECT_ONLINK : ND_REDIRECT_ROUTER); - IF_LLTBLS_UNLOCK(ifp); + IF_AFDATA_UNLOCK(ifp); if (!is_onlink) { /* better router case. perform rtredirect. */ /* perform rtredirect */ @@ -2573,17 +2573,17 @@ struct nd_opt_hdr *nd_opt; char *lladdr; - IF_LLTBLS_LOCK(ifp); + IF_AFDATA_LOCK(ifp); ln = nd6_lookup(router_ll6, 0, ifp); if (!ln) { - IF_LLTBLS_UNLOCK(ifp); + IF_AFDATA_UNLOCK(ifp); goto nolladdropt; } len = sizeof(*nd_opt) + ifp->if_addrlen; len = (len + 7) & ~7; /* round by 8 */ /* safety check */ if (len + (p - (u_char *)ip6) > maxlen) { - IF_LLTBLS_UNLOCK(ifp); + IF_AFDATA_UNLOCK(ifp); goto nolladdropt; } if (ln->la_flags & LLE_VALID) { @@ -2594,7 +2594,7 @@ bcopy(&ln->ll_addr, lladdr, ifp->if_addrlen); p += len; } - IF_LLTBLS_UNLOCK(ifp); + IF_AFDATA_UNLOCK(ifp); } nolladdropt:; >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Mon Nov 24 04:13:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E77B61065677; Mon, 24 Nov 2008 04:13:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A1B681065674 for ; Mon, 24 Nov 2008 04:13:13 +0000 (UTC) (envelope-from qingli@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8AFF38FC0A for ; Mon, 24 Nov 2008 04:13:13 +0000 (UTC) (envelope-from qingli@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAO4DD5m091083 for ; Mon, 24 Nov 2008 04:13:13 GMT (envelope-from qingli@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAO4DDJN091081 for perforce@freebsd.org; Mon, 24 Nov 2008 04:13:13 GMT (envelope-from qingli@freebsd.org) Date: Mon, 24 Nov 2008 04:13:13 GMT Message-Id: <200811240413.mAO4DDJN091081@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to qingli@freebsd.org using -f From: Qing Li To: Perforce Change Reviews Cc: Subject: PERFORCE change 153421 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, 24 Nov 2008 04:13:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=153421 Change 153421 by qingli@FreeBSD-newarp on 2008/11/24 04:13:09 missed a file in the previous commit, and fix locking on IPv4 arp input path Affected files ... .. //depot/projects/arp-v2/src/sys/net/if_llatbl.c#6 edit .. //depot/projects/arp-v2/src/sys/netinet/if_ether.c#16 edit .. //depot/projects/arp-v2/src/sys/netinet/ip_output.c#7 edit Differences ... ==== //depot/projects/arp-v2/src/sys/net/if_llatbl.c#6 (text+ko) ==== @@ -473,9 +473,8 @@ } /* - * XXXXXXXX: A big and ugly hack! - * I must redesign this before even committing to perforce. This is - * just a hack to make new design working. + * XXXXXXXX: + * REVISE this approach if possible. */ IFNET_WLOCK(); SLIST_FOREACH(llt, &lltables, llt_link) { ==== //depot/projects/arp-v2/src/sys/netinet/if_ether.c#16 (text+ko) ==== @@ -561,7 +561,7 @@ sin.sin_family = AF_INET; sin.sin_addr = isaddr; flag = (itaddr.s_addr == myaddr.s_addr) ? LLE_CREATE : 0; -/* Qing IF_AFDATA_LOCK(ifp); */ + IF_AFDATA_LOCK(ifp); la = lla_lookup(LLTABLE(ifp), flag, (struct sockaddr *)&sin); if (la != NULL) { /* the following is not an error when doing bridging */ @@ -695,10 +695,11 @@ } (void)memcpy(ar_tha(ah), ar_sha(ah), ah->ar_hln); (void)memcpy(ar_sha(ah), &la->ll_addr, ah->ar_hln); -/* QING IF_AFDATA_UNLOCK(ifp); */ } } + IF_AFDATA_UNLOCK(ifp); + if (itaddr.s_addr == myaddr.s_addr && IN_LINKLOCAL(ntohl(itaddr.s_addr))) { /* RFC 3927 link-local IPv4; always reply by broadcast. */ @@ -724,8 +725,7 @@ return; drop: -/* if (la != NULL) - IF_AFDATA_UNLOCK(ifp); */ + IF_AFDATA_UNLOCK(ifp); m_freem(m); } #endif ==== //depot/projects/arp-v2/src/sys/netinet/ip_output.c#7 (text+ko) ==== @@ -560,10 +560,10 @@ */ m->m_flags &= ~(M_PROTOFLAGS); - IF_LLTBLS_LOCK(ifp); + IF_AFDATA_LOCK(ifp); error = (*ifp->if_output)(ifp, m, (struct sockaddr *)dst, ro->ro_rt); - IF_LLTBLS_UNLOCK(ifp); + IF_AFDATA_UNLOCK(ifp); goto done; } @@ -596,10 +596,10 @@ */ m->m_flags &= ~(M_PROTOFLAGS); - IF_LLTBLS_LOCK(ifp); + IF_AFDATA_LOCK(ifp); error = (*ifp->if_output)(ifp, m, (struct sockaddr *)dst, ro->ro_rt); - IF_LLTBLS_UNLOCK(ifp); + IF_AFDATA_UNLOCK(ifp); } else m_freem(m); } From owner-p4-projects@FreeBSD.ORG Mon Nov 24 06:19:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0B1871065673; Mon, 24 Nov 2008 06:19:22 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C33E5106564A for ; Mon, 24 Nov 2008 06:19:21 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id AC1BD8FC0C for ; Mon, 24 Nov 2008 06:19:21 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAO6JLfS012529 for ; Mon, 24 Nov 2008 06:19:21 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAO6JLSj012527 for perforce@freebsd.org; Mon, 24 Nov 2008 06:19:21 GMT (envelope-from pgj@FreeBSD.org) Date: Mon, 24 Nov 2008 06:19:21 GMT Message-Id: <200811240619.mAO6JLSj012527@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 153422 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, 24 Nov 2008 06:19:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=153422 Change 153422 by pgj@kolbasz on 2008/11/24 06:18:21 IFC Affected files ... .. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#18 integrate .. //depot/projects/docproj_hu/doc/share/misc/docbook.css#3 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#13 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#13 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/pho.key#1 branch .. //depot/projects/docproj_hu/doc/share/sgml/freebsd.ent#5 integrate .. //depot/projects/docproj_hu/doc/share/sgml/man-refs.ent#10 integrate .. //depot/projects/docproj_hu/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#7 integrate .. //depot/projects/docproj_hu/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#9 integrate .. //depot/projects/docproj_hu/src_7/release/doc/en_US.ISO8859-1/hardware/article.sgml#3 integrate .. //depot/projects/docproj_hu/src_7/release/doc/en_US.ISO8859-1/relnotes/article.sgml#5 integrate .. //depot/projects/docproj_hu/www/en/donations/wantlist.sgml#7 integrate .. //depot/projects/docproj_hu/www/share/sgml/events.xml#8 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#28 integrate Differences ... ==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#18 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.465 2008/11/04 20:03:28 rene Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.466 2008/11/20 11:15:54 koitsu Exp $ --> aaron@FreeBSD.org"> @@ -578,8 +578,6 @@ knu@FreeBSD.org"> -koitsu@FreeBSD.org"> - krion@FreeBSD.org"> kris@FreeBSD.org"> ==== //depot/projects/docproj_hu/doc/share/misc/docbook.css#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: doc/share/misc/docbook.css,v 1.13 2008/11/09 04:24:47 chinsan Exp $ + * $FreeBSD: doc/share/misc/docbook.css,v 1.14 2008/11/21 07:28:34 keramida Exp $ */ BODY ADDRESS { @@ -149,61 +149,55 @@ text-decoration: underline; } -.PROGRAMLISTING, .SCREEN { - background-color: #DEE3E7; - padding: 4px; +.SCREEN { + padding: 1ex; +} + +.PROGRAMLISTING { + padding: 1ex; + background-color: #eee; + border: 1px solid #ccc; } @media screen { /* hide from IE3 */ a[href]:hover { background: #ffa } } - -BLOCKQUOTE.NOTE{ - color: #173B7F; - background: #d5e3ff; - border: 2px solid #7387b0; - padding-top: 1px; - padding-left: 5px; - padding-right: 5px; - padding-bottom: 2px; - width: 800px; +BLOCKQUOTE.NOTE { + color: #222; + background: #eee; + border: 1px solid #ccc; + padding: 0.4em 0.4em; + width: 85%; } -BLOCKQUOTE.TIP{ +BLOCKQUOTE.TIP { color: #004F00; - background: #c8dcc6; - border: 2px solid green; - padding: 3px; - width: 800px; - align: middle; + background: #d8ecd6; + border: 1px solid green; + padding: 0.2em 2em; + width: 85%; } -BLOCKQUOTE.IMPORTANT{ - color:red; - font-family: arial; +BLOCKQUOTE.IMPORTANT { font-style:italic; - font-weight:bold; - line-height: 21px; + border: 1px solid #a00; + border-left: 12px solid #c00; + padding: 0.1em 1em; } -BLOCKQUOTE.WARNING{ +BLOCKQUOTE.WARNING { color: #9F1313; - background: #f8e4e4; - border: 2px solid #e59595; - padding-top: 1px; - padding-left: 5px; - padding-right: 5px; - padding-bottom: 2px; - width: 800px; + background: #f8e8e8; + border: 1px solid #e59595; + padding: 0.2em 2em; + width: 85%; } -.EXAMPLE{ +.EXAMPLE { background: #fefde6; - border: 2px solid #f1bb16; - padding-top: 1px; - padding-left: 5px; - padding-right: 5px; - padding-bottom: 2px; - width: 800px; + border: 1px solid #f1bb16; + margin: 1em 0; + padding: 0.2em 2em; + width: 90%; } ==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys-developers.sgml#13 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -174,10 +174,12 @@ &pgpkey.gahr; + &a.perky; @@ -454,6 +456,11 @@ &pgpkey.mux; + + &a.pho; + &pgpkey.pho; + + &a.mich; &pgpkey.mich; ==== //depot/projects/docproj_hu/doc/share/pgpkeys/pgpkeys.ent#13 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -222,6 +222,7 @@ + ==== //depot/projects/docproj_hu/doc/share/sgml/freebsd.ent#5 (text+ko) ==== @@ -1,7 +1,7 @@ + + + ==== //depot/projects/docproj_hu/doc/share/sgml/man-refs.ent#10 (text+ko) ==== @@ -20,7 +20,7 @@ lexicographical order by the entity (i.e., the dots used in place of special characters should not be expanded when comparing). - $FreeBSD: doc/share/sgml/man-refs.ent,v 1.472 2008/10/06 21:49:01 simon Exp $ + $FreeBSD: doc/share/sgml/man-refs.ent,v 1.473 2008/11/24 01:25:26 delphij Exp $ --> @@ -3257,6 +3257,7 @@ + ==== //depot/projects/docproj_hu/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#7 (text+ko) ==== @@ -17,7 +17,7 @@ The &os; Documentation Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.341 2008/10/23 10:38:04 marck Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.342 2008/11/24 01:26:22 delphij Exp $ 2000 @@ -664,6 +664,8 @@ &hwlist.age; + &hwlist.ale; + &hwlist.aue; &hwlist.axe; ==== //depot/projects/docproj_hu/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#9 (text+ko) ==== @@ -17,7 +17,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1095 2008/10/15 12:02:32 edwin Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1098 2008/11/24 01:26:22 delphij Exp $ 2000 @@ -167,7 +167,7 @@ Kernel support for M:N threading has been removed. While the KSE (Kernel Scheduled Entities) project was quite successful in bringing threading to FreeBSD, the M:N approach taken by the - kse library was never developed to its full potential. + KSE library was never developed to its full potential. Backwards compatibility for applications using KSE threading will be provided via &man.libmap.conf.5; for dynamically linked binaries. The &os; Project greatly appreciates the work of @@ -225,10 +225,13 @@ Network Interface Support + The &man.ale.4; driver has been added to provide support + for Atheros AR8121/AR8113/AR8114 Gigabit/Fast Ethernet controllers. + The &man.em.4; driver has been split into two drivers with some common parts. The &man.em.4; driver will continue to support adapters up to the 82575, as well as new - client/desktop adapters. A new igb driver + client/desktop adapters. A new &man.igb.4; driver will support new server adapters. The &man.jme.4; driver has been added to provide support ==== //depot/projects/docproj_hu/src_7/release/doc/en_US.ISO8859-1/hardware/article.sgml#3 (text+ko) ==== @@ -18,7 +18,7 @@ The &os; Documentation Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.326.2.3 2008/10/26 22:56:17 marck Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.326.2.4 2008/11/20 00:43:41 delphij Exp $ 2000 @@ -29,6 +29,7 @@ 2005 2006 2007 + 2008 The &os; Documentation Project @@ -657,6 +658,8 @@ &hwlist.ie; + &hwlist.igb; + &hwlist.ixgb; &hwlist.kue; ==== //depot/projects/docproj_hu/src_7/release/doc/en_US.ISO8859-1/relnotes/article.sgml#5 (text+ko) ==== @@ -17,7 +17,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1068.2.28 2008/10/08 16:44:35 hrs Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1068.2.29 2008/11/20 00:43:41 delphij Exp $ 2000 @@ -198,6 +198,12 @@ Network Interface Support + The &man.em.4; driver has been split into two drivers + with some common parts. The &man.em.4; driver will continue + to support adapters up to the 82575, as well as new + client/desktop adapters. A new &man.igb.4; driver + will support new server adapters. + [&arch.amd64;, &arch.i386;] The &man.wpi.4; driver has been updated to include a number of stability fixes. ==== //depot/projects/docproj_hu/www/en/donations/wantlist.sgml#7 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -51,14 +51,6 @@ - brueffer - Germany - IBM 14.1" SGXA+ notebook display - Replacement for the faulty display on my notebook - (IBM Thinkpad T41p). - - - cognet France A Zaurus, with hard disk preferably. ==== //depot/projects/docproj_hu/www/share/sgml/events.xml#8 (text+ko) ==== @@ -10,7 +10,7 @@ - $FreeBSD: www/share/sgml/events.xml,v 1.58 2008/10/21 12:41:23 rwatson Exp $ + $FreeBSD: www/share/sgml/events.xml,v 1.59 2008/11/19 07:09:05 murray Exp $ @@ -38,6 +38,56 @@ track, tutorials, and FreeBSD developer summit. + + BSDCan 2009 + http://www.bsdcan.org/2009/ + + 2009 + 5 + 14 + + + 2009 + 5 + 15 + + + Canada + Ottawa + University of Ottawa + + BSDCan is a developers conference with a strong focus + on emerging technologies, research projects, and works in + progress. It also features Userland infrastructure projects and + invites contributions from both free software developers and those + from commercial vendors. + + + + DCBSDCon 2009 + http://www.dcbsdcon.org/ + + 2009 + 2 + 4 + + + 2009 + 2 + 5 + + + USA + Washington, D.C. + Marriott Wardman + + + The first large BSD Conference in the DC area. Will + include 45 minute presentations on BSD related topics and + security themes. + + + MeetBSD California 2008 http://meetbsd.com/ ==== //depot/projects/docproj_hu/www/share/sgml/news.xml#28 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.209 2008/11/16 17:15:46 danger Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.210 2008/11/18 16:51:58 pho Exp $ @@ -36,6 +36,15 @@ 11 + 18 + + +

Commit bit restored: Peter + Holm (src)

+ + + + 16 From owner-p4-projects@FreeBSD.ORG Mon Nov 24 14:11:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6CADF1065677; Mon, 24 Nov 2008 14:11:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 319EE1065675 for ; Mon, 24 Nov 2008 14:11:26 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 22F8E8FC08 for ; Mon, 24 Nov 2008 14:11:26 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAOEBPbM090959 for ; Mon, 24 Nov 2008 14:11:25 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAOEBPGN090957 for perforce@freebsd.org; Mon, 24 Nov 2008 14:11:25 GMT (envelope-from trasz@freebsd.org) Date: Mon, 24 Nov 2008 14:11:25 GMT Message-Id: <200811241411.mAOEBPGN090957@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 153434 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, 24 Nov 2008 14:11:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=153434 Change 153434 by trasz@trasz_victim7 on 2008/11/24 14:10:35 Style fixes. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#27 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/sys/acl.h#27 (text+ko) ==== @@ -137,14 +137,14 @@ }; typedef struct acl_t_struct *acl_t; -#define ACL_MAGIC 0x5452535a +#define ACL_MAGIC 0x5452535a /* * Possible valid values for ats_brand field. */ -#define ACL_BRAND_UNKNOWN 0 -#define ACL_BRAND_POSIX 1 -#define ACL_BRAND_NFS4 2 +#define ACL_BRAND_UNKNOWN 0 +#define ACL_BRAND_POSIX 1 +#define ACL_BRAND_NFS4 2 /* * Possible valid values for ae_tag field. For explanation, see acl(9). @@ -157,15 +157,15 @@ #define ACL_MASK 0x00000010 #define ACL_OTHER 0x00000020 #define ACL_OTHER_OBJ ACL_OTHER -#define ACL_EVERYONE 0x00000040 +#define ACL_EVERYONE 0x00000040 /* * Possible valid values for ae_extended field. */ -#define ACL_EXTENDED_ALLOW 0x00000100 -#define ACL_EXTENDED_DENY 0x00000200 -#define ACL_EXTENDED_AUDIT 0x00000400 -#define ACL_EXTENDED_ALARM 0x00000800 +#define ACL_EXTENDED_ALLOW 0x00000100 +#define ACL_EXTENDED_DENY 0x00000200 +#define ACL_EXTENDED_AUDIT 0x00000400 +#define ACL_EXTENDED_ALARM 0x00000800 /* * Possible valid values for acl_type_t arguments. First two @@ -191,33 +191,33 @@ * Possible flags in ae_perm field for NFSv4 ACLs. * XXX: Change values of these to match rfc3530. */ -#define ACL_READ_DATA 0x00010000 -#define ACL_LIST_DIRECTORY 0x00010000 -#define ACL_WRITE_DATA 0x00020000 -#define ACL_ADD_FILE 0x00020000 -#define ACL_APPEND_DATA 0x00040000 -#define ACL_ADD_SUBDIRECTORY 0x00040000 -#define ACL_READ_NAMED_ATTRS 0x00080000 -#define ACL_READ_EXTATTRIBUTES ACL_READ_NAMED_ATTRS /* Darwin compatibility. */ -#define ACL_WRITE_NAMED_ATTRS 0x00100000 -#define ACL_WRITE_EXTATTRIBUTES ACL_WRITE_NAMED_ATTRS /* Darwin compatibility. */ +#define ACL_READ_DATA 0x00010000 +#define ACL_LIST_DIRECTORY 0x00010000 +#define ACL_WRITE_DATA 0x00020000 +#define ACL_ADD_FILE 0x00020000 +#define ACL_APPEND_DATA 0x00040000 +#define ACL_ADD_SUBDIRECTORY 0x00040000 +#define ACL_READ_NAMED_ATTRS 0x00080000 +#define ACL_READ_EXTATTRIBUTES ACL_READ_NAMED_ATTRS /* Darwin compatibility. */ +#define ACL_WRITE_NAMED_ATTRS 0x00100000 +#define ACL_WRITE_EXTATTRIBUTES ACL_WRITE_NAMED_ATTRS /* Darwin compatibility. */ #ifdef XXX_conflicting_defines -#define ACL_EXECUTE 0x00200000 +#define ACL_EXECUTE 0x00200000 #endif -#define ACL_SEARCH ACL_EXECUTE /* Darwin compatibility. */ -#define ACL_DELETE_CHILD 0x00400000 -#define ACL_READ_ATTRIBUTES 0x00800000 -#define ACL_WRITE_ATTRIBUTES 0x01000000 -#define ACL_DELETE 0x02000000 -#define ACL_READ_ACL 0x04000000 -#define ACL_READ_SECURITY ACL_READ_ACL /* Darwin compatibility. */ -#define ACL_WRITE_ACL 0x08000000 -#define ACL_WRITE_SECURITY ACL_WRITE_ACL /* Darwin compatibility. */ -#define ACL_WRITE_OWNER 0x10000000 -#define ACL_CHANGE_OWNER ACL_WRITE_OWNER /* Darwin compatibility. */ -#define ACL_SYNCHRONIZE 0x20000000 +#define ACL_SEARCH ACL_EXECUTE /* Darwin compatibility. */ +#define ACL_DELETE_CHILD 0x00400000 +#define ACL_READ_ATTRIBUTES 0x00800000 +#define ACL_WRITE_ATTRIBUTES 0x01000000 +#define ACL_DELETE 0x02000000 +#define ACL_READ_ACL 0x04000000 +#define ACL_READ_SECURITY ACL_READ_ACL /* Darwin compatibility. */ +#define ACL_WRITE_ACL 0x08000000 +#define ACL_WRITE_SECURITY ACL_WRITE_ACL /* Darwin compatibility. */ +#define ACL_WRITE_OWNER 0x10000000 +#define ACL_CHANGE_OWNER ACL_WRITE_OWNER /* Darwin compatibility. */ +#define ACL_SYNCHRONIZE 0x20000000 -#define ACL_NFS4_PERM_BITS (ACL_READ_DATA | ACL_WRITE_DATA | ACL_APPEND_DATA | \ +#define ACL_NFS4_PERM_BITS (ACL_READ_DATA | ACL_WRITE_DATA | ACL_APPEND_DATA | \ ACL_READ_NAMED_ATTRS | ACL_WRITE_NAMED_ATTRS | ACL_EXECUTE | ACL_DELETE_CHILD | \ ACL_READ_ATTRIBUTES | ACL_WRITE_ATTRIBUTES | ACL_DELETE | ACL_READ_ACL | \ ACL_WRITE_ACL | ACL_WRITE_OWNER | ACL_SYNCHRONIZE) @@ -237,15 +237,15 @@ * * #define ACL_FLAG_DEFER_INHERIT */ -#define ACL_ENTRY_FILE_INHERIT 0x00000001 -#define ACL_ENTRY_DIRECTORY_INHERIT 0x00000002 -#define ACL_ENTRY_LIMIT_INHERIT 0x00000004 /* "NO_PROPAGATE_INHERIT" */ -#define ACL_ENTRY_ONLY_INHERIT 0x00000008 /* "INHERIT_ONLY" */ -#define ACL_ENTRY_SUCCESSFUL_ACCESS 0x00000010 -#define ACL_ENTRY_FAILED_ACCESS 0x00000020 -#define ACL_ENTRY_INHERITED 0x00000080 /* Currently unused. */ +#define ACL_ENTRY_FILE_INHERIT 0x00000001 +#define ACL_ENTRY_DIRECTORY_INHERIT 0x00000002 +#define ACL_ENTRY_LIMIT_INHERIT 0x00000004 /* "NO_PROPAGATE_INHERIT" */ +#define ACL_ENTRY_ONLY_INHERIT 0x00000008 /* "INHERIT_ONLY" */ +#define ACL_ENTRY_SUCCESSFUL_ACCESS 0x00000010 +#define ACL_ENTRY_FAILED_ACCESS 0x00000020 +#define ACL_ENTRY_INHERITED 0x00000080 /* Currently unused. */ -#define ACL_FLAGS_BITS (ACL_ENTRY_FILE_INHERIT | ACL_ENTRY_DIRECTORY_INHERIT | \ +#define ACL_FLAGS_BITS (ACL_ENTRY_FILE_INHERIT | ACL_ENTRY_DIRECTORY_INHERIT | \ ACL_ENTRY_LIMIT_INHERIT | ACL_ENTRY_ONLY_INHERIT | ACL_ENTRY_SUCCESSFUL_ACCESS | \ ACL_ENTRY_FAILED_ACCESS) @@ -258,9 +258,9 @@ /* * Possible values for _flags parameter in acl_to_text_np(3). */ -#define ACL_TEXT_VERBOSE 0x01 -#define ACL_TEXT_NUMERIC_IDS 0x02 -#define ACL_TEXT_APPEND_ID 0x04 +#define ACL_TEXT_VERBOSE 0x01 +#define ACL_TEXT_NUMERIC_IDS 0x02 +#define ACL_TEXT_APPEND_ID 0x04 /* * POSIX.1e ACLs are capable of expressing the read, write, and execute bits From owner-p4-projects@FreeBSD.ORG Mon Nov 24 17:33:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4AD0A1065674; Mon, 24 Nov 2008 17:33:53 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0D8A51065672 for ; Mon, 24 Nov 2008 17:33:53 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F20D38FC08 for ; Mon, 24 Nov 2008 17:33:52 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAOHXq7F043820 for ; Mon, 24 Nov 2008 17:33:52 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAOHXqP1043818 for perforce@freebsd.org; Mon, 24 Nov 2008 17:33:52 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 24 Nov 2008 17:33:52 GMT Message-Id: <200811241733.mAOHXqP1043818@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 153443 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, 24 Nov 2008 17:33:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=153443 Change 153443 by rene@rene_self on 2008/11/24 17:33:02 IFC (resolve some local conflicts) Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#6 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#13 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.develalumni.sgml#4 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.sgml#2 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml#4 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#8 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#4 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#4 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/dtrace/chapter.sgml#5 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#6 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/preface/preface.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/updating/chapter.sgml#3 integrate .. //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#12 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/Makefile#12 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#18 integrate .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/config/chapter.sgml#10 integrate .. //depot/projects/docproj_nl/share/misc/docbook.css#3 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys-developers.sgml#10 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#10 integrate .. //depot/projects/docproj_nl/share/pgpkeys/pho.key#1 branch .. //depot/projects/docproj_nl/share/sgml/freebsd.ent#5 integrate .. //depot/projects/docproj_nl/share/sgml/man-refs.ent#8 integrate .. //depot/projects/docproj_nl/www/en/docproj/translations.sgml#3 integrate .. //depot/projects/docproj_nl/www/en/donations/wantlist.sgml#6 integrate .. //depot/projects/docproj_nl/www/share/sgml/events.xml#7 integrate .. //depot/projects/docproj_nl/www/share/sgml/navibar.ent#2 integrate .. //depot/projects/docproj_nl/www/share/sgml/news.xml#18 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/committers-guide/article.sgml#6 (text+ko) ==== @@ -13,7 +13,7 @@ - $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.278 2008/08/16 21:42:35 pgj Exp $ + $FreeBSD: doc/en_US.ISO8859-1/articles/committers-guide/article.sgml,v 1.279 2008/11/22 13:02:43 pgj Exp $ 1999 @@ -2020,7 +2020,8 @@ someone who manages an overall category of FreeBSD evolution, such as internationalization or networking. See + url="&url.base;/administration.html"> + http://www.FreeBSD.org/administration.html for more information on this. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#13 (text+ko) ==== @@ -1,4 +1,4 @@ - + + + &a.koitsu; (2006 - 2008) + + + &a.trevor; (2000 - 2007) @@ -347,9 +351,11 @@ &a.mtaylor; (1999 - 2003) + &a.dufault; (1995 - 2003) ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/introduction/chapter.sgml#2 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -92,7 +92,7 @@ /usr/src The complete source code to FreeBSD is available from our - public CVS repository. The source code is normally installed in + public repository. The source code is normally installed in /usr/src which contains the following subdirectories: @@ -114,6 +114,12 @@ + cddl/ + Utilities covered by the Common Development and + Distribution License + + + contrib/ Source for files from contributed software. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/developers-handbook/policies/chapter.sgml#4 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -544,7 +544,7 @@ Any encumbered file requires specific approval from the Core Team before it is added to the - CVS repository. + repository. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#8 (text+ko) ==== @@ -1,7 +1,7 @@ ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/basics/chapter.sgml#4 (text+ko) ==== @@ -1,7 +1,7 @@ ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/desktop/chapter.sgml#4 (text+ko) ==== @@ -1,6 +1,6 @@ @@ -1106,6 +1106,13 @@ abacus deskutils/abacus + + + KMyMoney + kmymoney2 + finance/kmymoney2 + + ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/dtrace/chapter.sgml#5 (text+ko) ==== @@ -8,7 +8,7 @@ @@ -22,44 +22,44 @@ - DTrace + &dtrace; Synopsis - DTrace + &dtrace; - DTrace support - DTrace + &dtrace; support + &dtrace; - DTrace, also known as Dynamic Tracing, was developed by + &dtrace;, also known as Dynamic Tracing, was developed by &sun; as a tool for locating performance bottlenecks in production and pre-production systems. It is not, in any way, a debugging tool, but a tool for real time system analysis to locate performance and other issues. - DTrace is a remarkable profiling tool, with an impressive + &dtrace; is a remarkable profiling tool, with an impressive array of features for diagnosing system issues. It may also be used to run pre-written scripts to take advantage of its capabilities. Users may even author their own utilities using - the DTrace D Language, allowing them to customize their profiling + the &dtrace; D Language, allowing them to customize their profiling based on specific needs. After reading this chapter, you will know: - What DTrace is and what features it provides. + What &dtrace; is and what features it provides. - Differences between the &solaris; DTrace implementation + Differences between the &solaris; &dtrace; implementation and the one provided by &os;. - How to enable and use DTrace on &os;. + How to enable and use &dtrace; on &os;. @@ -104,11 +104,11 @@ Implementation Differences - While the DTrace in &os; is very similar to that found + While the &dtrace; in &os; is very similar to that found in &solaris;, differences exist that should be explained before continuing. The primary difference users will notice is that - on &os;, DTrace needs to be specifically enabled. There are - kernel options and modules which must be enabled for DTrace to + on &os;, &dtrace; needs to be specifically enabled. There are + kernel options and modules which must be enabled for &dtrace; to work properly. These will be explained later. There is a DDB_CTF kernel option which @@ -132,29 +132,29 @@ allows tracing malloc() by type in the &os; kernel. - Only root may use DTrace on &os;. + Only root may use &dtrace; on &os;. This is related to security differences, &solaris; has a few low level security checks which do not yet exist in &os;. As such, the /dev/dtrace/dtrace is strictly limited to root users only. - Finally, the DTrace software falls under &sun;'s + Finally, the &dtrace; software falls under &sun;'s CDDL license. The Common Development and Distribution License comes with &os;, see the /usr/src/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE or view it online at . - This license means that a &os; kernel with the DTrace options + This license means that a &os; kernel with the &dtrace; options is still BSD licensed; however the CDDL kicks in when the modules are distributed in binary form, or the binaries are loaded. - Enabling DTrace Support + Enabling &dtrace; Support - To enable support for DTrace, add the following lines to + To enable support for &dtrace;, add the following lines to the kernel configuration file: options KDTRACE_HOOKS @@ -167,7 +167,7 @@ options KDTRACE_FRAME This option provides support for the FBT - feature. DTrace will work without this option; however, there + feature. &dtrace; will work without this option; however, there will be limited support for function boundary tracing. @@ -190,14 +190,14 @@ After rebooting and allowing the new kernel to be loaded into memory, support for the Korn shell should be added. This - is needed as the DTrace toolkit has several utilities written + is needed as the &dtrace; toolkit has several utilities written in ksh. Install the shells/ksh93. It is also possible to run these tools under shells/pdksh or shells/mksh. - Finally, obtain the current DTrace toolkit. The current + Finally, obtain the current &dtrace; toolkit. The current version is available at . There is an install mechanism included; however, installation @@ -205,26 +205,26 @@ - Using DTrace + Using &dtrace; - Before making use of DTrace functionality, the DTrace device + Before making use of &dtrace; functionality, the &dtrace; device must exist. To load the device, issue the following command: &prompt.root; kldload dtraceall - DTrace support should now be available. To view all probes + &dtrace; support should now be available. To view all probes the administrator may now execute the following command: &prompt.root; dtrace -l | more All output is passed to the more utility as it will quickly overflow the screen buffer. At - this point, DTrace should be considered working. It is now + this point, &dtrace; should be considered working. It is now time to review the toolkit. The toolkit is a collection of ready-made scripts to run - with DTrace to collect system information. There are scripts + with &dtrace; to collect system information. There are scripts to check open files, memory, CPU usage and a lot more. Extract the scripts with the following command: @@ -247,14 +247,14 @@ At this point it is prudent to remind the reader that - DTrace support in &os; is incomplete + &dtrace; support in &os; is incomplete and experimental. Many of these scripts will not work as they are either too &solaris;-specific or use probes which are unsupported at this time. At the time of this writing only two of the scripts of the - DTrace Toolkit are fully supported in &os;: + &dtrace; Toolkit are fully supported in &os;: the hotkernel and procsystime scripts. These are the two we will explore in the following parts of this section. @@ -371,8 +371,8 @@ The D Language - The DTrace Toolkit includes many scripts in the special language of - DTrace. This language is called the D language by &sun; + The &dtrace; Toolkit includes many scripts in the special language of + &dtrace;. This language is called the D language by &sun; documentation, and it is very similar to C++. An in depth discussion of the language is beyond the scope of this document. It is extensively discussed ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/mac/chapter.sgml#6 (text+ko) ==== @@ -1,6 +1,6 @@ @@ -2029,8 +2029,7 @@ When I attempt to switch from the root user to another user in the system, the error message - _secure_path: unable to state .login_conf - appears. + _secure_path: unable to state .login_conf appears. This message is usually shown when the user has a higher label setting then that of the user whom they are attempting to ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/preface/preface.sgml#3 (text+ko) ==== @@ -1,5 +1,5 @@ @@ -428,9 +428,9 @@ - , Dtrace + , &dtrace; - Describes how to configure and use the DTrace tool from &sun; + Describes how to configure and use the &dtrace; tool from &sun; in &os;. Dynamic tracing can help locate performance issues, by performing real time system analysis. ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/updating/chapter.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ ==== //depot/projects/docproj_nl/en_US.ISO8859-1/share/sgml/authors.ent#12 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.465 2008/11/04 20:03:28 rene Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.467 2008/11/24 06:38:24 pgj Exp $ --> aaron@FreeBSD.org"> ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/Makefile#12 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/Makefile,v 1.13 2008/11/10 20:34:00 rene Exp $ +# $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/Makefile,v 1.14 2008/11/16 20:50:17 rene Exp $ # $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/Makefile,v 1.19 2006/01/03 21:17:07 siebrand Exp $ # # %SOURCE% en_US.ISO8859-1/books/handbook/Makefile ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#18 (text+ko) ==== @@ -1,7 +1,7 @@ @@ -174,10 +174,12 @@ &pgpkey.gahr; + &a.perky; @@ -454,6 +456,11 @@ &pgpkey.mux; + + &a.pho; + &pgpkey.pho; + + &a.mich; &pgpkey.mich; ==== //depot/projects/docproj_nl/share/pgpkeys/pgpkeys.ent#10 (text+ko) ==== @@ -1,5 +1,5 @@ - + @@ -222,6 +222,7 @@ + ==== //depot/projects/docproj_nl/share/sgml/freebsd.ent#5 (text+ko) ==== @@ -1,7 +1,7 @@ + + + ==== //depot/projects/docproj_nl/share/sgml/man-refs.ent#8 (text+ko) ==== @@ -20,7 +20,7 @@ lexicographical order by the entity (i.e., the dots used in place of special characters should not be expanded when comparing). - $FreeBSD: doc/share/sgml/man-refs.ent,v 1.472 2008/10/06 21:49:01 simon Exp $ + $FreeBSD: doc/share/sgml/man-refs.ent,v 1.473 2008/11/24 01:25:26 delphij Exp $ --> @@ -3257,6 +3257,7 @@ + ==== //depot/projects/docproj_nl/www/en/docproj/translations.sgml#3 (text+ko) ==== @@ -1,6 +1,6 @@ - + ]> @@ -209,15 +209,15 @@
Documents available
+ Web, FAQ, FDP Primer, + Handbook, porters-handbook, some articles.
Documents currently being worked on
- Handbook, - Web, developers-handbook, arch-handbook.
==== //depot/projects/docproj_nl/www/en/donations/wantlist.sgml#6 (text+ko) ==== @@ -1,6 +1,6 @@ - + @@ -51,14 +51,6 @@ - brueffer - Germany - IBM 14.1" SGXA+ notebook display - Replacement for the faulty display on my notebook - (IBM Thinkpad T41p). - - - cognet France A Zaurus, with hard disk preferably. ==== //depot/projects/docproj_nl/www/share/sgml/events.xml#7 (text+ko) ==== @@ -10,7 +10,7 @@ - $FreeBSD: www/share/sgml/events.xml,v 1.58 2008/10/21 12:41:23 rwatson Exp $ + $FreeBSD: www/share/sgml/events.xml,v 1.60 2008/11/24 11:19:12 remko Exp $ @@ -33,11 +33,87 @@ Universe of Cambridge - The ninth annual European BSD Confernece will take place + The ninth annual European BSD Conference will take place in Cambridge, England in September, 2009, and include a technical track, tutorials, and FreeBSD developer summit. + + BSDCan 2009 + http://www.bsdcan.org/2009/ + + 2009 + 5 + 14 + + + 2009 + 5 + 15 + + + Canada + Ottawa + University of Ottawa + + BSDCan is a developers conference with a strong focus + on emerging technologies, research projects, and works in + progress. It also features Userland infrastructure projects and + invites contributions from both free software developers and those + from commercial vendors. + + + + DCBSDCon 2009 + http://www.dcbsdcon.org/ + + 2009 + 2 + 4 + + + 2009 + 2 + 5 + + + USA + Washington, D.C. + Marriott Wardman + + + The first large BSD Conference in the DC area. Will + include 45 minute presentations on BSD related topics and + security themes. + + + + NLLG-bijeenkomst december 2008 + http://www.nllgg.nl/bijeenkomst_20081213 + + 2008 + 12 + 13 + + + 2008 + 12 + 13 + + + the Netherlands + Utrecht + Utrecht + Liefland college + + + The "Nederlandse Linux Gebruikers Groep" (NLLGG) + organisation is arranging a national community day in Utrecht + focussing on BSD. Robert Watson, Hans vd Looy, Marten Vijn, + Wim Vandeputte and Remko Lodder will do presentations for the + Linux community. + + MeetBSD California 2008 http://meetbsd.com/ ==== //depot/projects/docproj_nl/www/share/sgml/navibar.ent#2 (text+ko) ==== @@ -1,4 +1,4 @@ - + News
  • Events
  • Press
    • +
  • Multimedia
  • Artwork
  • Logo
  • Donations
    • @@ -34,6 +35,7 @@
    • Community
    • Mailing Lists
      • +
    • Forums
    • IRC
    • Newsgroups
    • User Groups
      • ==== //depot/projects/docproj_nl/www/share/sgml/news.xml#18 (text+ko) ==== @@ -25,7 +25,7 @@ - $FreeBSD: www/share/sgml/news.xml,v 1.207 2008/11/11 03:52:54 brd Exp $ + $FreeBSD: www/share/sgml/news.xml,v 1.210 2008/11/18 16:51:58 pho Exp $ @@ -36,6 +36,32 @@ 11 + 18 + + +

      Commit bit restored: Peter + Holm (src)

      +       +       + + + 16 + + + Official FreeBSD Forums Launched + +

      The FreeBSD project is finally, after much work, pleased to + announce the availability of an official FreeBSD web based + discussion forum. It is our hope that this forum will serve + as a public support channel for FreeBSD users around the world + and as a complement to our fine mailing lists.

      + +

      You can register and start using our new service here: http://forums.FreeBSD.org.

      +       +       + + 10 From owner-p4-projects@FreeBSD.ORG Mon Nov 24 17:40:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D9EE91065791; Mon, 24 Nov 2008 17:40:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 94C32106575A for ; Mon, 24 Nov 2008 17:40:04 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2C6818FC08 for ; Mon, 24 Nov 2008 17:40:04 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAOHe4uw044434 for ; Mon, 24 Nov 2008 17:40:04 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAOHe48n044432 for perforce@freebsd.org; Mon, 24 Nov 2008 17:40:04 GMT (envelope-from sam@freebsd.org) Date: Mon, 24 Nov 2008 17:40:04 GMT Message-Id: <200811241740.mAOHe48n044432@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 153446 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, 24 Nov 2008 17:40:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=153446 Change 153446 by sam@sam_ebb on 2008/11/24 17:39:19 make things build Affected files ... .. //depot/projects/arp-v2/src/sys/netinet/in_proto.c#4 edit Differences ... ==== //depot/projects/arp-v2/src/sys/netinet/in_proto.c#4 (text+ko) ==== @@ -58,6 +58,7 @@ #include #include +#include #include #include #include From owner-p4-projects@FreeBSD.ORG Mon Nov 24 17:40:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 51A321065834; Mon, 24 Nov 2008 17:40:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A39F61065762 for ; Mon, 24 Nov 2008 17:40:10 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5665F8FC14 for ; Mon, 24 Nov 2008 17:40:04 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAOHe49i044439 for ; Mon, 24 Nov 2008 17:40:04 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAOHe4X5044437 for perforce@freebsd.org; Mon, 24 Nov 2008 17:40:04 GMT (envelope-from sam@freebsd.org) Date: Mon, 24 Nov 2008 17:40:04 GMT Message-Id: <200811241740.mAOHe4X5044437@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 153447 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, 24 Nov 2008 17:40:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=153447 Change 153447 by sam@sam_ebb on 2008/11/24 17:39:57 o move check to where it's needed o style Affected files ... .. //depot/projects/arp-v2/src/sys/netinet/if_ether.c#17 edit Differences ... ==== //depot/projects/arp-v2/src/sys/netinet/if_ether.c#17 (text+ko) ==== @@ -198,10 +198,10 @@ SIN(ifa->ifa_netmask)->sin_addr.s_addr) ) break; /* found it. */ } - } - if (sip == NULL) { - printf(" cannot find matching address, no arprequest\n"); - return; + if (sip == NULL) { + printf("%s: cannot find matching address\n", __func__); + return; + } } if ((m = m_gethdr(M_DONTWAIT, MT_DATA)) == NULL) @@ -226,8 +226,6 @@ sa.sa_len = 2; m->m_flags |= M_BCAST; (*ifp->if_output)(ifp, m, &sa, (struct rtentry *)0); - - return; } /* @@ -255,7 +253,7 @@ *lle = NULL; - if (m) { + if (m != NULL) { if (m->m_flags & M_BCAST) { /* broadcast */ (void)memcpy(desten, From owner-p4-projects@FreeBSD.ORG Mon Nov 24 17:42:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0E5EB106567B; Mon, 24 Nov 2008 17:42:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C608A1065679 for ; Mon, 24 Nov 2008 17:42:06 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9EE488FC13 for ; Mon, 24 Nov 2008 17:42:06 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAOHg6YK044609 for ; Mon, 24 Nov 2008 17:42:06 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAOHg6gd044607 for perforce@freebsd.org; Mon, 24 Nov 2008 17:42:06 GMT (envelope-from sam@freebsd.org) Date: Mon, 24 Nov 2008 17:42:06 GMT Message-Id: <200811241742.mAOHg6gd044607@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 153449 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, 24 Nov 2008 17:42:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=153449 Change 153449 by sam@sam_ebb on 2008/11/24 17:41:07 remove null ptr check; it's pointless as there's a deref above it Affected files ... .. //depot/projects/arp-v2/src/sys/netinet/if_ether.c#18 edit Differences ... ==== //depot/projects/arp-v2/src/sys/netinet/if_ether.c#18 (text+ko) ==== @@ -266,8 +266,6 @@ return (0); } } - if (!ifp) - panic("%s: invalid interface pointer", __func__); flags = (ifp->if_flags & (IFF_NOARP | IFF_STATICARP)) ? 0 : LLE_CREATE; From owner-p4-projects@FreeBSD.ORG Mon Nov 24 17:49:18 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 940051065688; Mon, 24 Nov 2008 17:49:18 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 55C911065673 for ; Mon, 24 Nov 2008 17:49:18 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 484738FC1A for ; Mon, 24 Nov 2008 17:49:18 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAOHnIWU045261 for ; Mon, 24 Nov 2008 17:49:18 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAOHnIOC045259 for perforce@freebsd.org; Mon, 24 Nov 2008 17:49:18 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 24 Nov 2008 17:49:18 GMT Message-Id: <200811241749.mAOHnIOC045259@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 153451 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, 24 Nov 2008 17:49:18 -0000 http://perforce.freebsd.org/chv.cgi?CH=153451 Change 153451 by rene@rene_self on 2008/11/24 17:48:21 MFen handbook/desktop 1.78 -> 1.79 Checked build, whitespace Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#8 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml#8 (text+ko) ==== @@ -5,7 +5,7 @@ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/desktop/chapter.sgml,v 1.37 2006/08/25 16:14:06 remko Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/desktop/chapter.sgml - %SRCID% 1.78 + %SRCID% 1.79 --> @@ -1223,6 +1223,14 @@ deskutils/abacus + + + KMyMoney + + kmymoney2 + + finance/kmymoney2 + From owner-p4-projects@FreeBSD.ORG Mon Nov 24 17:55:25 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 005B31065672; Mon, 24 Nov 2008 17:55:25 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B84BB106564A for ; Mon, 24 Nov 2008 17:55:24 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 914FC8FC23 for ; Mon, 24 Nov 2008 17:55:24 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAOHtOnj045804 for ; Mon, 24 Nov 2008 17:55:24 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAOHtOQD045802 for perforce@freebsd.org; Mon, 24 Nov 2008 17:55:24 GMT (envelope-from sam@freebsd.org) Date: Mon, 24 Nov 2008 17:55:24 GMT Message-Id: <200811241755.mAOHtOQD045802@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 153452 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, 24 Nov 2008 17:55:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=153452 Change 153452 by sam@sam_ebb on 2008/11/24 17:55:06 kill whitespace (again) Affected files ... .. //depot/projects/arp-v2/src/sys/net/if_llatbl.h#5 edit Differences ... ==== //depot/projects/arp-v2/src/sys/net/if_llatbl.h#5 (text+ko) ==== @@ -85,7 +85,6 @@ struct ifnet *llt_ifp; }; - /* * flags to be passed to arplookup. */ @@ -108,7 +107,4 @@ struct lltable *lltable_init(struct ifnet *, int); void lltable_free(struct lltable *); void lltable_drain(int); - #endif /* _NET_IF_LLATBL_H_ */ - - From owner-p4-projects@FreeBSD.ORG Mon Nov 24 18:07:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5CAAE1065675; Mon, 24 Nov 2008 18:07:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 20179106564A for ; Mon, 24 Nov 2008 18:07:37 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1269D8FC0A for ; Mon, 24 Nov 2008 18:07:37 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAOI7a4h047644 for ; Mon, 24 Nov 2008 18:07:36 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAOI7aGf047642 for perforce@freebsd.org; Mon, 24 Nov 2008 18:07:36 GMT (envelope-from sam@freebsd.org) Date: Mon, 24 Nov 2008 18:07:36 GMT Message-Id: <200811241807.mAOI7aGf047642@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 153453 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, 24 Nov 2008 18:07:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=153453 Change 153453 by sam@sam_ebb on 2008/11/24 18:06:56 don't pollute if.c with ll table state, add a SYSINIT to setup the zone; might want to think about SI_ORDER_* but this appears to work Affected files ... .. //depot/projects/arp-v2/src/sys/net/if.c#8 edit .. //depot/projects/arp-v2/src/sys/net/if_llatbl.c#7 edit Differences ... ==== //depot/projects/arp-v2/src/sys/net/if.c#8 (text+ko) ==== @@ -136,9 +136,6 @@ extern void nd6_setmtu(struct ifnet *); #endif -extern uma_zone_t llezone; -extern struct mtx lltables_mtx; - int if_index = 0; int ifqmaxlen = IFQ_MAXLEN; struct ifnethead ifnet; /* depend on static init XXX */ @@ -370,11 +367,6 @@ ifdev_setbyindex(0, make_dev(&net_cdevsw, 0, UID_ROOT, GID_WHEEL, 0600, "network")); if_clone_init(); - /* - * create uma zone for L2/L3 cache - */ - llezone = uma_zcreate("llentry", sizeof(struct llentry), NULL, NULL, - NULL, NULL, UMA_ALIGN_PTR, 0); } static void ==== //depot/projects/arp-v2/src/sys/net/if_llatbl.c#7 (text+ko) ==== @@ -52,14 +52,25 @@ #include MALLOC_DEFINE(M_LLTABLE, "lltable", "link level address tables"); -uma_zone_t llezone; -SLIST_HEAD(, lltable) lltables = SLIST_HEAD_INITIALIZER(lltables); +static uma_zone_t llezone; +static SLIST_HEAD(, lltable) lltables = SLIST_HEAD_INITIALIZER(lltables); int sysctl_dumparp(int af, struct sysctl_req *wr); extern void arprequest(struct ifnet *, struct in_addr *, struct in_addr *, u_char *); +/* ARGSUSED*/ +static void +lla_init(void *dummy __unused) +{ + /* + * create uma zone for L2/L3 cache + */ + llezone = uma_zcreate("llentry", sizeof(struct llentry), NULL, NULL, + NULL, NULL, UMA_ALIGN_PTR, 0); +} +SYSINIT(lla, SI_SUB_INIT_IF, SI_ORDER_FIRST, lla_init, NULL); static int dump_llcache(struct lltable *llt, int af, struct sysctl_req *wr) From owner-p4-projects@FreeBSD.ORG Mon Nov 24 18:09:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8BC941065678; Mon, 24 Nov 2008 18:09:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4F40B1065676 for ; Mon, 24 Nov 2008 18:09:39 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 41B8F8FC1B for ; Mon, 24 Nov 2008 18:09:39 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAOI9dHL047791 for ; Mon, 24 Nov 2008 18:09:39 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAOI9dnN047789 for perforce@freebsd.org; Mon, 24 Nov 2008 18:09:39 GMT (envelope-from sam@freebsd.org) Date: Mon, 24 Nov 2008 18:09:39 GMT Message-Id: <200811241809.mAOI9dnN047789@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 153454 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, 24 Nov 2008 18:09:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=153454 Change 153454 by sam@sam_ebb on 2008/11/24 18:09:36 restore INET/INET6 #ifdef's; this is temporary as I've got a better idea how to handle this stuff Affected files ... .. //depot/projects/arp-v2/src/sys/net/if_llatbl.c#8 edit Differences ... ==== //depot/projects/arp-v2/src/sys/net/if_llatbl.c#8 (text+ko) ==== @@ -326,14 +326,16 @@ ifp = llt->llt_ifp; switch (l3addr->sa_family) { +#ifdef INET case AF_INET: hashkey = ((struct sockaddr_in *)l3addr)->sin_addr.s_addr; break; - +#endif +#ifdef INET6 case AF_INET6: hashkey = ((struct sockaddr_in6 *)l3addr)->sin6_addr.s6_addr32[3]; break; - +#endif default: return NULL; } @@ -357,6 +359,7 @@ if (!(flags & LLE_IFADDR)) { rt = rtalloc1(l3addr, 0, 0); if ((rt == NULL) || (rt->rt_flags & RTF_GATEWAY) || (rt->rt_ifp != ifp)) { +#ifdef INET6 if (l3addr->sa_family == AF_INET6) { /* * Creating a ND6 cache for an IPv6 neighbor @@ -370,11 +373,14 @@ goto lla_lookup_1; } } +#endif switch (l3addr->sa_family) { +#ifdef INET case AF_INET: log(LOG_INFO, "IPv4 address: \"%s\" is not on the network\n", \ inet_ntoa(((struct sockaddr_in *)l3addr)->sin_addr)); break; +#endif #ifdef INET6 case AF_INET6: log(LOG_INFO, "IPv6 address: \"%s\" is not on the network\n", \ @@ -389,7 +395,9 @@ } rtfree(rt); } +#ifdef INET6 lla_lookup_1: +#endif lle = uma_zalloc(llezone, M_DONTWAIT | M_ZERO); if (lle == NULL) { log(LOG_INFO, "lla_lookup: new lle malloc failed\n"); From owner-p4-projects@FreeBSD.ORG Mon Nov 24 22:04:50 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D59CF1065677; Mon, 24 Nov 2008 22:04:49 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 815041065673 for ; Mon, 24 Nov 2008 22:04:49 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 733138FC1B for ; Mon, 24 Nov 2008 22:04:49 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAOM4nnF082681 for ; Mon, 24 Nov 2008 22:04:49 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAOM4nJb082679 for perforce@freebsd.org; Mon, 24 Nov 2008 22:04:49 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 24 Nov 2008 22:04:49 GMT Message-Id: <200811242204.mAOM4nJb082679@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 153476 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, 24 Nov 2008 22:04:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=153476 Change 153476 by rene@rene_self on 2008/11/24 22:04:30 MFen: use &dtrace; instead of DTrace where appropiate. Rewrap lines in handbook/dtrace which became too long. Checked build, whitespace. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.sgml#8 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/preface/preface.sgml#8 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.sgml#8 (text+ko) ==== @@ -11,7 +11,7 @@ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/dtrace/chapter.sgml,v 1.3 2008/10/10 15:37:53 pgj Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/dtrace/chapter.sgml - %SRCID% 1.5 + %SRCID% 1.6 --> @@ -32,47 +32,47 @@ - DTrace + &dtrace; Overzicht - DTrace + &dtrace; - DTrace-ondersteuning + &dtrace;-ondersteuning - DTrace + &dtrace; - DTrace, ook bekend als Dynamic Tracing, was ontwikkeld door + &dtrace;, ook bekend als Dynamic Tracing, was ontwikkeld door &sun; als een gereedschap om prestatie-bottlenecks in productie- en preproductiesystemen op te sporen. Het is in geen enkel opzicht een debug-gereedschap, maar een gereedschap voor real-time analyse om prestatie- en andere zaken op te sporen. - DTrace is een opmerkelijk profileringsgereedschap, met een + &dtrace; is een opmerkelijk profileringsgereedschap, met een indrukwekkende verzameling mogelijkheden om systeemzaken te diagnosticeren. Het kan ook worden gebruikt om vooraf geschreven scripts te draaien om zo voordeel te halen uit de mogelijkheden. Gebruikers kunnen zelfs hun eigen middelen schrijven door gebruik - te maken van de DTrace D Language, wat ze in staat stelt om hun + te maken van de &dtrace; D Language, wat ze in staat stelt om hun profilering aan te passen aan hun specifieke behoeften. Na het lezen van dit hoofdstuk weet u: - Wat DTrace is en welke mogelijkheden het biedt. + Wat &dtrace; is en welke mogelijkheden het biedt. - De verschillen tussen de DTrace-implementatie van + De verschillen tussen de &dtrace;-implementatie van &solaris; en degene die door &os; wordt aangeboden. - Hoe DTrace op &os; aan te zetten en te gebruiken. + Hoe &dtrace; op &os; aan te zetten en te gebruiken. @@ -117,12 +117,13 @@ Implementatieverschillen - Hoewel DTrace in &os; erg lijkt op degene die in &solaris; + Hoewel &dtrace; in &os; erg lijkt op degene die in &solaris; zit, zijn er verschillen die uitgelegd moeten worden voordat er verder wordt gegaan. Het primaire verschil dat gebruikers zullen - zien is dat DTrace specifiek moet worden aangezet op &os;. Er - zijn kernelopties en modulen die aangezet moeten worden om DTrace - juist te laten werken. Deze zullen later worden uitgelegd. + zien is dat &dtrace; specifiek moet worden aangezet op &os;. Er + zijn kernelopties en modulen die aangezet moeten worden om + &dtrace; juist te laten werken. Deze zullen later worden + uitgelegd. Er is een kerneloptie DDB_CTF die gebruikt wordt om ondersteuning voor het laden van @@ -147,13 +148,14 @@ malloc() op soort in de &os;-kernel toestaat. - Alleen root mag DTrace op &os; gebruiken. - Dit heeft te maken met beveiligingsverschillen, &solaris; heeft - enkele beveiligingscontroles op laag niveau die nog niet bestaan - in &os;. Hierom is /dev/dtrace/dtrace - strikt beperkt tot root. + Alleen root mag &dtrace; op &os; + gebruiken. Dit heeft te maken met beveiligingsverschillen, + &solaris; heeft enkele beveiligingscontroles op laag niveau die + nog niet bestaan in &os;. Hierom is + /dev/dtrace/dtrace strikt beperkt tot + root. - Tenslotte valt de DTrace-software onder de + Tenslotte valt de &dtrace;-software onder de CDDL-licentie van &sun;. De Common Development and Distribution License wordt bij &os; geleverd, zie @@ -162,17 +164,17 @@ . Deze licentie houdt in dat een &os;-kernel met de - DTrace-opties nog steeds onder de BSD-licentie - valt; de CDDL komt echter op de proppen wanneer - de modulen in binaire vorm worden verspreid, of wanneer de - binairen zijn geladen. + &dtrace;-opties nog steeds onder de + BSD-licentie valt; de CDDL + komt echter op de proppen wanneer de modulen in binaire vorm + worden verspreid, of wanneer de binairen zijn geladen. - Ondersteuning voor DTrace aanzetten + Ondersteuning voor &dtrace; aanzetten Voeg de volgende regels toe aan het kernelinstellingenbestand - om ondersteuning voor DTrace aan te zetten: + om ondersteuning voor &dtrace; aan te zetten: options KDTRACE_HOOKS options DDB_CTF @@ -184,7 +186,7 @@ options KDTRACE_FRAME Deze optie biedt ondersteuning voor de mogelijkheid - FBT. DTrace zal zonder deze optie werken; + FBT. &dtrace; zal zonder deze optie werken; er zal echter beperkte ondersteuning zijn voor het volgen van functiegrenzen. @@ -210,29 +212,29 @@ Nadat opnieuw is opgestart en de nieuwe kernel in het geheugen is geladen, dient ondersteuning voor de Korn-shell te worden toegevoegd. Dit is nodig omdat de verschillende hulpmiddelen van - DTrace in ksh zijn geschreven. Installeer + &dtrace; in ksh zijn geschreven. Installeer shells/ksh93. Het is ook mogelijk om deze hulpmiddelen in shells/pdksh of shells/mksh te draaien. - Als laatste dient de huidige DTrace-gereedschapskist verkregen - te worden. De huidige versie is beschikbaar op + Als laatste dient de huidige &dtrace;-gereedschapskist + verkregen te worden. De huidige versie is beschikbaar op . Het bevat een installatiemechanisme; om gebruik te maken van de bijgeleverde hulpmiddelen is installatie echter niet nodig. - DTrace gebruiken + &dtrace; gebruiken Voordat er gebruik wordt gemaakt van de functionaliteit van - DTrace, moet het DTrace-apparaat bestaan. Geef het volgende + &dtrace;, moet het &dtrace;-apparaat bestaan. Geef het volgende commando om het apparaat te laten: &prompt.root; kldload dtraceall - Ondersteuning van DTrace zou nu beschikbaar moeten zijn. De + Ondersteuning van &dtrace; zou nu beschikbaar moeten zijn. De beheerder kan het volgende commando uitvoeren om alle sondes te bekijken: @@ -240,11 +242,11 @@ Alle uitvoer wordt aan het hulpmiddel more doorgegeven omdat het snel de schermbuffer zal laten overstromen. - DTrace kan nu als werkend worden beschouwd. Het is nu tijd om de - gereedschapskist te bekijken. + &dtrace; kan nu als werkend worden beschouwd. Het is nu tijd om + de gereedschapskist te bekijken. De gereedschapskist is een verzameling van kant-en-klare - scripts die met DTrace gedraaid kunnen worden om informatie over + scripts die met &dtrace; gedraaid kunnen worden om informatie over het systeem te verzamelen. Er zijn scripts om open bestanden, geheugen, CPU-gebruik, en nog veel meer te controleren. Pak de scripts uit met het volgende commando: @@ -266,7 +268,7 @@ Op dit moment is het voorzichtig om de lezer eraan te - herinneren dat de ondersteuning voor DTrace in &os; + herinneren dat de ondersteuning voor &dtrace; in &os; niet compleet en experimenteel is. Veel van deze scripts zullen niet werken omdat ze of te &solaris;-specifiek zijn of @@ -275,7 +277,7 @@ Op het moment van schrijven worden slechts twee scripts van de - DTrace Toolkit volledig ondersteund in &os;: de scripts + &dtrace; Toolkit volledig ondersteund in &os;: de scripts hotkernel en procsystime. Dit zijn de twee die we in de volgende gedeelten van deze sectie zullen bekijken. @@ -395,12 +397,12 @@ De taal D - De DTrace-gereedschapskist bevat vele scripts in de speciale - taal van DTrace. Deze taal wordt de taal D genoemd - door de documentatie van &sun;, en lijkt sterk op C++. Een - diepgaande discussie over de taal valt buiten het bereik van dit - document. Het wordt uitgebreid behandeld op - . + De &dtrace;-gereedschapskist bevat vele scripts in de speciale + taal van &dtrace;. Deze taal wordt de taal D + genoemd door de documentatie van &sun;, en lijkt sterk op C++. + Een diepgaande discussie over de taal valt buiten het bereik van + dit document. Het wordt uitgebreid behandeld op + . ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/preface/preface.sgml#8 (text+ko) ==== @@ -6,7 +6,7 @@ Vertaald door: Remko Lodder %SOURCE% en_US.ISO8859-1/books/handbook/preface/preface.sgml - %SRCID% 1.41 + %SRCID% 1.43 --> @@ -540,10 +540,10 @@ - , DTrace + , &dtrace; - Beschrijft hoe het gereedschap DTrace van &sun; te + Beschrijft hoe het gereedschap &dtrace; van &sun; te configureren en gebruiken in &os;. Dynamisch tracen kan helpen bij het lokaliseren van prestatieproblemen, door real-time systeemanalyse uit te voeren. From owner-p4-projects@FreeBSD.ORG Mon Nov 24 22:18:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6DCA510657C4; Mon, 24 Nov 2008 22:18:03 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3261110657C1 for ; Mon, 24 Nov 2008 22:18:03 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2552B8FC18 for ; Mon, 24 Nov 2008 22:18:03 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAOMI2Am083817 for ; Mon, 24 Nov 2008 22:18:02 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAOMI2cF083815 for perforce@freebsd.org; Mon, 24 Nov 2008 22:18:02 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 24 Nov 2008 22:18:02 GMT Message-Id: <200811242218.mAOMI2cF083815@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 153478 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, 24 Nov 2008 22:18:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=153478 Change 153478 by rene@rene_self on 2008/11/24 22:17:53 MFen my own en_US updates. Except for a language change in the MAC chapter, the only changes are SRCID bumps. Checked build, whitespace Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/basics/chapter.sgml#8 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mac/chapter.sgml#11 edit .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/updating/chapter.sgml#8 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/basics/chapter.sgml#8 (text+ko) ==== @@ -4,7 +4,7 @@ $FreeBSD: doc/nl_NL.ISO8859-1/books/handbook/basics/chapter.sgml,v 1.18 2008/10/18 14:41:55 remko Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/basics/chapter.sgml - %SRCID% 1.154 + %SRCID% 1.155 --> ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/mac/chapter.sgml#11 (text+ko) ==== @@ -5,7 +5,7 @@ $FreeBSDnl: doc/nl_NL.ISO8859-1/books/handbook/mac/chapter.sgml,v 1.22 2006/01/05 21:13:23 siebrand Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/mac/chapter.sgml - %SRCID% 1.73 + %SRCID% 1.74 --> @@ -2133,8 +2133,9 @@ Error: &man..secure.path.3; cannot stat <filename>.login_conf</filename> - Bij het wisselen van root naar een - andere gebruiker in het systeem, verschijnt de foutmelding + Bij het wisselen van de gebruiker root + naar een andere gebruiker in het systeem, verschijnt de + foutmelding _secure_path: unable to state .login_conf. Deze melding komt meestal voor als de gebruiker een hogere ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/updating/chapter.sgml#8 (text+ko) ==== @@ -3,7 +3,7 @@ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/updating/chapter.sgml,v 1.1 2008/09/28 12:00:39 trhodes Exp $ %SOURCE% en_US.ISO8859-1/books/handbook/updating/chapter.sgml - %SRCID% 1.1 + %SRCID% 1.2 --> From owner-p4-projects@FreeBSD.ORG Mon Nov 24 23:15:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0789A1065672; Mon, 24 Nov 2008 23:15:02 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id BF884106564A for ; Mon, 24 Nov 2008 23:15:01 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B2AD18FC16 for ; Mon, 24 Nov 2008 23:15:01 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAONF1aM089444 for ; Mon, 24 Nov 2008 23:15:01 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAONF1K0089442 for perforce@freebsd.org; Mon, 24 Nov 2008 23:15:01 GMT (envelope-from rene@FreeBSD.org) Date: Mon, 24 Nov 2008 23:15:01 GMT Message-Id: <200811242315.mAONF1K0089442@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 153481 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, 24 Nov 2008 23:15:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=153481 Change 153481 by rene@rene_self on 2008/11/24 23:14:08 Correct $FreeBSD$ tag so that cvs can commit the file. Pointy hat to: rene MFP4 after: mentor approval (+ dtrace from revision 153476) Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.sgml#9 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/books/handbook/dtrace/chapter.sgml#9 (text+ko) ==== @@ -8,7 +8,7 @@ + @@ -86,10 +86,14 @@ + + + + @@ -98,6 +102,8 @@ + + @@ -120,16 +126,26 @@ + + + + - - + + + + + + + + @@ -140,6 +156,8 @@ + + @@ -158,6 +176,8 @@ + + @@ -170,5 +190,7 @@ + + ==== //depot/projects/docproj_nl/www/share/sgml/advisories.xml#5 (text+ko) ==== @@ -2,7 +2,7 @@ - $FreeBSD: www/share/sgml/advisories.xml,v 1.222 2008/10/02 00:41:02 cperciva Exp $ + $FreeBSD: www/share/sgml/advisories.xml,v 1.223 2008/11/24 17:48:39 cperciva Exp $ @@ -10,6 +10,18 @@ 2008 + 11 + + + 24 + + + FreeBSD-SA-08:11.arc4random + + + + + 10 From owner-p4-projects@FreeBSD.ORG Tue Nov 25 12:30:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1E19F1065675; Tue, 25 Nov 2008 12:30:00 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D42BC1065670 for ; Tue, 25 Nov 2008 12:29:59 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C3AC48FC0A for ; Tue, 25 Nov 2008 12:29:59 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAPCTxT7039119 for ; Tue, 25 Nov 2008 12:29:59 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAPCTuLh039113 for perforce@freebsd.org; Tue, 25 Nov 2008 12:29:56 GMT (envelope-from ed@FreeBSD.org) Date: Tue, 25 Nov 2008 12:29:56 GMT Message-Id: <200811251229.mAPCTuLh039113@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 153519 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, 25 Nov 2008 12:30:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=153519 Change 153519 by ed@ed_dull on 2008/11/25 12:29:56 IFC. Affected files ... .. //depot/projects/mpsafetty/Makefile#2 integrate .. //depot/projects/mpsafetty/UPDATING#13 integrate .. //depot/projects/mpsafetty/bin/df/df.1#2 integrate .. //depot/projects/mpsafetty/bin/df/df.c#2 integrate .. //depot/projects/mpsafetty/bin/ps/print.c#2 integrate .. //depot/projects/mpsafetty/bin/sh/eval.c#3 integrate .. //depot/projects/mpsafetty/cddl/compat/opensolaris/include/libshare.h#1 branch .. //depot/projects/mpsafetty/cddl/compat/opensolaris/include/mnttab.h#2 integrate .. //depot/projects/mpsafetty/cddl/compat/opensolaris/misc/deviceid.c#2 integrate .. //depot/projects/mpsafetty/cddl/compat/opensolaris/misc/mnttab.c#2 integrate .. //depot/projects/mpsafetty/cddl/compat/opensolaris/misc/zmount.c#2 integrate .. //depot/projects/mpsafetty/cddl/compat/opensolaris/misc/zone.c#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/cmd/zdb/zdb.8#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/cmd/zdb/zdb.c#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/cmd/zfs/zfs.8#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/cmd/zinject/translate.c#1 branch .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/cmd/zinject/zinject.c#1 branch .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/cmd/zinject/zinject.h#1 branch .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/cmd/zpool/zpool.8#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/cmd/zpool/zpool_iter.c#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/cmd/zpool/zpool_util.c#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/cmd/ztest/ztest.c#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/head/assert.h#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/head/libintl.h#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/head/synch.h#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/head/thread.h#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.h#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/lib/libuutil/common/libuutil.h#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/lib/libuutil/common/uu_avl.c#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/lib/libuutil/common/uu_list.c#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#1 branch .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#3 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#2 integrate .. //depot/projects/mpsafetty/cddl/contrib/opensolaris/lib/libzpool/common/util.c#2 integrate .. //depot/projects/mpsafetty/cddl/lib/libzfs/Makefile#2 integrate .. //depot/projects/mpsafetty/cddl/lib/libzpool/Makefile#2 integrate .. //depot/projects/mpsafetty/cddl/sbin/zpool/Makefile#2 integrate .. //depot/projects/mpsafetty/cddl/usr.bin/Makefile#2 integrate .. //depot/projects/mpsafetty/cddl/usr.bin/zinject/Makefile#1 branch .. //depot/projects/mpsafetty/cddl/usr.bin/ztest/Makefile#2 integrate .. //depot/projects/mpsafetty/cddl/usr.sbin/zdb/Makefile#2 integrate .. //depot/projects/mpsafetty/contrib/gdb/gdb/arm-tdep.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ANNOUNCE#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/FREEBSD-upgrade#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/FREEBSD-vendor#2 delete .. //depot/projects/mpsafetty/contrib/ncurses/INSTALL#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/MANIFEST#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/NEWS#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/TO-DO#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/aclocal.m4#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/announce.html.in#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/config.guess#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/config.sub#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/configure#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/configure.in#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/dist.mk#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/doc/html/announce.html#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/form/form.priv.h#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/form/frm_def.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/form/frm_driver.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/form/frm_req_name.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/include/MKterm.h.awk.in#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/include/capdefaults.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/include/curses.h.in#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/include/curses.tail#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/include/nc_alloc.h#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/include/nc_panel.h#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/include/ncurses_defs#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/include/term_entry.h#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/man/curs_getcchar.3x#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/man/curs_memleaks.3x#1 branch .. //depot/projects/mpsafetty/contrib/ncurses/man/curs_terminfo.3x#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/man/curs_util.3x#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/man/form.3x#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/man/form_driver.3x#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/man/form_field_buffer.3x#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/man/man_db.renames#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/man/menu_attributes.3x#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/man/menu_driver.3x#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/man/menu_pattern.3x#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/man/ncurses.3x#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/menu/m_driver.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/menu/m_req_name.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/misc/ncu-indent#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/misc/ncurses.supp#1 branch .. //depot/projects/mpsafetty/contrib/ncurses/misc/terminfo.src#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/Makefile.in#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/base/MKkeyname.awk#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/base/MKlib_gen.sh#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/base/MKunctrl.awk#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/base/lib_addch.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/base/lib_delwin.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/base/lib_freeall.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/base/lib_getch.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/base/lib_getstr.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/base/lib_initscr.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/base/lib_mouse.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/base/lib_newterm.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/base/lib_newwin.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/base/lib_overlay.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/base/lib_restart.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/base/lib_screen.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/base/lib_set_term.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/base/lib_slk.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/base/lib_slkrefr.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/base/lib_ungetch.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/base/lib_window.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/base/resizeterm.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/base/tries.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/base/use_window.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/base/wresize.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/curses.priv.h#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/fifo_defs.h#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/llib-lncurses#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/llib-lncursest#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/llib-lncursesw#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/tinfo/MKcodes.awk#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/tinfo/MKnames.awk#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/tinfo/alloc_entry.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/tinfo/alloc_ttype.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/tinfo/captoinfo.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/tinfo/comp_expand.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/tinfo/comp_hash.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/tinfo/comp_parse.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/tinfo/comp_scan.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/tinfo/entries.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/tinfo/home_terminfo.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/tinfo/init_keytry.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/tinfo/lib_acs.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/tinfo/lib_baudrate.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/tinfo/lib_cur_term.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/tinfo/lib_data.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/tinfo/lib_options.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/tinfo/lib_raw.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/tinfo/lib_setup.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/tinfo/lib_termcap.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/tinfo/lib_tgoto.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/tinfo/lib_tparm.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/tinfo/lib_tputs.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/tinfo/make_keys.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/tinfo/name_match.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/tinfo/parse_entry.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/tinfo/read_entry.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/tinfo/use_screen.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/tinfo/write_entry.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/trace/lib_trace.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/trace/lib_traceatr.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/trace/lib_tracebits.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/trace/lib_tracechr.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/trace/lib_tracedmp.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/trace/lib_tracemse.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/trace/trace_buf.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/trace/trace_tries.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/trace/varargs.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/trace/visbuf.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/tty/hardscroll.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/tty/lib_mvcur.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/tty/lib_twait.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/tty/tty_update.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/widechar/charable.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/widechar/lib_get_wch.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/widechar/lib_get_wstr.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/widechar/lib_key_name.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/ncurses/widechar/lib_unget_wch.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/panel/p_new.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/panel/panel.priv.h#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/progs/MKtermsort.sh#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/progs/Makefile.in#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/progs/dump_entry.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/progs/dump_entry.h#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/progs/infocmp.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/progs/progs.priv.h#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/progs/tic.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/progs/toe.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/progs/tput.c#2 integrate .. //depot/projects/mpsafetty/contrib/ncurses/progs/tset.c#2 integrate .. //depot/projects/mpsafetty/contrib/sendmail/src/sendmail.h#3 integrate .. //depot/projects/mpsafetty/contrib/telnet/telnetd/ext.h#2 integrate .. //depot/projects/mpsafetty/contrib/telnet/telnetd/sys_term.c#2 integrate .. //depot/projects/mpsafetty/etc/mtree/BSD.include.dist#2 integrate .. //depot/projects/mpsafetty/gnu/usr.bin/gdb/Makefile#2 integrate .. //depot/projects/mpsafetty/gnu/usr.bin/gdb/gdbserver/Makefile#2 integrate .. //depot/projects/mpsafetty/gnu/usr.bin/gdb/gdbserver/fbsd-arm-low.c#1 branch .. //depot/projects/mpsafetty/gnu/usr.bin/gdb/gdbserver/reg-arm.c#1 branch .. //depot/projects/mpsafetty/include/Makefile#5 edit .. //depot/projects/mpsafetty/lib/Makefile#4 integrate .. //depot/projects/mpsafetty/lib/libarchive/test/test_acl_freebsd.c#2 integrate .. //depot/projects/mpsafetty/lib/libc/gen/getvfsbyname.3#2 integrate .. //depot/projects/mpsafetty/lib/libc/i386/sys/pipe.S#3 integrate .. //depot/projects/mpsafetty/lib/libc/i386/sys/reboot.S#3 integrate .. //depot/projects/mpsafetty/lib/libc/i386/sys/setlogin.S#3 integrate .. //depot/projects/mpsafetty/lib/libpmc/pmc.3#6 integrate .. //depot/projects/mpsafetty/lib/libpmc/pmc.atom.3#2 integrate .. //depot/projects/mpsafetty/lib/libpmc/pmc.core.3#2 integrate .. //depot/projects/mpsafetty/lib/libpmc/pmc.core2.3#2 integrate .. //depot/projects/mpsafetty/lib/libpmc/pmc.iaf.3#2 integrate .. //depot/projects/mpsafetty/lib/libstand/nfs.c#2 integrate .. //depot/projects/mpsafetty/lib/libstand/printf.c#2 integrate .. //depot/projects/mpsafetty/lib/libusb20/libusb20.3#2 integrate .. //depot/projects/mpsafetty/lib/libusb20/libusb20.c#2 integrate .. //depot/projects/mpsafetty/lib/libusb20/libusb20.h#2 integrate .. //depot/projects/mpsafetty/lib/libusb20/libusb20_compat01.c#2 integrate .. //depot/projects/mpsafetty/lib/libusb20/libusb20_compat01.h#2 integrate .. //depot/projects/mpsafetty/lib/libusb20/libusb20_desc.c#2 integrate .. //depot/projects/mpsafetty/lib/libusb20/libusb20_desc.h#2 integrate .. //depot/projects/mpsafetty/lib/libusb20/libusb20_ugen20.c#2 integrate .. //depot/projects/mpsafetty/lib/libutil/Makefile#3 integrate .. //depot/projects/mpsafetty/lib/libutil/gr_util.c#3 integrate .. //depot/projects/mpsafetty/lib/libutil/realhostname.c#4 integrate .. //depot/projects/mpsafetty/lib/ncurses/ncurses/Makefile#2 integrate .. //depot/projects/mpsafetty/lib/ncurses/ncurses/ncurses_cfg.h#2 integrate .. //depot/projects/mpsafetty/libexec/telnetd/Makefile#2 integrate .. //depot/projects/mpsafetty/release/Makefile#5 integrate .. //depot/projects/mpsafetty/release/doc/en_US.ISO8859-1/hardware/article.sgml#5 integrate .. //depot/projects/mpsafetty/release/doc/en_US.ISO8859-1/relnotes/article.sgml#7 integrate .. //depot/projects/mpsafetty/sbin/geom/class/part/Makefile#2 integrate .. //depot/projects/mpsafetty/sbin/geom/class/part/geom_part.c#3 integrate .. //depot/projects/mpsafetty/sbin/geom/class/part/gpart.8#3 integrate .. //depot/projects/mpsafetty/sbin/iscontrol/auth_subr.c#2 integrate .. //depot/projects/mpsafetty/sbin/iscontrol/config.c#2 integrate .. //depot/projects/mpsafetty/sbin/iscontrol/fsm.c#2 integrate .. //depot/projects/mpsafetty/sbin/iscontrol/iscontrol.8#2 integrate .. //depot/projects/mpsafetty/sbin/iscontrol/iscontrol.c#2 integrate .. //depot/projects/mpsafetty/sbin/iscontrol/iscontrol.h#2 integrate .. //depot/projects/mpsafetty/sbin/iscontrol/iscsi.conf.5#2 integrate .. //depot/projects/mpsafetty/sbin/iscontrol/login.c#2 integrate .. //depot/projects/mpsafetty/sbin/iscontrol/misc.c#2 integrate .. //depot/projects/mpsafetty/sbin/iscontrol/pdu.c#2 integrate .. //depot/projects/mpsafetty/share/man/man4/Makefile#14 integrate .. //depot/projects/mpsafetty/share/man/man4/ale.4#1 branch .. //depot/projects/mpsafetty/share/man/man4/altq.4#2 integrate .. //depot/projects/mpsafetty/share/man/man4/miibus.4#3 integrate .. //depot/projects/mpsafetty/share/man/man4/vlan.4#3 integrate .. //depot/projects/mpsafetty/share/man/man5/fstab.5#2 integrate .. //depot/projects/mpsafetty/share/man/man7/hier.7#2 integrate .. //depot/projects/mpsafetty/share/man/man9/Makefile#11 integrate .. //depot/projects/mpsafetty/share/man/man9/VFS_SET.9#2 integrate .. //depot/projects/mpsafetty/share/man/man9/bus_dma.9#4 integrate .. //depot/projects/mpsafetty/share/man/man9/devfs_set_cdevpriv.9#2 integrate .. //depot/projects/mpsafetty/share/man/man9/vfs_mountedon.9#2 delete .. //depot/projects/mpsafetty/share/man/man9/vn_fullpath.9#2 integrate .. //depot/projects/mpsafetty/share/misc/committers-src.dot#8 integrate .. //depot/projects/mpsafetty/share/mk/bsd.libnames.mk#2 integrate .. //depot/projects/mpsafetty/sys/amd64/amd64/elf_machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/amd64/conf/GENERIC#10 integrate .. //depot/projects/mpsafetty/sys/amd64/include/atomic.h#2 integrate .. //depot/projects/mpsafetty/sys/amd64/linux32/linux.h#4 integrate .. //depot/projects/mpsafetty/sys/amd64/linux32/linux32_sysvec.c#4 integrate .. //depot/projects/mpsafetty/sys/arm/arm/elf_machdep.c#4 integrate .. //depot/projects/mpsafetty/sys/arm/at91/at91.c#5 integrate .. //depot/projects/mpsafetty/sys/arm/at91/at91_mci.c#7 integrate .. //depot/projects/mpsafetty/sys/arm/at91/at91_mcireg.h#2 integrate .. //depot/projects/mpsafetty/sys/arm/at91/at91_pdcreg.h#2 integrate .. //depot/projects/mpsafetty/sys/arm/at91/at91_pio.c#3 integrate .. //depot/projects/mpsafetty/sys/arm/at91/at91_pioreg.h#2 integrate .. //depot/projects/mpsafetty/sys/arm/at91/at91_piovar.h#3 integrate .. //depot/projects/mpsafetty/sys/arm/at91/at91_pmc.c#4 integrate .. //depot/projects/mpsafetty/sys/arm/at91/at91_pmcreg.h#2 integrate .. //depot/projects/mpsafetty/sys/arm/at91/at91_pmcvar.h#2 integrate .. //depot/projects/mpsafetty/sys/arm/at91/at91_rtc.c#2 integrate .. //depot/projects/mpsafetty/sys/arm/at91/at91_rtcreg.h#2 integrate .. //depot/projects/mpsafetty/sys/arm/at91/at91_spi.c#3 integrate .. //depot/projects/mpsafetty/sys/arm/at91/at91_spireg.h#2 integrate .. //depot/projects/mpsafetty/sys/arm/at91/at91_ssc.c#3 integrate .. //depot/projects/mpsafetty/sys/arm/at91/at91_sscreg.h#2 integrate .. //depot/projects/mpsafetty/sys/arm/at91/at91_st.c#2 integrate .. //depot/projects/mpsafetty/sys/arm/at91/at91_streg.h#2 integrate .. //depot/projects/mpsafetty/sys/arm/at91/at91_twi.c#3 integrate .. //depot/projects/mpsafetty/sys/arm/at91/at91_twiio.h#2 integrate .. //depot/projects/mpsafetty/sys/arm/at91/at91_twireg.h#2 integrate .. //depot/projects/mpsafetty/sys/arm/at91/at91_usartreg.h#2 integrate .. //depot/projects/mpsafetty/sys/arm/at91/at91rm92reg.h#2 integrate .. //depot/projects/mpsafetty/sys/arm/at91/at91var.h#2 integrate .. //depot/projects/mpsafetty/sys/arm/at91/if_ate.c#4 integrate .. //depot/projects/mpsafetty/sys/arm/at91/if_atereg.h#3 integrate .. //depot/projects/mpsafetty/sys/arm/at91/kb920x_machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/arm/at91/ohci_atmelarm.c#2 integrate .. //depot/projects/mpsafetty/sys/arm/at91/uart_bus_at91usart.c#2 integrate .. //depot/projects/mpsafetty/sys/arm/at91/uart_cpu_at91rm9200usart.c#2 integrate .. //depot/projects/mpsafetty/sys/arm/at91/uart_dev_at91usart.c#4 integrate .. //depot/projects/mpsafetty/sys/arm/conf/DB-78XXX#3 integrate .. //depot/projects/mpsafetty/sys/arm/conf/DB-88F5XXX#3 integrate .. //depot/projects/mpsafetty/sys/arm/conf/DB-88F6XXX#3 integrate .. //depot/projects/mpsafetty/sys/arm/include/atomic.h#2 integrate .. //depot/projects/mpsafetty/sys/arm/mv/common.c#2 integrate .. //depot/projects/mpsafetty/sys/arm/mv/discovery/db78xxx.c#2 integrate .. //depot/projects/mpsafetty/sys/arm/mv/discovery/discovery.c#2 integrate .. //depot/projects/mpsafetty/sys/arm/mv/files.mv#2 integrate .. //depot/projects/mpsafetty/sys/arm/mv/kirkwood/db88f6xxx.c#2 integrate .. //depot/projects/mpsafetty/sys/arm/mv/kirkwood/kirkwood.c#2 integrate .. //depot/projects/mpsafetty/sys/arm/mv/mv_pci.c#1 branch .. //depot/projects/mpsafetty/sys/arm/mv/mvreg.h#2 integrate .. //depot/projects/mpsafetty/sys/arm/mv/mvvar.h#2 integrate .. //depot/projects/mpsafetty/sys/arm/mv/obio.c#2 integrate .. //depot/projects/mpsafetty/sys/arm/mv/orion/db88f5xxx.c#2 integrate .. //depot/projects/mpsafetty/sys/arm/mv/orion/orion.c#2 integrate .. //depot/projects/mpsafetty/sys/boot/Makefile#5 integrate .. //depot/projects/mpsafetty/sys/boot/arm/uboot/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/boot/arm/uboot/conf.c#2 integrate .. //depot/projects/mpsafetty/sys/boot/arm/uboot/version#2 integrate .. //depot/projects/mpsafetty/sys/boot/common/bootstrap.h#2 integrate .. //depot/projects/mpsafetty/sys/boot/common/interp.c#2 integrate .. //depot/projects/mpsafetty/sys/boot/forth/loader.conf#8 integrate .. //depot/projects/mpsafetty/sys/boot/i386/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/boot/i386/gptzfsboot/Makefile#1 branch .. //depot/projects/mpsafetty/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/mpsafetty/sys/boot/i386/libi386/bootinfo32.c#2 integrate .. //depot/projects/mpsafetty/sys/boot/i386/libi386/devicename.c#3 integrate .. //depot/projects/mpsafetty/sys/boot/i386/loader/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/boot/i386/loader/conf.c#2 integrate .. //depot/projects/mpsafetty/sys/boot/i386/loader/main.c#3 integrate .. //depot/projects/mpsafetty/sys/boot/i386/zfsboot/Makefile#1 branch .. //depot/projects/mpsafetty/sys/boot/i386/zfsboot/zfsboot.c#1 branch .. //depot/projects/mpsafetty/sys/boot/i386/zfsboot/zfsldr.S#1 branch .. //depot/projects/mpsafetty/sys/boot/uboot/lib/devicename.c#2 integrate .. //depot/projects/mpsafetty/sys/boot/uboot/lib/disk.c#2 integrate .. //depot/projects/mpsafetty/sys/boot/uboot/lib/glue.c#5 integrate .. //depot/projects/mpsafetty/sys/boot/uboot/lib/glue.h#4 integrate .. //depot/projects/mpsafetty/sys/boot/uboot/lib/libuboot.h#2 integrate .. //depot/projects/mpsafetty/sys/boot/uboot/lib/net.c#4 integrate .. //depot/projects/mpsafetty/sys/boot/zfs/Makefile#1 branch .. //depot/projects/mpsafetty/sys/boot/zfs/zfs.c#1 branch .. //depot/projects/mpsafetty/sys/boot/zfs/zfsimpl.c#1 branch .. //depot/projects/mpsafetty/sys/cddl/boot/zfs/README#1 branch .. //depot/projects/mpsafetty/sys/cddl/boot/zfs/fletcher.c#1 branch .. //depot/projects/mpsafetty/sys/cddl/boot/zfs/lzjb.c#1 branch .. //depot/projects/mpsafetty/sys/cddl/boot/zfs/sha256.c#1 branch .. //depot/projects/mpsafetty/sys/cddl/boot/zfs/zfsimpl.h#1 branch .. //depot/projects/mpsafetty/sys/cddl/boot/zfs/zfssubr.c#1 branch .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#3 integrate .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#3 integrate .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c#1 branch .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#3 integrate .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#4 integrate .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/sys/acl.h#2 delete .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/sys/atomic.h#3 integrate .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/sys/callb.h#2 delete .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/sys/cred.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/sys/dnlc.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/sys/file.h#1 branch .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/sys/kidmap.h#1 branch .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/sys/kmem.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/sys/misc.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/sys/mntent.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/sys/param.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/sys/pathname.h#1 branch .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/sys/policy.h#3 integrate .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/sys/proc.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/sys/refstr.h#1 branch .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/sys/sid.h#1 branch .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/sys/sig.h#1 branch .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/sys/sunddi.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/sys/sysmacros.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/sys/time.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/sys/types.h#3 integrate .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/sys/uio.h#3 integrate .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/sys/vfs.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/sys/vnode.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/sys/zone.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/common/avl/avl.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/common/unicode/u8_textprep.c#1 branch .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.c#1 branch .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.h#1 branch .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.c#1 branch .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.h#1 branch .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c#1 branch .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/common/zfs/zprop_common.c#1 branch .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/Makefile.files#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#3 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c#1 branch .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#3 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c#1 branch .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c#1 branch .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c#1 branch .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deleg.h#1 branch .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/rrwlock.h#1 branch .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_boot.h#1 branch .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_fuid.h#1 branch .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/unique.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#3 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#3 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#6 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c#1 branch .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#6 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/os/callb.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/os/list.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#1 branch .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h#1 branch .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/sys/cred.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/sys/extdirent.h#1 branch .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/sys/fm/protocol.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/sys/fm/util.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/sys/idmap.h#1 branch .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#3 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/sys/list.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/sys/synch.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/eventdefs.h#1 branch .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h#2 integrate .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/sys/u8_textprep.h#1 branch .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/sys/u8_textprep_data.h#1 branch .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#1 branch .. //depot/projects/mpsafetty/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c#2 integrate .. //depot/projects/mpsafetty/sys/compat/ia32/ia32_sysvec.c#4 integrate .. //depot/projects/mpsafetty/sys/compat/linux/linux_futex.c#3 integrate .. //depot/projects/mpsafetty/sys/compat/svr4/svr4_sysvec.c#4 integrate .. //depot/projects/mpsafetty/sys/conf/NOTES#18 integrate .. //depot/projects/mpsafetty/sys/conf/files#26 integrate .. //depot/projects/mpsafetty/sys/conf/options#15 integrate .. //depot/projects/mpsafetty/sys/crypto/via/padlock.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/acpica/acpi.c#7 integrate .. //depot/projects/mpsafetty/sys/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/adb/adb_bus.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/ale/if_ale.c#1 branch .. //depot/projects/mpsafetty/sys/dev/ale/if_alereg.h#1 branch .. //depot/projects/mpsafetty/sys/dev/ale/if_alevar.h#1 branch .. //depot/projects/mpsafetty/sys/dev/ata/ata-pci.h#9 integrate .. //depot/projects/mpsafetty/sys/dev/ata/chipsets/ata-marvell.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/ath/if_ath.c#7 integrate .. //depot/projects/mpsafetty/sys/dev/ath/if_athvar.h#5 integrate .. //depot/projects/mpsafetty/sys/dev/bce/if_bce.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/bce/if_bcereg.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/cardbus/cardbus.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cardbus/cardbus_cis.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/cardbus/cardbus_device.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/cardbus/cardbusvar.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_ael1002.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_common.h#5 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/common/cxgb_t3_hw.c#7 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_adapter.h#8 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_config.h#4 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_main.c#12 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_multiq.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_osdep.h#7 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/cxgb_sge.c#11 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/sys/cxgb_support.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#11 integrate .. //depot/projects/mpsafetty/sys/dev/dcons/dcons_crom.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/dcons/dcons_os.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/fdc/fdc.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/fdc/fdc_pccard.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/fxp/if_fxpreg.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/fxp/if_fxpvar.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/glxsb/glxsb.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/hwpmc/hwpmc_amd.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/hwpmc/hwpmc_arm.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/hwpmc/hwpmc_ia64.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/hwpmc/hwpmc_intel.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/hwpmc/hwpmc_mod.c#7 integrate .. //depot/projects/mpsafetty/sys/dev/hwpmc/hwpmc_powerpc.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/hwpmc/hwpmc_sparc64.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ipmi/ipmi.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/iscsi/initiator/isc_cam.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/iscsi/initiator/isc_sm.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/iscsi/initiator/isc_soc.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/iscsi/initiator/isc_subr.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/iscsi/initiator/iscsi.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/iscsi/initiator/iscsi.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/iscsi/initiator/iscsi_subr.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/iscsi/initiator/iscsivar.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/mfi/mfi.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/mfi/mfi_disk.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/mfi/mfi_ioctl.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/mfi/mfi_pci.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/mfi/mfireg.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/mfi/mfivar.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/mmc/mmcsd.c#8 integrate .. //depot/projects/mpsafetty/sys/dev/msk/if_msk.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/mxge/if_mxge.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/mxge/if_mxge_var.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/nmdm/nmdm.c#10 integrate .. //depot/projects/mpsafetty/sys/dev/nxge/xge-osdep.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/pci/pci.c#7 integrate .. //depot/projects/mpsafetty/sys/dev/ppbus/if_plip.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/ppbus/immio.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/ppbus/lpbb.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/ppbus/lpt.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/ppbus/lpt.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/ppbus/pcfclock.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/ppbus/ppb_1284.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/ppbus/ppb_base.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/ppbus/ppb_msq.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/ppbus/ppbconf.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/ppbus/ppbconf.h#4 integrate .. //depot/projects/mpsafetty/sys/dev/ppbus/ppi.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/ppbus/ppi.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/ppbus/pps.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/ppbus/vpo.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/ppbus/vpoio.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/ppbus/vpoio.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/ppc/ppc.c#6 integrate .. //depot/projects/mpsafetty/sys/dev/ppc/ppc_acpi.c#4 integrate .. //depot/projects/mpsafetty/sys/dev/random/randomdev.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/random/randomdev_soft.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/sio/sio_pci.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/sio/sio_puc.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/sound/pci/hda/hdac.c#10 integrate .. //depot/projects/mpsafetty/sys/dev/sound/pci/hda/hdac_private.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/syscons/syscons.c#7 integrate .. //depot/projects/mpsafetty/sys/dev/uart/uart_dev_quicc.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/if_aue.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/if_zyd.c#6 integrate .. //depot/projects/mpsafetty/sys/dev/usb/if_zydreg.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb/rio500_usb.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb/u3g.c#7 integrate .. //depot/projects/mpsafetty/sys/dev/usb/ugen.c#7 integrate .. //depot/projects/mpsafetty/sys/dev/usb/usb.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb/usb_quirks.c#5 integrate .. //depot/projects/mpsafetty/sys/dev/usb/usb_subr.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb/usbdevs#17 integrate .. //depot/projects/mpsafetty/sys/dev/usb/usbdi.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb/usbdi.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/bluetooth/ng_ubt2.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/controller/ehci2.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/controller/ehci2.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/controller/uss820dci_pccard.c#3 delete .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_busdma.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_core.h#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_dev.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_dev.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_device.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_generic.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_generic.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_hub.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_msctest.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_msctest.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_request.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usb2_util.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/core/usbdevs#2 delete .. //depot/projects/mpsafetty/sys/dev/usb2/ethernet/if_aue2.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/image/uscanner2.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/include/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/include/urio2_ioctl.h#2 delete .. //depot/projects/mpsafetty/sys/dev/usb2/include/usb2_devid.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/include/usb2_devtable.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/include/usb2_ioctl.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/include/usb2_standard.h#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/quirk/usb2_quirk.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/serial/u3g2.c#1 branch .. //depot/projects/mpsafetty/sys/dev/usb2/serial/ubsa2.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/serial/ugensa2.c#3 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/sound/uaudio2.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/storage/umass2.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/usb2/storage/urio2.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/vge/if_vge.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/vr/if_vr.c#3 integrate .. //depot/projects/mpsafetty/sys/fs/cd9660/cd9660_bmap.c#2 integrate .. //depot/projects/mpsafetty/sys/fs/cd9660/cd9660_node.c#4 integrate .. //depot/projects/mpsafetty/sys/fs/cd9660/cd9660_node.h#2 integrate .. //depot/projects/mpsafetty/sys/fs/cd9660/cd9660_vfsops.c#5 integrate .. //depot/projects/mpsafetty/sys/fs/cd9660/cd9660_vnops.c#5 integrate .. //depot/projects/mpsafetty/sys/fs/unionfs/union.h#2 integrate .. //depot/projects/mpsafetty/sys/fs/unionfs/union_subr.c#4 integrate .. //depot/projects/mpsafetty/sys/fs/unionfs/union_vfsops.c#5 integrate .. //depot/projects/mpsafetty/sys/fs/unionfs/union_vnops.c#4 integrate .. //depot/projects/mpsafetty/sys/geom/part/g_part_bsd.c#4 integrate .. //depot/projects/mpsafetty/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h#3 integrate .. //depot/projects/mpsafetty/sys/gnu/fs/xfs/xfs_dfrag.c#2 integrate .. //depot/projects/mpsafetty/sys/gnu/fs/xfs/xfs_inode.c#2 integrate .. //depot/projects/mpsafetty/sys/gnu/fs/xfs/xfs_inode.h#2 integrate .. //depot/projects/mpsafetty/sys/gnu/fs/xfs/xfs_vnodeops.c#2 integrate .. //depot/projects/mpsafetty/sys/i386/conf/GENERIC#11 integrate .. //depot/projects/mpsafetty/sys/i386/conf/XEN#5 integrate .. //depot/projects/mpsafetty/sys/i386/i386/elf_machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/i386/ibcs2/ibcs2_sysvec.c#3 integrate .. //depot/projects/mpsafetty/sys/i386/include/atomic.h#2 integrate .. //depot/projects/mpsafetty/sys/i386/include/xen/xen-os.h#5 integrate .. //depot/projects/mpsafetty/sys/i386/linux/linux.h#4 integrate .. //depot/projects/mpsafetty/sys/i386/linux/linux_sysvec.c#4 integrate .. //depot/projects/mpsafetty/sys/ia64/ia64/elf_machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/ia64/include/atomic.h#2 integrate .. //depot/projects/mpsafetty/sys/isa/isa_common.c#4 integrate .. //depot/projects/mpsafetty/sys/isa/isa_common.h#3 integrate .. //depot/projects/mpsafetty/sys/isa/isahint.c#2 integrate .. //depot/projects/mpsafetty/sys/isa/isavar.h#4 integrate .. //depot/projects/mpsafetty/sys/kern/bus_if.m#2 integrate .. //depot/projects/mpsafetty/sys/kern/imgact_aout.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/kern_jail.c#5 integrate .. //depot/projects/mpsafetty/sys/kern/kern_osd.c#1 branch .. //depot/projects/mpsafetty/sys/kern/kern_proc.c#11 integrate .. //depot/projects/mpsafetty/sys/kern/kern_shutdown.c#4 integrate .. //depot/projects/mpsafetty/sys/kern/kern_thr.c#6 integrate .. //depot/projects/mpsafetty/sys/kern/kern_thread.c#8 integrate .. //depot/projects/mpsafetty/sys/kern/sched_ule.c#5 integrate .. //depot/projects/mpsafetty/sys/kern/subr_bufring.c#1 branch .. //depot/projects/mpsafetty/sys/kern/subr_bus.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/subr_prf.c#5 integrate .. //depot/projects/mpsafetty/sys/kern/uipc_socket.c#7 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_export.c#4 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_lookup.c#5 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_subr.c#12 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_vnops.c#9 integrate .. //depot/projects/mpsafetty/sys/kgssapi/gsstest.c#2 integrate .. //depot/projects/mpsafetty/sys/mips/mips/elf_machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/modules/Makefile#17 integrate .. //depot/projects/mpsafetty/sys/modules/ale/Makefile#1 branch .. //depot/projects/mpsafetty/sys/modules/cxgb/cxgb/Makefile#5 integrate .. //depot/projects/mpsafetty/sys/modules/cxgb/iw_cxgb/Makefile#3 integrate .. //depot/projects/mpsafetty/sys/modules/cxgb/toecore/Makefile#3 integrate .. //depot/projects/mpsafetty/sys/modules/em/Makefile#3 integrate .. //depot/projects/mpsafetty/sys/modules/igb/Makefile#3 integrate .. //depot/projects/mpsafetty/sys/modules/uart/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/usb2/Makefile#2 integrate .. //depot/projects/mpsafetty/sys/modules/zfs/Makefile#3 integrate .. //depot/projects/mpsafetty/sys/net/if.c#10 integrate .. //depot/projects/mpsafetty/sys/net/if_ethersubr.c#6 integrate .. //depot/projects/mpsafetty/sys/net/if_fddisubr.c#4 integrate .. //depot/projects/mpsafetty/sys/net/if_fwsubr.c#4 integrate .. //depot/projects/mpsafetty/sys/net/if_gif.c#5 integrate .. //depot/projects/mpsafetty/sys/net/if_lagg.c#4 integrate .. //depot/projects/mpsafetty/sys/net/if_loop.c#5 integrate .. //depot/projects/mpsafetty/sys/net/if_tun.c#7 integrate .. //depot/projects/mpsafetty/sys/net/if_var.h#4 integrate .. //depot/projects/mpsafetty/sys/net/if_vlan.c#6 integrate .. //depot/projects/mpsafetty/sys/net/raw_cb.c#5 integrate .. //depot/projects/mpsafetty/sys/net/route.c#8 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_hostap.c#7 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_output.c#4 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_var.h#4 integrate .. //depot/projects/mpsafetty/sys/net80211/ieee80211_wds.c#4 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_base.c#8 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_iface.c#7 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_l2tp.c#4 integrate .. //depot/projects/mpsafetty/sys/netgraph/ng_socket.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/if_ether.c#9 integrate .. //depot/projects/mpsafetty/sys/netinet/igmp.c#5 integrate .. //depot/projects/mpsafetty/sys/netinet/in.c#5 integrate .. //depot/projects/mpsafetty/sys/netinet/in_gif.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/in_mcast.c#5 integrate .. //depot/projects/mpsafetty/sys/netinet/in_pcb.c#12 integrate .. //depot/projects/mpsafetty/sys/netinet/in_pcb.h#10 integrate .. //depot/projects/mpsafetty/sys/netinet/in_proto.c#2 integrate .. //depot/projects/mpsafetty/sys/netinet/in_rmx.c#5 integrate .. //depot/projects/mpsafetty/sys/netinet/in_var.h#4 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_divert.c#6 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_fastfwd.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_icmp.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_icmp.h#2 integrate .. //depot/projects/mpsafetty/sys/netinet/ip_input.c#7 integrate .. //depot/projects/mpsafetty/sys/netinet/raw_ip.c#10 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_constants.h#4 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_indata.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_input.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_pcb.c#6 integrate .. //depot/projects/mpsafetty/sys/netinet/sctp_pcb.h#4 integrate .. //depot/projects/mpsafetty/sys/netinet/sctputil.c#7 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_hostcache.c#7 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_input.c#12 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_output.c#8 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_reass.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_sack.c#5 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_subr.c#10 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_syncache.c#13 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_timewait.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet/tcp_var.h#5 integrate .. //depot/projects/mpsafetty/sys/netinet/udp_usrreq.c#14 integrate .. //depot/projects/mpsafetty/sys/netinet/vinet.h#2 integrate .. //depot/projects/mpsafetty/sys/netinet6/frag6.c#5 integrate .. //depot/projects/mpsafetty/sys/netinet6/icmp6.c#7 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_ifattach.c#5 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_proto.c#5 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_rmx.c#5 integrate .. //depot/projects/mpsafetty/sys/netinet6/in6_src.c#9 integrate .. //depot/projects/mpsafetty/sys/netinet6/ip6_forward.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet6/ip6_input.c#5 integrate .. //depot/projects/mpsafetty/sys/netinet6/ip6_mroute.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet6/mld6.c#6 integrate .. //depot/projects/mpsafetty/sys/netinet6/nd6.c#5 integrate .. //depot/projects/mpsafetty/sys/netinet6/nd6_nbr.c#6 integrate .. //depot/projects/mpsafetty/sys/netinet6/nd6_rtr.c#5 integrate .. //depot/projects/mpsafetty/sys/netinet6/raw_ip6.c#9 integrate .. //depot/projects/mpsafetty/sys/netinet6/scope6.c#4 integrate .. //depot/projects/mpsafetty/sys/netinet6/vinet6.h#2 integrate .. //depot/projects/mpsafetty/sys/netipsec/ipsec.c#6 integrate .. //depot/projects/mpsafetty/sys/netipsec/ipsec.h#4 integrate .. //depot/projects/mpsafetty/sys/netipsec/key.c#5 integrate .. //depot/projects/mpsafetty/sys/netipsec/keysock.c#6 integrate .. //depot/projects/mpsafetty/sys/netipsec/xform_ah.c#5 integrate .. //depot/projects/mpsafetty/sys/netipsec/xform_esp.c#4 integrate .. //depot/projects/mpsafetty/sys/netipsec/xform_ipcomp.c#4 integrate .. //depot/projects/mpsafetty/sys/netipsec/xform_ipip.c#4 integrate .. //depot/projects/mpsafetty/sys/nfsclient/nfs.h#3 integrate .. //depot/projects/mpsafetty/sys/nfsserver/nfs.h#4 integrate .. //depot/projects/mpsafetty/sys/nfsserver/nfs_srvkrpc.c#3 integrate .. //depot/projects/mpsafetty/sys/nfsserver/nfs_srvsubs.c#6 integrate .. //depot/projects/mpsafetty/sys/nlm/nlm_prot_svc.c#3 integrate .. //depot/projects/mpsafetty/sys/powerpc/include/atomic.h#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/include/float.h#2 integrate .. //depot/projects/mpsafetty/sys/powerpc/powerpc/elf_machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/rpc/clnt_vc.c#3 integrate .. //depot/projects/mpsafetty/sys/security/audit/audit.c#6 integrate .. //depot/projects/mpsafetty/sys/security/audit/audit_arg.c#6 integrate .. //depot/projects/mpsafetty/sys/security/audit/audit_bsm.c#5 integrate .. //depot/projects/mpsafetty/sys/security/audit/audit_private.h#5 integrate .. //depot/projects/mpsafetty/sys/security/audit/audit_syscalls.c#8 integrate .. //depot/projects/mpsafetty/sys/sparc64/include/atomic.h#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/include/intr_machdep.h#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/include/iommureg.h#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/include/iommuvar.h#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/pci/schizo.c#3 integrate .. //depot/projects/mpsafetty/sys/sparc64/pci/schizoreg.h#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/pci/schizovar.h#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/elf_machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/intr_machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/iommu.c#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/machdep.c#5 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/nexus.c#2 integrate .. //depot/projects/mpsafetty/sys/sparc64/sparc64/support.S#4 integrate .. //depot/projects/mpsafetty/sys/sun4v/include/atomic.h#2 integrate .. //depot/projects/mpsafetty/sys/sys/buf_ring.h#1 branch .. //depot/projects/mpsafetty/sys/sys/conf.h#7 integrate .. //depot/projects/mpsafetty/sys/sys/disklabel.h#2 integrate .. //depot/projects/mpsafetty/sys/sys/jail.h#2 integrate .. //depot/projects/mpsafetty/sys/sys/mbuf.h#2 integrate .. //depot/projects/mpsafetty/sys/sys/mount.h#6 integrate .. //depot/projects/mpsafetty/sys/sys/namei.h#2 integrate .. //depot/projects/mpsafetty/sys/sys/osd.h#1 branch .. //depot/projects/mpsafetty/sys/sys/param.h#20 integrate .. //depot/projects/mpsafetty/sys/sys/priv.h#5 integrate .. //depot/projects/mpsafetty/sys/sys/proc.h#11 integrate .. //depot/projects/mpsafetty/sys/sys/sysent.h#5 integrate .. //depot/projects/mpsafetty/sys/sys/termios.h#9 integrate .. //depot/projects/mpsafetty/sys/sys/vimage.h#5 integrate .. //depot/projects/mpsafetty/sys/sys/vnode.h#8 integrate .. //depot/projects/mpsafetty/sys/ufs/ffs/ffs_snapshot.c#6 integrate .. //depot/projects/mpsafetty/sys/ufs/ufs/ufs_dirhash.c#6 integrate .. //depot/projects/mpsafetty/sys/ufs/ufs/ufs_lookup.c#4 integrate .. //depot/projects/mpsafetty/sys/vm/vm_pageout.c#5 integrate .. //depot/projects/mpsafetty/sys/xdr/xdr_mbuf.c#4 integrate .. //depot/projects/mpsafetty/sys/xen/xenbus/xenbus_xs.c#5 integrate .. //depot/projects/mpsafetty/tools/regression/bin/sh/parameters/exitstatus1.0#1 branch .. //depot/projects/mpsafetty/tools/regression/fstest/Makefile#2 integrate .. //depot/projects/mpsafetty/tools/regression/fstest/fstest.c#2 integrate .. //depot/projects/mpsafetty/tools/regression/fstest/tests/chflags/00.t#2 integrate .. //depot/projects/mpsafetty/tools/regression/fstest/tests/chflags/01.t#2 integrate .. //depot/projects/mpsafetty/tools/regression/fstest/tests/chflags/02.t#2 integrate .. //depot/projects/mpsafetty/tools/regression/fstest/tests/chflags/03.t#2 integrate .. //depot/projects/mpsafetty/tools/regression/fstest/tests/chflags/04.t#2 integrate .. //depot/projects/mpsafetty/tools/regression/fstest/tests/chflags/05.t#2 integrate .. //depot/projects/mpsafetty/tools/regression/fstest/tests/chflags/06.t#2 integrate .. //depot/projects/mpsafetty/tools/regression/fstest/tests/chflags/07.t#2 integrate .. //depot/projects/mpsafetty/tools/regression/fstest/tests/chflags/08.t#2 integrate .. //depot/projects/mpsafetty/tools/regression/fstest/tests/chflags/09.t#2 integrate .. //depot/projects/mpsafetty/tools/regression/fstest/tests/chflags/11.t#2 integrate .. //depot/projects/mpsafetty/tools/regression/fstest/tests/chflags/12.t#2 integrate .. //depot/projects/mpsafetty/tools/regression/fstest/tests/chflags/13.t#2 integrate .. //depot/projects/mpsafetty/tools/regression/fstest/tests/chown/00.t#2 integrate .. //depot/projects/mpsafetty/tools/regression/fstest/tests/chown/05.t#2 integrate .. //depot/projects/mpsafetty/tools/regression/fstest/tests/chown/07.t#2 integrate .. //depot/projects/mpsafetty/tools/regression/fstest/tests/conf#2 integrate .. //depot/projects/mpsafetty/tools/regression/fstest/tests/link/00.t#2 integrate .. //depot/projects/mpsafetty/tools/regression/fstest/tests/misc.sh#3 integrate .. //depot/projects/mpsafetty/tools/regression/fstest/tests/open/16.t#2 integrate .. //depot/projects/mpsafetty/tools/regression/fstest/tests/open/23.t#2 integrate .. //depot/projects/mpsafetty/tools/regression/fstest/tests/rename/19.t#2 integrate .. //depot/projects/mpsafetty/tools/regression/fstest/tests/rename/21.t#2 integrate .. //depot/projects/mpsafetty/tools/regression/fstest/tests/rmdir/12.t#2 integrate .. //depot/projects/mpsafetty/tools/regression/fstest/tests/truncate/13.t#2 integrate .. //depot/projects/mpsafetty/tools/regression/fstest/tests/unlink/08.t#2 integrate .. //depot/projects/mpsafetty/tools/regression/zfs/LICENSE#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/misc.sh#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/add/cache.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/add/disks.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/add/doesnt_exist.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/add/files.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/add/log.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/add/mirror.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/add/option-f_inuse.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/add/option-f_replication_level_mismatch_0.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/add/option-f_replication_level_mismatch_1.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/add/option-f_size_mismatch.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/add/option-f_type_mismatch.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/add/option-n.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/add/raidz1.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/add/raidz2.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/add/spare.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/attach/log.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/attach/mirror.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/attach/option-f_inuse.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/create/already_exists.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/create/automount.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/create/cache.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/create/disks.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/create/files.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/create/log.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/create/mirror.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/create/option-R.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/create/option-f_inuse.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/create/option-f_replication_level_mismatch_0.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/create/option-f_replication_level_mismatch_1.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/create/option-f_size_mismatch.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/create/option-f_type_mismatch.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/create/option-m.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/create/option-n.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/create/option-o.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/create/raidz1.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/create/raidz2.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/create/spare.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/offline/io.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/offline/log.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/offline/mirror.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/offline/option-t.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/offline/raidz1.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/offline/raidz2.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/remove/cache.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/remove/spare.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/replace/cache.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/replace/disk.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/replace/log.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/replace/mirror.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/replace/raidz1.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/replace/raidz2.t#1 branch .. //depot/projects/mpsafetty/tools/regression/zfs/zpool/replace/spare.t#1 branch .. //depot/projects/mpsafetty/usr.bin/calendar/calendars/calendar.freebsd#4 integrate .. //depot/projects/mpsafetty/usr.bin/killall/killall.c#2 integrate .. //depot/projects/mpsafetty/usr.bin/lsvfs/lsvfs.c#2 integrate .. //depot/projects/mpsafetty/usr.bin/window/wwend.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/Makefile#13 integrate .. //depot/projects/mpsafetty/usr.sbin/ckdist/ckdist.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/config/config.5#2 integrate .. //depot/projects/mpsafetty/usr.sbin/config/config.h#2 integrate .. //depot/projects/mpsafetty/usr.sbin/config/config.y#3 integrate .. //depot/projects/mpsafetty/usr.sbin/config/configvers.h#2 integrate .. //depot/projects/mpsafetty/usr.sbin/config/lang.l#3 integrate .. //depot/projects/mpsafetty/usr.sbin/config/mkmakefile.c#2 integrate .. //depot/projects/mpsafetty/usr.sbin/cron/crontab/Makefile#3 integrate .. //depot/projects/mpsafetty/usr.sbin/cron/crontab/crontab.c#3 integrate .. //depot/projects/mpsafetty/usr.sbin/cron/lib/Makefile#3 integrate .. //depot/projects/mpsafetty/usr.sbin/cron/lib/misc.c#3 integrate .. //depot/projects/mpsafetty/usr.sbin/dumpcis/Makefile#1 branch .. //depot/projects/mpsafetty/usr.sbin/dumpcis/dumpcis.8#1 branch .. //depot/projects/mpsafetty/usr.sbin/dumpcis/main.c#1 branch .. //depot/projects/mpsafetty/usr.sbin/dumpcis/printcis.c#1 branch .. //depot/projects/mpsafetty/usr.sbin/dumpcis/readcis.c#1 branch .. //depot/projects/mpsafetty/usr.sbin/dumpcis/readcis.h#1 branch .. //depot/projects/mpsafetty/usr.sbin/ntp/doc/ntp-keygen.8#2 integrate .. //depot/projects/mpsafetty/usr.sbin/pccard/Makefile#2 delete .. //depot/projects/mpsafetty/usr.sbin/pccard/Makefile.inc#2 delete .. //depot/projects/mpsafetty/usr.sbin/pccard/dumpcis/Makefile#2 delete .. //depot/projects/mpsafetty/usr.sbin/pccard/dumpcis/dumpcis.8#2 delete .. //depot/projects/mpsafetty/usr.sbin/pccard/dumpcis/main.c#2 delete .. //depot/projects/mpsafetty/usr.sbin/pccard/pccardc/Makefile#2 delete .. //depot/projects/mpsafetty/usr.sbin/pccard/pccardc/beep.c#2 delete .. //depot/projects/mpsafetty/usr.sbin/pccard/pccardc/dumpcis.c#2 delete .. //depot/projects/mpsafetty/usr.sbin/pccard/pccardc/dumpcisfile.c#2 delete .. //depot/projects/mpsafetty/usr.sbin/pccard/pccardc/enabler.c#2 delete .. //depot/projects/mpsafetty/usr.sbin/pccard/pccardc/pccardc.8#2 delete .. //depot/projects/mpsafetty/usr.sbin/pccard/pccardc/pccardc.c#2 delete .. //depot/projects/mpsafetty/usr.sbin/pccard/pccardc/pccardmem.c#2 delete .. //depot/projects/mpsafetty/usr.sbin/pccard/pccardc/power.c#2 delete >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Nov 25 13:00:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 327741065673; Tue, 25 Nov 2008 13:00:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EA9DC1065672 for ; Tue, 25 Nov 2008 13:00:31 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DCFBD8FC17 for ; Tue, 25 Nov 2008 13:00:31 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAPD0Vub050953 for ; Tue, 25 Nov 2008 13:00:31 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAPD0UWa050950 for perforce@freebsd.org; Tue, 25 Nov 2008 13:00:30 GMT (envelope-from zec@tel.fer.hr) Date: Tue, 25 Nov 2008 13:00:30 GMT Message-Id: <200811251300.mAPD0UWa050950@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153522 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, 25 Nov 2008 13:00:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=153522 Change 153522 by zec@zec_tpx32 on 2008/11/25 12:59:55 Reduce whitespace / NOP churn. Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#29 edit .. //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#12 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_nbr.c#16 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#12 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#29 (text+ko) ==== @@ -344,7 +344,6 @@ V_tcp_sack_globalmaxholes = 65536; V_tcp_sack_globalholes = 0; - hashsize = TCBHASHSIZE; tcp_delacktime = TCPTV_DELACK; tcp_keepinit = TCPTV_KEEP_INIT; tcp_keepidle = TCPTV_KEEP_IDLE; @@ -361,6 +360,7 @@ INP_INFO_LOCK_INIT(&V_tcbinfo, "tcp"); LIST_INIT(&V_tcb); V_tcbinfo.ipi_listhead = &V_tcb; + hashsize = TCBHASHSIZE; TUNABLE_INT_FETCH("net.inet.tcp.tcbhashsize", &hashsize); if (!powerof2(hashsize)) { printf("WARNING: TCB hash size not a power of 2\n"); ==== //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#12 (text+ko) ==== @@ -78,10 +78,7 @@ int _ip_checkinterface; u_short _ip_id; -#if 0 /* NOTYET */ uma_zone_t _ipq_zone; -#endif - int _nipq; /* Total # of reass queues */ int _maxnipq; /* Admin. limit on # reass queues. */ int _maxfragsperpacket; ==== //depot/projects/vimage-commit2/src/sys/netinet6/nd6_nbr.c#16 (text+ko) ==== @@ -78,7 +78,6 @@ #define SDL(s) ((struct sockaddr_dl *)s) struct dadq; - static struct dadq *nd6_dad_find(struct ifaddr *); static void nd6_dad_starttimer(struct dadq *, int); static void nd6_dad_stoptimer(struct dadq *); ==== //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#12 (text+ko) ==== @@ -106,8 +106,8 @@ int _ip6_mcast_pmtu; int _ip6_v6only; int _ip6_keepfaith; + int _ip6stealth; time_t _ip6_log_time; - int _ip6stealth; int _nd6_onlink_ns_rfc4861; int _pmtu_expire; From owner-p4-projects@FreeBSD.ORG Tue Nov 25 13:28:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2E1911065672; Tue, 25 Nov 2008 13:28:00 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id CCE7D106564A for ; Tue, 25 Nov 2008 13:27:59 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BF3F98FC1B for ; Tue, 25 Nov 2008 13:27:59 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAPDRxak054068 for ; Tue, 25 Nov 2008 13:27:59 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAPDRxus054066 for perforce@freebsd.org; Tue, 25 Nov 2008 13:27:59 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 25 Nov 2008 13:27:59 GMT Message-Id: <200811251327.mAPDRxus054066@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 153523 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, 25 Nov 2008 13:28:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=153523 Change 153523 by rene@rene_self on 2008/11/25 13:27:54 Incorporate Remko's comments. Checked build, whitespace. Affected files ... .. //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing/article.sgml#7 edit Differences ... ==== //depot/projects/docproj_nl/nl_NL.ISO8859-1/articles/contributing/article.sgml#7 (text+ko) ==== @@ -46,8 +46,8 @@ In tegenstelling tot wat sommige mensen u laten geloven, hoeft u geen doorgewinterde programmeur of een goede vriend van het coreteam van &os; te zijn opdat uw bijdragen geaccepteerd worden. Een groot - en groeiend aantal internationale contribuanten, van een grote - variëteit aan leeftijden en technische expertisegebieden, + en groeiend aantal internationale bijdragende vrijwilligers, van een + grote variëteit aan leeftijden en technische expertisegebieden, ontwikkelen &os;. Er is altijd meer werk te doen dan dat er mensen zijn om het uit te voeren, en meer hulp wordt altijd gewaardeerd. @@ -266,21 +266,19 @@ &os; Handboek voor meer informatie over deze en andere mailinglijsten. - Als u een bug vindt of een specifieke verandering - opstuurt, gebruik dan alstublieft het programma - &man.send-pr.1; of het WEB-gebaseerde - equivalent om het te rapporteren. Probeer om elk - veld van het bugrapport in te vullen. Voeg patches direct bij - het rapport tenzij ze 65kB overschrijden. Als de patch - geschikt is om op de broncodeboom te worden toegepast, vermeld - dan [PATCH] in het overzicht van het - rapport. Wanneer u patches bijvoegt, gebruik dan - geen knippen-en-plakken omdat - knippen-en-plakken tabs in spaties omzet en de patches - onbruikbaar maakt. Overweeg om patches te comprimeren en - &man.uuencode.1; te gebruiken als ze 20kB - overschrijden. + Als u een bug vindt of een specifieke verandering opstuurt, + gebruik dan alstublieft het programma &man.send-pr.1; of het + webgebaseerde + equivalent om het te rapporteren. Probeer om elk veld + van het bugrapport in te vullen. Voeg patches direct bij het + rapport tenzij ze 65kB overschrijden. Als de patch geschikt is + om op de broncodeboom te worden toegepast, vermeld dan + [PATCH] in het overzicht van het rapport. + Wanneer u patches bijvoegt, gebruik dan + geen knippen-en-plakken omdat + knippen-en-plakken tabs in spaties omzet en de patches + onbruikbaar maakt. Overweeg om patches te comprimeren en + &man.uuencode.1; te gebruiken als ze 20kB overschrijden. Na het opsturen van een rapport dient u een bevestiging met daarbij een volgnummer te krijgen. Bewaar dit volgnummer zodat @@ -293,7 +291,7 @@ Als u geen bevestiging ontvangt binnen een redelijke tijd (3 dagen tot een week, afhankelijk van uw emailverbinding) of als u, om enige reden, het commando &man.send-pr.1; niet kunt - gebruiken, dan kunt u iemand vragen om het voor u op ter sturen + gebruiken, dan kunt u iemand vragen om het voor u op te sturen door mail te sturen naar de &a.bugs;. Zie ook Aannemende dat u in staat bent om redelijk recente broncode - veilig kunt stellen om uw veranderingen op te baseren, is de + veilig te stellen om uw veranderingen op te baseren, is de volgende stap het produceren van een verzameling diffs om naar de onderhoudsmensen van &os; te sturen. Dit wordt gedaan met het commando &man.diff.1;. From owner-p4-projects@FreeBSD.ORG Tue Nov 25 14:39:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 53DC11065677; Tue, 25 Nov 2008 14:39:17 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0DD3C1065675 for ; Tue, 25 Nov 2008 14:39:17 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 01FD78FC0C for ; Tue, 25 Nov 2008 14:39:17 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAPEdGMZ061164 for ; Tue, 25 Nov 2008 14:39:16 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAPEdGrq061162 for perforce@freebsd.org; Tue, 25 Nov 2008 14:39:16 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 25 Nov 2008 14:39:16 GMT Message-Id: <200811251439.mAPEdGrq061162@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 153525 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, 25 Nov 2008 14:39:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=153525 Change 153525 by hselasky@hselasky_laptop001 on 2008/11/25 14:39:09 Remove misplaced USB ID. Be more verbose printing out RF version. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#19 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/wlan/if_ural2.c#19 (text+ko) ==== @@ -171,7 +171,6 @@ {USB_VPI(USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2570, 0)}, {USB_VPI(USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2570_2, 0)}, {USB_VPI(USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2570_3, 0)}, - {USB_VPI(USB_VENDOR_RALINK, USB_PRODUCT_RALINK_RT2573, 0)}, {USB_VPI(USB_VENDOR_SIEMENS2, USB_PRODUCT_SIEMENS2_WL54G, 0)}, {USB_VPI(USB_VENDOR_SMC, USB_PRODUCT_SMC_2862WG, 0)}, {USB_VPI(USB_VENDOR_SPHAIRON, USB_PRODUCT_SPHAIRON_UB801R, 0)}, @@ -780,8 +779,9 @@ /* retrieve MAC address and various other things from EEPROM */ ural_cfg_read_eeprom(sc); - printf("%s: MAC/BBP RT2570 (rev 0x%02x), RF %s\n", - sc->sc_name, sc->sc_asic_rev, ural_get_rf(sc->sc_rf_rev)); + printf("%s: MAC/BBP RT2570 (rev 0x%02x), RF %s (0x%02x)\n", + sc->sc_name, sc->sc_asic_rev, ural_get_rf(sc->sc_rf_rev), + sc->sc_rf_rev); mtx_unlock(&sc->sc_mtx); @@ -954,8 +954,11 @@ static const char * ural_get_rf(int rev) { + ; /* style fix */ + switch (rev) { - case RAL_RF_2522:return "RT2522"; + case RAL_RF_2522: + return "RT2522"; case RAL_RF_2523: return "RT2523"; case RAL_RF_2524: From owner-p4-projects@FreeBSD.ORG Tue Nov 25 14:42:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7F1341065679; Tue, 25 Nov 2008 14:42:20 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 433841065675 for ; Tue, 25 Nov 2008 14:42:20 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 379B58FC17 for ; Tue, 25 Nov 2008 14:42:20 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAPEgKht061426 for ; Tue, 25 Nov 2008 14:42:20 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAPEgK49061424 for perforce@freebsd.org; Tue, 25 Nov 2008 14:42:20 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 25 Nov 2008 14:42:20 GMT Message-Id: <200811251442.mAPEgK49061424@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 153526 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, 25 Nov 2008 14:42:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=153526 Change 153526 by hselasky@hselasky_laptop001 on 2008/11/25 14:41:29 Remove non-executed code. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/storage/ustorage2_fs.c#13 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/storage/ustorage2_fs.c#13 (text+ko) ==== @@ -1308,6 +1308,7 @@ static uint8_t ustorage_fs_synchronize_cache(struct ustorage_fs_softc *sc) { +#if 0 struct ustorage_fs_lun *currlun = sc->sc_transfer.currlun; uint8_t rc; @@ -1318,6 +1319,7 @@ if (rc) { currlun->sense_data = SS_WRITE_ERROR; } +#endif return (0); } From owner-p4-projects@FreeBSD.ORG Tue Nov 25 14:50:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3BA5B1065673; Tue, 25 Nov 2008 14:50:29 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DB5721065670 for ; Tue, 25 Nov 2008 14:50:28 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CE7888FC1E for ; Tue, 25 Nov 2008 14:50:28 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAPEoSCW062074 for ; Tue, 25 Nov 2008 14:50:28 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAPEoS1g062072 for perforce@freebsd.org; Tue, 25 Nov 2008 14:50:28 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 25 Nov 2008 14:50:28 GMT Message-Id: <200811251450.mAPEoS1g062072@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 153527 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, 25 Nov 2008 14:50:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=153527 Change 153527 by hselasky@hselasky_laptop001 on 2008/11/25 14:49:58 Revert and integrate some files. Affected files ... .. //depot/projects/usb/src/sys/modules/usb2/bluetooth/Makefile#6 integrate .. //depot/projects/usb/src/sys/modules/usb2/bluetooth_fw/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/bluetooth_ng/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/controller/Makefile#9 integrate .. //depot/projects/usb/src/sys/modules/usb2/controller_at91dci/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/controller_ehci/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/controller_musb/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/controller_ohci/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/controller_uhci/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/controller_uss820dci/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/core/Makefile#9 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet/Makefile#7 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet_aue/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet_axe/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet_cdce/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet_cue/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet_dav/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet_kue/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/ethernet_rue/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/image/Makefile#6 integrate .. //depot/projects/usb/src/sys/modules/usb2/input/Makefile#7 integrate .. //depot/projects/usb/src/sys/modules/usb2/input_hid/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/input_kbd/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/input_ms/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/misc/Makefile#6 integrate .. //depot/projects/usb/src/sys/modules/usb2/misc_dbp/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/misc_fm/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/ndis/Makefile#6 integrate .. //depot/projects/usb/src/sys/modules/usb2/quirk/Makefile#6 integrate .. //depot/projects/usb/src/sys/modules/usb2/scanner/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial/Makefile#6 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_ark/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_bsa/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_bser/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_chcom/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_cycom/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_foma/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_ftdi/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_gensa/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_ipaq/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_lpt/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_mct/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_modem/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_moscom/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_plcom/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_visor/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/serial_vscom/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/sound/Makefile#6 integrate .. //depot/projects/usb/src/sys/modules/usb2/storage/Makefile#6 integrate .. //depot/projects/usb/src/sys/modules/usb2/storage_ata/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/storage_fs/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/storage_mass/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/storage_rio/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/template/Makefile#6 integrate .. //depot/projects/usb/src/sys/modules/usb2/wlan/Makefile#7 integrate .. //depot/projects/usb/src/sys/modules/usb2/wlan_ral/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/wlan_rum/Makefile#3 integrate .. //depot/projects/usb/src/sys/modules/usb2/wlan_zyd/Makefile#3 integrate .. //depot/projects/usb/src/sys/sys/bus_dma.h#5 integrate Differences ... ==== //depot/projects/usb/src/sys/modules/usb2/bluetooth/Makefile#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/bluetooth_fw/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/bluetooth_ng/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/controller/Makefile#9 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/controller_at91dci/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/controller_ehci/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/controller_musb/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/controller_ohci/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/controller_uhci/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/controller_uss820dci/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/core/Makefile#9 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/ethernet/Makefile#7 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/ethernet_aue/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/ethernet_axe/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/ethernet_cdce/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/ethernet_cue/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/ethernet_dav/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/ethernet_kue/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/ethernet_rue/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/image/Makefile#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/input/Makefile#7 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/input_hid/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/input_kbd/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/input_ms/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/misc/Makefile#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/misc_dbp/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/misc_fm/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/ndis/Makefile#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/quirk/Makefile#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/scanner/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/serial/Makefile#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/serial_ark/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/serial_bsa/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/serial_bser/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/serial_chcom/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/serial_cycom/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/serial_foma/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/serial_ftdi/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/serial_gensa/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/serial_ipaq/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/serial_lpt/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/serial_mct/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/serial_modem/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/serial_moscom/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/serial_plcom/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/serial_visor/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/serial_vscom/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/sound/Makefile#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/storage/Makefile#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/storage_ata/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/storage_fs/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/storage_mass/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/storage_rio/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/template/Makefile#6 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/wlan/Makefile#7 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/wlan_ral/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/wlan_rum/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/modules/usb2/wlan_zyd/Makefile#3 (text+ko) ==== ==== //depot/projects/usb/src/sys/sys/bus_dma.h#5 (text+ko) ==== From owner-p4-projects@FreeBSD.ORG Tue Nov 25 15:17:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 093311065676; Tue, 25 Nov 2008 15:17:57 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C0F1E1065670 for ; Tue, 25 Nov 2008 15:17:56 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B5D7A8FC13 for ; Tue, 25 Nov 2008 15:17:56 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAPFHuCg066917 for ; Tue, 25 Nov 2008 15:17:56 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAPFHucA066915 for perforce@freebsd.org; Tue, 25 Nov 2008 15:17:56 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 25 Nov 2008 15:17:56 GMT Message-Id: <200811251517.mAPFHucA066915@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 153528 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, 25 Nov 2008 15:17:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=153528 Change 153528 by hselasky@hselasky_laptop001 on 2008/11/25 15:16:56 Make sure that the blocksize is a factor of the number of bytes we insert per isochronous frame. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.c#18 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.c#18 (text+ko) ==== @@ -1067,6 +1067,10 @@ sample_size = ((chan->p_asf1d->bNrChannels * chan->p_asf1d->bBitResolution) / 8); + /* + * NOTE: "chan->bytes_per_frame" + * should not be zero! + */ chan->bytes_per_frame = ((rate / fps) * sample_size); if (sc->sc_sndstat_valid) { @@ -1432,6 +1436,16 @@ RANGE(blocksize, 128, max / 2); + /* + * Make sure that the blocksize is a factor of the number of bytes + * we insert per isochronous frame. + */ + blocksize += (ch->bytes_per_frame - blocksize) % ch->bytes_per_frame; + if (blocksize > (max / 2)) { + /* should not happen */ + DPRINTFN(0, "blocksize overflow!\n"); + blocksize = (max / 2); + } blockcount = max / blocksize; RANGE(blockcount, 2, 512); From owner-p4-projects@FreeBSD.ORG Tue Nov 25 17:18:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6C9731065675; Tue, 25 Nov 2008 17:18:00 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D73991065677 for ; Tue, 25 Nov 2008 17:17:59 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CC90D8FC1B for ; Tue, 25 Nov 2008 17:17:59 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAPHHxqf088796 for ; Tue, 25 Nov 2008 17:17:59 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAPHHxeX088794 for perforce@freebsd.org; Tue, 25 Nov 2008 17:17:59 GMT (envelope-from sam@freebsd.org) Date: Tue, 25 Nov 2008 17:17:59 GMT Message-Id: <200811251717.mAPHHxeX088794@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 153536 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, 25 Nov 2008 17:18:01 -0000 http://perforce.freebsd.org/chv.cgi?CH=153536 Change 153536 by sam@sam_ebb on 2008/11/25 17:17:41 Refactor code along adress family-boundaries: o move af-specific code into the protocol area and add methods to the llatbl o rewrite the public api's to use per-af methods instead of handling in common code w/ switch statements, etc. o restructure llatbl entries so af-specific state is managed in private code; this allows us, for example, to not take a hit for ipv6 addresses in the ipv4 data structures o expose the l3 address in table entries with macros for those cases where public access is required (should still be limited to within af code) o rename sysctl_dumparp to lltable_sysctl_dumparp o remove private zone for lltable entries; just use malloc for now Tested with ipv4. Compiles+boots w/ ipv6 but haven't tested operation. Needs more work: e.g. the lookup method added last and may make the rtcheck and new methods unneeded. Per-af code should probably move to new files in netinet and netinet6; it's in in.c and in6.c for the moment. L3_ADDR* macros probably need to be renamed to something less common. Reviewed by: qingli Affected files ... .. //depot/projects/arp-v2/src/sys/net/if_llatbl.c#9 edit .. //depot/projects/arp-v2/src/sys/net/if_llatbl.h#6 edit .. //depot/projects/arp-v2/src/sys/net/rtsock.c#8 edit .. //depot/projects/arp-v2/src/sys/netinet/if_ether.c#19 edit .. //depot/projects/arp-v2/src/sys/netinet/in.c#7 edit .. //depot/projects/arp-v2/src/sys/netinet6/in6.c#9 edit .. //depot/projects/arp-v2/src/sys/netinet6/nd6.c#9 edit .. //depot/projects/arp-v2/src/sys/netinet6/nd6_nbr.c#8 edit Differences ... ==== //depot/projects/arp-v2/src/sys/net/if_llatbl.c#9 (text+ko) ==== @@ -53,145 +53,16 @@ MALLOC_DEFINE(M_LLTABLE, "lltable", "link level address tables"); -static uma_zone_t llezone; static SLIST_HEAD(, lltable) lltables = SLIST_HEAD_INITIALIZER(lltables); -int sysctl_dumparp(int af, struct sysctl_req *wr); extern void arprequest(struct ifnet *, struct in_addr *, struct in_addr *, u_char *); -/* ARGSUSED*/ -static void -lla_init(void *dummy __unused) -{ - /* - * create uma zone for L2/L3 cache - */ - llezone = uma_zcreate("llentry", sizeof(struct llentry), NULL, NULL, - NULL, NULL, UMA_ALIGN_PTR, 0); -} -SYSINIT(lla, SI_SUB_INIT_IF, SI_ORDER_FIRST, lla_init, NULL); - -static int -dump_llcache(struct lltable *llt, int af, struct sysctl_req *wr) -{ - struct ifnet *ifp = llt->llt_ifp; - struct llentry *lle; - struct rt_msghdr *rtm = NULL; - struct sockaddr_dl *sdl = NULL; - uint8_t *msg = NULL; - int msgsize = 0; - int error = 0; - int i; -#ifdef INET - struct { - struct rt_msghdr rtm; - struct sockaddr_inarp sin; - struct sockaddr_dl sdl; - } arpc; -#endif -#ifdef INET6 - struct { - struct rt_msghdr rtm; - struct sockaddr_in6 sin6; - struct sockaddr_dl sdl; - } ndpc; -#endif - - switch (af) { -#ifdef INET - case AF_INET: - rtm = &arpc.rtm; - sdl = &arpc.sdl; - msgsize = sizeof(arpc); - msg = (uint8_t *)&arpc; - break; -#endif -#ifdef INET6 - case AF_INET6: - rtm = &ndpc.rtm; - sdl = &ndpc.sdl; - msgsize = sizeof(ndpc); - msg = (uint8_t *)&ndpc; - break; -#endif - default: - printf("%s: unknown address family", __func__); - return EINVAL; - } - - /* XXXXX - * current IFNET_RLOCK() is mapped to IFNET_WLOCK() - * so it is okay to use this ASSERT, change it when - * IFNET lock is finalized - */ - IFNET_WLOCK_ASSERT(); - - for (i = 0; i < LLTBL_HASHTBL_SIZE; i++) { - LIST_FOREACH(lle, &llt->lle_head[i], lle_next) { - if (lle->la_flags & LLE_DELETED) /* skip deleted entries */ - continue; - /* - * produce a msg made of: - * struct rt_msghdr; - * struct sockaddr_inarp; (IPv4) struct sockaddr_in6 (IPv6) - * struct sockaddr_dl; - */ - bzero(msg, msgsize); - rtm->rtm_msglen = msgsize; - - switch (af) { -#ifdef INET - case AF_INET: - arpc.sin.sin_family = AF_INET; - arpc.sin.sin_len = sizeof(arpc.sin); - arpc.sin.sin_addr.s_addr = lle->l3_addr4.sin_addr.s_addr; - break; -#endif -#ifdef INET6 - case AF_INET6: - ndpc.sin6.sin6_family = AF_INET6; - ndpc.sin6.sin6_len = sizeof(ndpc.sin6); - bcopy(&lle->l3_addr6, &ndpc.sin6, lle->l3_addr6.sin6_len); - break; -#endif - } - /* publish */ - if (lle->la_flags & LLE_PUB) { - rtm->rtm_flags |= RTF_ANNOUNCE; - /* proxy only */ - if ((af == AF_INET) && (lle->la_flags & LLE_PROXY)) - arpc.sin.sin_other = SIN_PROXY; - } - - if (lle->la_flags & LLE_VALID) { /* valid MAC */ - sdl->sdl_family = AF_LINK; - sdl->sdl_len = sizeof(*sdl); - sdl->sdl_alen = ifp->if_addrlen; - sdl->sdl_index = ifp->if_index; - sdl->sdl_type = ifp->if_type; - bcopy(&lle->ll_addr, LLADDR(sdl), ifp->if_addrlen); - } - rtm->rtm_rmx.rmx_expire = - lle->la_flags & LLE_STATIC ? 0 : lle->la_expire; - rtm->rtm_flags |= (RTF_LLINFO | RTF_HOST); - if (lle->la_flags & LLE_STATIC) - rtm->rtm_flags |= RTF_STATIC; - rtm->rtm_index = ifp->if_index; - error = SYSCTL_OUT(wr, msg, msgsize); - if (error) - break; - } - } - - return (error); -} - /* - * glue to dump arp tables + * Dump arp state for a specific address family. */ int -sysctl_dumparp(int af, struct sysctl_req *wr) +lltable_sysctl_dumparp(int af, struct sysctl_req *wr) { struct lltable *llt; int error = 0; @@ -199,7 +70,7 @@ IFNET_RLOCK(); SLIST_FOREACH(llt, &lltables, llt_link) { if (llt->llt_af == af) { - error = dump_llcache(llt, af, wr); + error = llt->llt_dump(llt, wr); if (error != 0) goto done; } @@ -215,17 +86,16 @@ * such as arptimer() and nd6_llinfo_timer(), and * the caller does the locking. */ -int +void llentry_free(struct llentry *lle) { - KASSERT(lle != NULL, ("%s: lle is NULL", __func__)); + struct lltable *llt = lle->lle_tbl; LIST_REMOVE(lle, lle_next); if (lle->la_hold != NULL) m_freem(lle->la_hold); - uma_zfree(llezone, lle); - return 0; + llt->llt_free(llt, lle); } /* @@ -233,9 +103,10 @@ * Since lltables collects from all of the intefaces, * the caller of this function must acquire IFNET_WLOCK(). */ -void lltable_free(struct lltable *llt) +void +lltable_free(struct lltable *llt) { - struct llentry *lle; + struct llentry *lle, *next; int i; KASSERT(llt != NULL, ("%s: llt is NULL", __func__)); @@ -245,7 +116,7 @@ IFNET_WUNLOCK(); for (i=0; i < LLTBL_HASHTBL_SIZE; i++) { - LIST_FOREACH(lle, &llt->lle_head[i], lle_next) { + LIST_FOREACH_SAFE(lle, &llt->lle_head[i], lle_next, next) { callout_drain(&lle->la_timer); llentry_free(lle); } @@ -278,7 +149,6 @@ IFNET_RUNLOCK(); } - /* * Create a new lltable. */ @@ -304,141 +174,14 @@ return (llt); } - -/* - * Generic link layer address lookup function, replacement - * of the old "arplookup" - */ -struct llentry * -lla_lookup(struct lltable *llt, u_int flags, struct sockaddr *l3addr) -{ - struct ifnet *ifp; - struct llentry *lle; - struct llentries *lleh; - struct rtentry *rt; - u_int hashkey; -#ifdef INET6 - char ip6buf[INET6_ADDRSTRLEN]; -#endif - - KASSERT(llt != NULL, ("%s: llt is NULL", __func__)); - KASSERT(l3addr != NULL, ("%s: L3 address is NULL", __func__)); - - ifp = llt->llt_ifp; - switch (l3addr->sa_family) { -#ifdef INET - case AF_INET: - hashkey = ((struct sockaddr_in *)l3addr)->sin_addr.s_addr; - break; -#endif -#ifdef INET6 - case AF_INET6: - hashkey = ((struct sockaddr_in6 *)l3addr)->sin6_addr.s6_addr32[3]; - break; -#endif - default: - return NULL; - } - - lleh = &llt->lle_head[LLATBL_HASH(hashkey, LLTBL_HASHMASK)]; - LIST_FOREACH(lle, lleh, lle_next) { - if (lle->la_flags & LLE_DELETED) - continue; - if (bcmp((void *)&lle->l3_addr, l3addr, l3addr->sa_len) == 0) - break; - } - - if (lle == NULL) { - if (!(flags & LLE_CREATE)) - return (NULL); - - /* - * a route that covers the given address must have been - * installed 1st because we are doing a resolution - */ - if (!(flags & LLE_IFADDR)) { - rt = rtalloc1(l3addr, 0, 0); - if ((rt == NULL) || (rt->rt_flags & RTF_GATEWAY) || (rt->rt_ifp != ifp)) { -#ifdef INET6 - if (l3addr->sa_family == AF_INET6) { - /* - * Creating a ND6 cache for an IPv6 neighbor - * that is not covered by our own prefix. - */ - struct ifaddr *ifa = - ifaof_ifpforaddr((struct sockaddr *)l3addr, ifp); - if (ifa != NULL) { - if (rt) - rtfree(rt); - goto lla_lookup_1; - } - } -#endif - switch (l3addr->sa_family) { -#ifdef INET - case AF_INET: - log(LOG_INFO, "IPv4 address: \"%s\" is not on the network\n", \ - inet_ntoa(((struct sockaddr_in *)l3addr)->sin_addr)); - break; -#endif -#ifdef INET6 - case AF_INET6: - log(LOG_INFO, "IPv6 address: \"%s\" is not on the network\n", \ - ip6_sprintf(ip6buf, &((struct sockaddr_in6 *)l3addr)->sin6_addr)); - break; -#endif - - } - if (rt) - rtfree(rt); - return (NULL); - } - rtfree(rt); - } -#ifdef INET6 -lla_lookup_1: -#endif - lle = uma_zalloc(llezone, M_DONTWAIT | M_ZERO); - if (lle == NULL) { - log(LOG_INFO, "lla_lookup: new lle malloc failed\n"); - return (NULL); - } - - callout_init(&lle->la_timer, CALLOUT_MPSAFE); - - /* qing - * For IPv4 this will trigger "arpresolve" to generate - * an ARP request - */ - lle->la_expire = time_second; /* mark expired */ - lle->la_flags = flags & ~LLE_CREATE; - - bcopy(l3addr, &lle->l3_addr, l3addr->sa_len); - - if ((flags & (LLE_CREATE | LLE_IFADDR)) == (LLE_CREATE | LLE_IFADDR)) { - bcopy(IF_LLADDR(ifp), &lle->ll_addr, ifp->if_addrlen); - lle->la_flags |= (LLE_VALID | LLE_STATIC); - } - - lle->lle_tbl = llt; - lle->lle_head = lleh; - LIST_INSERT_HEAD(lleh, lle, lle_next); - } else { - if (flags & LLE_DELETE) - lle->la_flags = LLE_DELETED; - } - - return (lle); -} - - /* * Called in route_output when adding/deleting a route to an interface. */ int lla_rt_output(struct rt_msghdr *rtm, struct rt_addrinfo *info) { - struct sockaddr_dl *dl = (struct sockaddr_dl *)info->rti_info[RTAX_GATEWAY]; + struct sockaddr_dl *dl = + (struct sockaddr_dl *)info->rti_info[RTAX_GATEWAY]; struct sockaddr *dst = (struct sockaddr *)info->rti_info[RTAX_DST]; struct ifnet *ifp; struct lltable *llt; ==== //depot/projects/arp-v2/src/sys/net/if_llatbl.h#6 (text+ko) ==== @@ -31,6 +31,7 @@ #include struct ifnet; +struct sysctl_req; struct rt_msghdr; struct rt_addrinfo; @@ -51,24 +52,24 @@ uint16_t ln_router; time_t ln_ntick; union { - struct sockaddr_in addr4; - struct sockaddr_in6 addr6; - } l3_addr; - union { uint64_t mac_aligned; uint16_t mac16[3]; } ll_addr; + + /* XXX af-private? */ union { struct callout ln_timer_ch; struct callout la_timer; } lle_timer; + /* NB: struct sockaddr must immediately follow */ }; #define ln_timer_ch lle_timer.ln_timer_ch #define la_timer lle_timer.la_timer -#define l3_addr4 l3_addr.addr4 -#define l3_addr6 l3_addr.addr6 +/* XXX bad name */ +#define L3_ADDR(lle) ((struct sockaddr *)(&lle[1])) +#define L3_ADDR_LEN(lle) (((struct sockaddr *)(&lle[1]))->sa_len) #ifndef LLTBL_HASHTBL_SIZE #define LLTBL_HASHTBL_SIZE 32 /* default 32 ? */ @@ -79,11 +80,21 @@ #endif struct lltable { - SLIST_ENTRY(lltable) llt_link; - struct llentries lle_head[LLTBL_HASHTBL_SIZE]; - int llt_af; - struct ifnet *llt_ifp; + SLIST_ENTRY(lltable) llt_link; + struct llentries lle_head[LLTBL_HASHTBL_SIZE]; + int llt_af; + struct ifnet *llt_ifp; + + struct llentry * (*llt_new)(const struct sockaddr *, u_int); + void (*llt_free)(struct lltable *, struct llentry *); + struct llentry * (*llt_lookup)(struct lltable *, u_int flags, + const struct sockaddr *l3addr); + int (*llt_rtcheck)(struct ifnet *, + const struct sockaddr *); + int (*llt_dump)(struct lltable *, + struct sysctl_req *); }; +MALLOC_DECLARE(M_LLTABLE); /* * flags to be passed to arplookup. @@ -100,11 +111,21 @@ #define LLATBL_HASH(key, mask) \ (((((((key >> 8) ^ key) >> 8) ^ key) >> 8) ^ key) & mask) -struct llentry *lla_lookup(struct lltable *, u_int, struct sockaddr *); -int lla_rt_output(struct rt_msghdr *, struct rt_addrinfo *); -int llentry_free(struct llentry *); - struct lltable *lltable_init(struct ifnet *, int); void lltable_free(struct lltable *); void lltable_drain(int); +int lltable_sysctl_dumparp(int, struct sysctl_req *); + +void llentry_free(struct llentry *); + +/* + * Generic link layer address lookup function. + */ +static __inline struct llentry * +lla_lookup(struct lltable *llt, u_int flags, const struct sockaddr *l3addr) +{ + return llt->llt_lookup(llt, flags, l3addr); +} + +int lla_rt_output(struct rt_msghdr *, struct rt_addrinfo *); #endif /* _NET_IF_LLATBL_H_ */ ==== //depot/projects/arp-v2/src/sys/net/rtsock.c#8 (text+ko) ==== @@ -109,8 +109,6 @@ struct rt_metrics *out); static void rt_dispatch(struct mbuf *, const struct sockaddr *); -extern int sysctl_dumparp(int af, struct sysctl_req *wr); - static void rts_init(void) { @@ -1311,7 +1309,7 @@ * take care of llinfo entries */ if (w.w_op == NET_RT_FLAGS && (RTF_LLINFO & w.w_arg)) - error = sysctl_dumparp(af, w.w_req); + error = lltable_sysctl_dumparp(af, w.w_req); break; case NET_RT_IFLIST: ==== //depot/projects/arp-v2/src/sys/netinet/if_ether.c#19 (text+ko) ==== @@ -614,8 +614,7 @@ la->la_asked = 0; la->la_preempt = V_arp_maxtries; if (la->la_hold) { - (*ifp->if_output)(ifp, la->la_hold, - (struct sockaddr *)&la->l3_addr4, NULL); + (*ifp->if_output)(ifp, la->la_hold, L3_ADDR(la), NULL); la->la_hold = 0; } } ==== //depot/projects/arp-v2/src/sys/netinet/in.c#7 (text+ko) ==== @@ -1019,11 +1019,207 @@ in_purgemaddrs(ifp); } +#include +#include +#include + +struct in_llentry { + struct llentry base; + struct sockaddr_in l3_addr4; +}; + +static struct llentry * +in_lltable_new(const struct sockaddr *l3addr, u_int flags) +{ + struct in_llentry *lle; + + lle = malloc(sizeof(struct in_llentry), M_LLTABLE, M_DONTWAIT | M_ZERO); + if (lle == NULL) /* NB: caller generates msg */ + return NULL; + + callout_init(&lle->base.la_timer, CALLOUT_MPSAFE); + /* qing + * For IPv4 this will trigger "arpresolve" to generate + * an ARP request + */ + lle->base.la_expire = time_second; /* mark expired */ + lle->l3_addr4 = *(const struct sockaddr_in *)l3addr; + + return &lle->base; +} + +/* + * Deletes an address from the address table. + * This function is called by the timer functions + * such as arptimer() and nd6_llinfo_timer(), and + * the caller does the locking. + */ +static void +in_lltable_free(struct lltable *llt, struct llentry *lle) +{ + free(lle, M_LLTABLE); +} + +static int +in_lltable_rtcheck(struct ifnet *ifp, const struct sockaddr *l3addr) +{ + struct rtentry *rt; + + KASSERT(l3addr->sa_family == AF_INET, + ("sin_family %d", l3addr->sa_family)); + + /* XXX rtalloc1 should take a const param */ + rt = rtalloc1(__DECONST(struct sockaddr *, l3addr), 0, 0); + if (rt == NULL || (rt->rt_flags & RTF_GATEWAY) || rt->rt_ifp != ifp) { + log(LOG_INFO, "IPv4 address: \"%s\" is not on the network\n", + inet_ntoa(((const struct sockaddr_in *)l3addr)->sin_addr)); + if (rt != NULL) + rtfree(rt); + return EINVAL; + } + rtfree(rt); + return 0; +} + +static struct llentry * +in_lltable_lookup(struct lltable *llt, u_int flags, const struct sockaddr *l3addr) +{ + const struct sockaddr_in *sin = (const struct sockaddr_in *)l3addr; + struct ifnet *ifp = llt->llt_ifp; + struct llentry *lle; + struct llentries *lleh; + u_int hashkey; + + KASSERT(l3addr->sa_family == AF_INET, + ("sin_family %d", l3addr->sa_family)); + + hashkey = sin->sin_addr.s_addr; + lleh = &llt->lle_head[LLATBL_HASH(hashkey, LLTBL_HASHMASK)]; + LIST_FOREACH(lle, lleh, lle_next) { + if (lle->la_flags & LLE_DELETED) + continue; + if (bcmp(L3_ADDR(lle), l3addr, sizeof(struct sockaddr_in)) == 0) + break; + } + + if (lle == NULL) { + if (!(flags & LLE_CREATE)) + return (NULL); + /* + * A route that covers the given address must have + * been installed 1st because we are doing a resolution, + * verify this. + */ + if (!(flags & LLE_IFADDR) && + in_lltable_rtcheck(ifp, l3addr) != 0) + return NULL; + + lle = in_lltable_new(l3addr, flags); + if (lle == NULL) { + log(LOG_INFO, "lla_lookup: new lle malloc failed\n"); + return NULL; + } + lle->la_flags = flags & ~LLE_CREATE; + if ((flags & (LLE_CREATE | LLE_IFADDR)) == (LLE_CREATE | LLE_IFADDR)) { + bcopy(IF_LLADDR(ifp), &lle->ll_addr, ifp->if_addrlen); + lle->la_flags |= (LLE_VALID | LLE_STATIC); + } + + lle->lle_tbl = llt; + lle->lle_head = lleh; + LIST_INSERT_HEAD(lleh, lle, lle_next); + } else { + if (flags & LLE_DELETE) + lle->la_flags = LLE_DELETED; + } + return lle; +} + +static int +in_lltable_dump(struct lltable *llt, struct sysctl_req *wr) +{ +#define SIN(lle) ((struct sockaddr_in *) L3_ADDR(lle)) + struct ifnet *ifp = llt->llt_ifp; + struct llentry *lle; + /* XXX stack use */ + struct { + struct rt_msghdr rtm; + struct sockaddr_inarp sin; + struct sockaddr_dl sdl; + } arpc; + int error, i; + + /* XXXXX + * current IFNET_RLOCK() is mapped to IFNET_WLOCK() + * so it is okay to use this ASSERT, change it when + * IFNET lock is finalized + */ + IFNET_WLOCK_ASSERT(); + + error = 0; + for (i = 0; i < LLTBL_HASHTBL_SIZE; i++) { + LIST_FOREACH(lle, &llt->lle_head[i], lle_next) { + /* skip deleted entries */ + if (lle->la_flags & LLE_DELETED) + continue; + /* + * produce a msg made of: + * struct rt_msghdr; + * struct sockaddr_inarp; (IPv4) + * struct sockaddr_dl; + */ + bzero(&arpc, sizeof(arpc)); + arpc.rtm.rtm_msglen = sizeof(arpc); + + arpc.sin.sin_family = AF_INET; + arpc.sin.sin_len = sizeof(arpc.sin); + arpc.sin.sin_addr.s_addr = SIN(lle)->sin_addr.s_addr; + + /* publish */ + if (lle->la_flags & LLE_PUB) { + arpc.rtm.rtm_flags |= RTF_ANNOUNCE; + /* proxy only */ + if (lle->la_flags & LLE_PROXY) + arpc.sin.sin_other = SIN_PROXY; + } + + if (lle->la_flags & LLE_VALID) { /* valid MAC */ + struct sockaddr_dl *sdl = &arpc.sdl; + + sdl->sdl_family = AF_LINK; + sdl->sdl_len = sizeof(*sdl); + sdl->sdl_alen = ifp->if_addrlen; + sdl->sdl_index = ifp->if_index; + sdl->sdl_type = ifp->if_type; + bcopy(&lle->ll_addr, LLADDR(sdl), ifp->if_addrlen); + } + arpc.rtm.rtm_rmx.rmx_expire = + lle->la_flags & LLE_STATIC ? 0 : lle->la_expire; + arpc.rtm.rtm_flags |= RTF_LLINFO | RTF_HOST; + if (lle->la_flags & LLE_STATIC) + arpc.rtm.rtm_flags |= RTF_STATIC; + arpc.rtm.rtm_index = ifp->if_index; + error = SYSCTL_OUT(wr, &arpc, sizeof(arpc)); + if (error) + break; + } + } + return error; +#undef SIN +} + void * in_domifattach(struct ifnet *ifp) { struct lltable *llt = lltable_init(ifp, AF_INET); + if (llt != NULL) { + llt->llt_new = in_lltable_new; + llt->llt_free = in_lltable_free; + llt->llt_rtcheck = in_lltable_rtcheck; + llt->llt_lookup = in_lltable_lookup; + llt->llt_dump = in_lltable_dump; + } return (llt); } ==== //depot/projects/arp-v2/src/sys/netinet6/in6.c#9 (text+ko) ==== @@ -2098,6 +2098,197 @@ } } +#include + +struct in6_llentry { + struct llentry base; + struct sockaddr_in6 l3_addr6; +}; + +static struct llentry * +in6_lltable_new(const struct sockaddr *l3addr, u_int flags) +{ + struct in6_llentry *lle; + + lle = malloc(sizeof(struct in6_llentry), M_LLTABLE, + M_DONTWAIT | M_ZERO); + if (lle == NULL) /* NB: caller generates msg */ + return NULL; + + callout_init(&lle->base.ln_timer_ch, CALLOUT_MPSAFE); + lle->l3_addr6 = *(const struct sockaddr_in6 *)l3addr; + + return &lle->base; +} + +/* + * Deletes an address from the address table. + * This function is called by the timer functions + * such as arptimer() and nd6_llinfo_timer(), and + * the caller does the locking. + */ +static void +in6_lltable_free(struct lltable *llt, struct llentry *lle) +{ + free(lle, M_LLTABLE); +} + +static int +in6_lltable_rtcheck(struct ifnet *ifp, const struct sockaddr *l3addr) +{ + struct rtentry *rt; + char ip6buf[INET6_ADDRSTRLEN]; + + KASSERT(l3addr->sa_family == AF_INET6, + ("sin_family %d", l3addr->sa_family)); + + /* XXX rtalloc1 should take a const param */ + rt = rtalloc1(__DECONST(struct sockaddr *, l3addr), 0, 0); + if (rt == NULL || (rt->rt_flags & RTF_GATEWAY) || rt->rt_ifp != ifp) { + struct ifaddr *ifa; + /* + * Create an ND6 cache for an IPv6 neighbor + * that is not covered by our own prefix. + */ + /* XXX ifaof_ifpforaddr should take a const param */ + ifa = ifaof_ifpforaddr(__DECONST(struct sockaddr *, l3addr), ifp); + if (ifa != NULL) { + if (rt != NULL) + rtfree(rt); + return 0; + } + log(LOG_INFO, "IPv6 address: \"%s\" is not on the network\n", + ip6_sprintf(ip6buf, &((const struct sockaddr_in6 *)l3addr)->sin6_addr)); + if (rt != NULL) + rtfree(rt); + return EINVAL; + } + rtfree(rt); + return 0; +} + +static struct llentry * +in6_lltable_lookup(struct lltable *llt, u_int flags, + const struct sockaddr *l3addr) +{ + const struct sockaddr_in6 *sin6 = (const struct sockaddr_in6 *)l3addr; + struct ifnet *ifp = llt->llt_ifp; + struct llentry *lle; + struct llentries *lleh; + u_int hashkey; + + KASSERT(l3addr->sa_family == AF_INET6, + ("sin_family %d", l3addr->sa_family)); + + hashkey = sin6->sin6_addr.s6_addr32[3]; + lleh = &llt->lle_head[LLATBL_HASH(hashkey, LLTBL_HASHMASK)]; + LIST_FOREACH(lle, lleh, lle_next) { + if (lle->la_flags & LLE_DELETED) + continue; + if (bcmp(L3_ADDR(lle), l3addr, l3addr->sa_len) == 0) + break; + } + + if (lle == NULL) { + if (!(flags & LLE_CREATE)) + return (NULL); + /* + * A route that covers the given address must have + * been installed 1st because we are doing a resolution, + * verify this. + */ + if (!(flags & LLE_IFADDR) && + in6_lltable_rtcheck(ifp, l3addr) != 0) + return NULL; + + lle = in6_lltable_new(l3addr, flags); + if (lle == NULL) { + log(LOG_INFO, "lla_lookup: new lle malloc failed\n"); + return NULL; + } + lle->la_flags = flags & ~LLE_CREATE; + if ((flags & (LLE_CREATE | LLE_IFADDR)) == (LLE_CREATE | LLE_IFADDR)) { + bcopy(IF_LLADDR(ifp), &lle->ll_addr, ifp->if_addrlen); + lle->la_flags |= (LLE_VALID | LLE_STATIC); + } + + lle->lle_tbl = llt; + lle->lle_head = lleh; + LIST_INSERT_HEAD(lleh, lle, lle_next); + } else { + if (flags & LLE_DELETE) + lle->la_flags = LLE_DELETED; + } + return lle; +} + +static int +in6_lltable_dump(struct lltable *llt, struct sysctl_req *wr) +{ + struct ifnet *ifp = llt->llt_ifp; + struct llentry *lle; + /* XXX stack use */ + struct { + struct rt_msghdr rtm; + struct sockaddr_in6 sin6; + struct sockaddr_dl sdl; + } ndpc; + int i, error; + + /* XXXXX + * current IFNET_RLOCK() is mapped to IFNET_WLOCK() + * so it is okay to use this ASSERT, change it when + * IFNET lock is finalized + */ + IFNET_WLOCK_ASSERT(); + + error = 0; + for (i = 0; i < LLTBL_HASHTBL_SIZE; i++) { + LIST_FOREACH(lle, &llt->lle_head[i], lle_next) { + /* skip deleted entries */ + if (lle->la_flags & LLE_DELETED) + continue; + /* + * produce a msg made of: + * struct rt_msghdr; + * struct sockaddr_in6 (IPv6) + * struct sockaddr_dl; + */ + bzero(&ndpc, sizeof(ndpc)); + ndpc.rtm.rtm_msglen = sizeof(ndpc); + + ndpc.sin6.sin6_family = AF_INET6; + ndpc.sin6.sin6_len = sizeof(ndpc.sin6); + bcopy(L3_ADDR(lle), &ndpc.sin6, L3_ADDR_LEN(lle)); + + /* publish */ + if (lle->la_flags & LLE_PUB) + ndpc.rtm.rtm_flags |= RTF_ANNOUNCE; + + if (lle->la_flags & LLE_VALID) { /* valid MAC */ + struct sockaddr_dl *sdl = &ndpc.sdl; + + sdl->sdl_family = AF_LINK; + sdl->sdl_len = sizeof(*sdl); + sdl->sdl_alen = ifp->if_addrlen; + sdl->sdl_index = ifp->if_index; + sdl->sdl_type = ifp->if_type; + bcopy(&lle->ll_addr, LLADDR(sdl), ifp->if_addrlen); + } + ndpc.rtm.rtm_rmx.rmx_expire = + lle->la_flags & LLE_STATIC ? 0 : lle->la_expire; + ndpc.rtm.rtm_flags |= RTF_LLINFO | RTF_HOST; + if (lle->la_flags & LLE_STATIC) + ndpc.rtm.rtm_flags |= RTF_STATIC; + ndpc.rtm.rtm_index = ifp->if_index; + error = SYSCTL_OUT(wr, &ndpc, sizeof(ndpc)); + if (error) + break; + } + } + return error; +} + void * in6_domifattach(struct ifnet *ifp) { @@ -2118,6 +2309,13 @@ ext->nd_ifinfo = nd6_ifattach(ifp); ext->scope6_id = scope6_ifattach(ifp); ext->lltable = lltable_init(ifp, AF_INET6); + if (ext->lltable != NULL) { + ext->lltable->llt_new = in6_lltable_new; + ext->lltable->llt_free = in6_lltable_free; + ext->lltable->llt_rtcheck = in6_lltable_rtcheck; + ext->lltable->llt_lookup = in6_lltable_lookup; + ext->lltable->llt_dump = in6_lltable_dump; + } return ext; } ==== //depot/projects/arp-v2/src/sys/netinet6/nd6.c#9 (text+ko) ==== @@ -61,6 +61,7 @@ #include #include +#define L3_ADDR_SIN6(le) ((struct sockaddr_in6 *) L3_ADDR(le)) #include #include #include @@ -444,7 +445,7 @@ } ndi = ND_IFINFO(ifp); - dst = &ln->l3_addr6.sin6_addr; + dst = &L3_ADDR_SIN6(ln)->sin6_addr; if ((ln->la_flags & LLE_STATIC) || (ln->la_expire > time_second)) { IF_AFDATA_UNLOCK(ifp); @@ -963,7 +964,7 @@ if (!V_ip6_forwarding) { int s; s = splnet(); - dr = defrouter_lookup(&ln->l3_addr6.sin6_addr, ln->lle_tbl->llt_ifp); + dr = defrouter_lookup(&L3_ADDR_SIN6(ln)->sin6_addr, ln->lle_tbl->llt_ifp); if (dr != NULL && dr->expire && ln->ln_state == ND6_LLINFO_STALE && gc) { @@ -994,7 +995,7 @@ * is in the Default Router List. * See a corresponding comment in nd6_na_input(). */ - rt6_flush( &ln->l3_addr6.sin6_addr, ln->lle_tbl->llt_ifp); + rt6_flush(&L3_ADDR_SIN6(ln)->sin6_addr, ln->lle_tbl->llt_ifp); } if (dr) { @@ -1454,7 +1455,7 @@ * just set the 2nd argument as the * 1st one. */ - nd6_output(ifp, ifp, m_hold, &ln->l3_addr6, NULL); + nd6_output(ifp, ifp, m_hold, L3_ADDR_SIN6(ln), NULL); } } } else if (ln->ln_state == ND6_LLINFO_INCOMPLETE) { ==== //depot/projects/arp-v2/src/sys/netinet6/nd6_nbr.c#8 (text+ko) ==== @@ -64,6 +64,7 @@ #include #include >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Tue Nov 25 17:51:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8AFB71065676; Tue, 25 Nov 2008 17:51:34 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 4F717106564A for ; Tue, 25 Nov 2008 17:51:34 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 450918FC1A for ; Tue, 25 Nov 2008 17:51:34 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAPHpX3l091463 for ; Tue, 25 Nov 2008 17:51:33 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAPHpXbW091461 for perforce@freebsd.org; Tue, 25 Nov 2008 17:51:33 GMT (envelope-from hselasky@FreeBSD.org) Date: Tue, 25 Nov 2008 17:51:33 GMT Message-Id: <200811251751.mAPHpXbW091461@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 153538 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, 25 Nov 2008 17:51:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=153538 Change 153538 by hselasky@hselasky_laptop001 on 2008/11/25 17:50:46 Fix USB audio buffer handling for 24-bit audio devices. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.c#19 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.c#19 (text+ko) ==== @@ -92,10 +92,9 @@ static uint8_t uaudio_default_bits = 32; static uint8_t uaudio_default_channels = 2; +#define UAUDIO_MINFRAMES 16 /* must be factor of 8 due HS-USB */ #define UAUDIO_NCHANBUFS 2 /* number of outstanding request */ -#define UAUDIO_NFRAMES 25 /* ms of sound in each request */ #define UAUDIO_RECURSE_LIMIT 24 /* rounds */ -#define UAUDIO_DEFAULT_BUFSZ ((2 * 96000 * 4 * 2) / (1000 / UAUDIO_NCHANBUFS)) /* bytes */ #define MAKE_WORD(h,l) (((h) << 8) | (l)) #define BIT_TEST(bm,bno) (((bm)[(bno) / 8] >> (7 - ((bno) % 8))) & 1) @@ -154,6 +153,7 @@ uint8_t *cur; /* current position in upper layer * buffer */ + uint32_t intr_size; /* in bytes */ uint32_t block_size; uint32_t sample_rate; uint32_t format; @@ -376,13 +376,13 @@ static int32_t umidi_detach(device_t dev); static const struct usb2_config - uaudio_cfg_record_full_speed[UAUDIO_NCHANBUFS] = { + uaudio_cfg_record[UAUDIO_NCHANBUFS] = { [0] = { .type = UE_ISOCHRONOUS, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ - .mh.frames = UAUDIO_NFRAMES, + .mh.frames = UAUDIO_MINFRAMES, .mh.flags = {.short_xfer_ok = 1,}, .mh.callback = &uaudio_chan_record_callback, }, @@ -392,43 +392,20 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_IN, .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ - .mh.frames = UAUDIO_NFRAMES, + .mh.frames = UAUDIO_MINFRAMES, .mh.flags = {.short_xfer_ok = 1,}, .mh.callback = &uaudio_chan_record_callback, }, }; static const struct usb2_config - uaudio_cfg_record_high_speed[UAUDIO_NCHANBUFS] = { - [0] = { - .type = UE_ISOCHRONOUS, - .endpoint = UE_ADDR_ANY, - .direction = UE_DIR_IN, - .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ - .mh.frames = (UAUDIO_NFRAMES * 8), - .mh.flags = {.short_xfer_ok = 1,}, - .mh.callback = &uaudio_chan_record_callback, - }, - - [1] = { - .type = UE_ISOCHRONOUS, - .endpoint = UE_ADDR_ANY, - .direction = UE_DIR_IN, - .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ - .mh.frames = (UAUDIO_NFRAMES * 8), - .mh.flags = {.short_xfer_ok = 1,}, - .mh.callback = &uaudio_chan_record_callback, - }, -}; - -static const struct usb2_config - uaudio_cfg_play_full_speed[UAUDIO_NCHANBUFS] = { + uaudio_cfg_play[UAUDIO_NCHANBUFS] = { [0] = { .type = UE_ISOCHRONOUS, .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ - .mh.frames = UAUDIO_NFRAMES, + .mh.frames = UAUDIO_MINFRAMES, .mh.flags = {.short_xfer_ok = 1,}, .mh.callback = &uaudio_chan_play_callback, }, @@ -438,36 +415,13 @@ .endpoint = UE_ADDR_ANY, .direction = UE_DIR_OUT, .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ - .mh.frames = UAUDIO_NFRAMES, + .mh.frames = UAUDIO_MINFRAMES, .mh.flags = {.short_xfer_ok = 1,}, .mh.callback = &uaudio_chan_play_callback, }, }; static const struct usb2_config - uaudio_cfg_play_high_speed[UAUDIO_NCHANBUFS] = { - [0] = { - .type = UE_ISOCHRONOUS, - .endpoint = UE_ADDR_ANY, - .direction = UE_DIR_OUT, - .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ - .mh.frames = (UAUDIO_NFRAMES * 8), - .mh.flags = {.short_xfer_ok = 1,}, - .mh.callback = &uaudio_chan_play_callback, - }, - - [1] = { - .type = UE_ISOCHRONOUS, - .endpoint = UE_ADDR_ANY, - .direction = UE_DIR_OUT, - .mh.bufsize = 0, /* use "wMaxPacketSize * frames" */ - .mh.frames = (UAUDIO_NFRAMES * 8), - .mh.flags = {.short_xfer_ok = 1,}, - .mh.callback = &uaudio_chan_play_callback, - }, -}; - -static const struct usb2_config uaudio_mixer_config[1] = { [0] = { .type = UE_CONTROL, @@ -693,10 +647,6 @@ struct uaudio_softc *sc = device_get_softc(device_get_parent(dev)); char status[SND_STATUSLEN]; - if (bootverbose) { - device_printf(dev, "using a default buffer " - "size of %u bytes\n", UAUDIO_DEFAULT_BUFSZ); - } uaudio_mixer_init(sc); if (sc->sc_uq_audio_swap_lr) { @@ -1054,16 +1004,13 @@ chan->iface_index = curidx; chan->iface_alt_index = alt_index; - chan->usb2_cfg = - (ep_dir == UE_DIR_IN) ? - ((fps == 1000) ? - uaudio_cfg_record_full_speed : - uaudio_cfg_record_high_speed) : - ((fps == 1000) ? - uaudio_cfg_play_full_speed : - uaudio_cfg_play_high_speed); + if (ep_dir == UE_DIR_IN) + chan->usb2_cfg = + uaudio_cfg_record; + else + chan->usb2_cfg = + uaudio_cfg_play; - sample_size = ((chan->p_asf1d->bNrChannels * chan->p_asf1d->bBitResolution) / 8); @@ -1135,21 +1082,23 @@ { struct uaudio_chan *ch = xfer->priv_sc; uint32_t *p_len = xfer->frlengths; - uint32_t total = (sndbuf_getblkcnt(ch->pcm_buf) * - sndbuf_getblksz(ch->pcm_buf)) / 2; + uint32_t total; uint32_t blockcount; uint32_t n; uint32_t offset; /* allow dynamic sizing of play buffer */ + total = ch->intr_size; + + /* allow dynamic sizing of play buffer */ blockcount = total / ch->bytes_per_frame; - /* align to 8 units */ - blockcount &= ~7; + /* align units */ + blockcount -= (blockcount % UAUDIO_MINFRAMES); /* range check - min */ if (blockcount == 0) { - blockcount = 8; + blockcount = UAUDIO_MINFRAMES; } /* range check - max */ if (blockcount > xfer->max_frame_count) { @@ -1225,21 +1174,23 @@ uint32_t *p_len = xfer->frlengths; uint32_t n; uint32_t m; - uint32_t total = (sndbuf_getblkcnt(ch->pcm_buf) * - sndbuf_getblksz(ch->pcm_buf)) / 2; + uint32_t total; uint32_t blockcount; uint32_t offset0; uint32_t offset1; /* allow dynamic sizing of play buffer */ + total = ch->intr_size; + + /* allow dynamic sizing of play buffer */ blockcount = total / ch->bytes_per_frame; - /* align to 8 units */ - blockcount &= ~7; + /* align units */ + blockcount -= (blockcount % UAUDIO_MINFRAMES); /* range check - min */ if (blockcount == 0) { - blockcount = 8; + blockcount = UAUDIO_MINFRAMES; } /* range check - max */ if (blockcount > xfer->max_frame_count) { @@ -1321,21 +1272,30 @@ { struct uaudio_chan *ch = ((dir == PCMDIR_PLAY) ? &sc->sc_play_chan : &sc->sc_rec_chan); + uint32_t buf_size; uint8_t endpoint; uint8_t iface_index; uint8_t alt_index; usb2_error_t err; - ch->buf = malloc(UAUDIO_DEFAULT_BUFSZ, M_DEVBUF, M_WAITOK | M_ZERO); + /* compute required buffer size */ + buf_size = (ch->bytes_per_frame * UAUDIO_MINFRAMES); + + /* setup interrupt interval */ + ch->intr_size = buf_size; + + /* double buffering */ + buf_size *= 2; + ch->buf = malloc(buf_size, M_DEVBUF, M_WAITOK | M_ZERO); if (ch->buf == NULL) { goto error; } - if (sndbuf_setup(b, ch->buf, UAUDIO_DEFAULT_BUFSZ) != 0) { + if (sndbuf_setup(b, ch->buf, buf_size) != 0) { goto error; } ch->start = ch->buf; - ch->end = ch->buf + UAUDIO_DEFAULT_BUFSZ; + ch->end = ch->buf + buf_size; ch->cur = ch->buf; ch->pcm_ch = c; ch->pcm_mtx = c->lock; @@ -1432,26 +1392,14 @@ uaudio_chan_set_param_fragments(struct uaudio_chan *ch, uint32_t blocksize, uint32_t blockcount) { - uint32_t max = sndbuf_getmaxsize(ch->pcm_buf); + /* we only support one size */ + blocksize = ch->intr_size; + blockcount = 2; - RANGE(blocksize, 128, max / 2); - - /* - * Make sure that the blocksize is a factor of the number of bytes - * we insert per isochronous frame. - */ - blocksize += (ch->bytes_per_frame - blocksize) % ch->bytes_per_frame; - if (blocksize > (max / 2)) { - /* should not happen */ - DPRINTFN(0, "blocksize overflow!\n"); - blocksize = (max / 2); - } - blockcount = max / blocksize; - RANGE(blockcount, 2, 512); - if ((sndbuf_getblksz(ch->pcm_buf) != blocksize) || (sndbuf_getblkcnt(ch->pcm_buf) != blockcount)) { - + DPRINTFN(1, "resizing to %u x " + "%u bytes\n", blockcount, blocksize); if (sndbuf_resize(ch->pcm_buf, blockcount, blocksize)) { DPRINTFN(0, "failed to resize sound buffer, count=%u, " "size=%u\n", blockcount, blocksize); From owner-p4-projects@FreeBSD.ORG Tue Nov 25 18:29:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DDF5D1065678; Tue, 25 Nov 2008 18:29:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A076F1065672 for ; Tue, 25 Nov 2008 18:29:12 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 94E958FC16 for ; Tue, 25 Nov 2008 18:29:12 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAPITCqh095286 for ; Tue, 25 Nov 2008 18:29:12 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAPITCLB095284 for perforce@freebsd.org; Tue, 25 Nov 2008 18:29:12 GMT (envelope-from sam@freebsd.org) Date: Tue, 25 Nov 2008 18:29:12 GMT Message-Id: <200811251829.mAPITCLB095284@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 153540 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, 25 Nov 2008 18:29:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=153540 Change 153540 by sam@sam_ebb on 2008/11/25 18:28:20 Overhaul to eliminate hardwired assumptions about memory layout; in particular the assumption we inherited from netbsd that memory is aliased at 0x10000000. With these changes we now reliably boot with PHYSADDR 0 on both Avila and Cambria boards. Affected files ... .. //depot/projects/vap/sys/arm/xscale/ixp425/avila_machdep.c#8 edit Differences ... ==== //depot/projects/vap/sys/arm/xscale/ixp425/avila_machdep.c#8 (text+ko) ==== @@ -95,6 +95,11 @@ #include #include +/* kernel text starts where we were loaded at boot */ +#define KERNEL_TEXT_OFF (KERNPHYSADDR - PHYSADDR) +#define KERNEL_TEXT_BASE (KERNBASE + KERNEL_TEXT_OFF) +#define KERNEL_TEXT_PHYS (PHYSADDR + KERNEL_TEXT_OFF) + #define KERNEL_PT_SYS 0 /* Page table for mapping proc0 zero page */ #define KERNEL_PT_IO 1 #define KERNEL_PT_IO_NUM 3 @@ -248,6 +253,8 @@ void * initarm(void *arg, void *arg2) { +#define next_chunk2(a,b) (((a) + (b)) &~ ((b)-1)) +#define next_page(a) next_chunk2(a,PAGE_SIZE) struct pv_addr kernel_l1pt; int loop, i; u_int l1pagetable; @@ -263,20 +270,35 @@ pcpu_init(pcpup, 0, sizeof(struct pcpu)); PCPU_SET(curthread, &thread0); - freemempos = 0x10200000; - /* Define a macro to simplify memory allocation */ -#define valloc_pages(var, np) \ - alloc_pages((var).pv_pa, (np)); \ - (var).pv_va = (var).pv_pa + 0xb0000000; + /* + * We allocate memory downwards from where we were loaded + * by RedBoot; first the L1 page table, then NUM_KERNEL_PTS + * entries in the L2 page table. Past that we re-align the + * allocation boundary so later data structures (stacks, etc) + * can be mapped with different attributes (write-back vs + * write-through). Note this leaves a gap for expansion + * (or might be repurposed). + */ + freemempos = KERNPHYSADDR; -#define alloc_pages(var, np) \ - freemempos -= (np * PAGE_SIZE); \ - (var) = freemempos; \ - memset((char *)(var), 0, ((np) * PAGE_SIZE)); + /* macros to simplify initial memory allocation */ +#define alloc_pages(var, np) do { \ + freemempos -= (np * PAGE_SIZE); \ + (var) = freemempos; \ + /* NB: this works because locore maps PA=VA */ \ + memset((char *)(var), 0, ((np) * PAGE_SIZE)); \ +} while (0) +#define valloc_pages(var, np) do { \ + alloc_pages((var).pv_pa, (np)); \ + (var).pv_va = (var).pv_pa + (KERNVIRTADDR - KERNPHYSADDR); \ +} while (0) + /* force L1 page table alignment */ while (((freemempos - L1_TABLE_SIZE) & (L1_TABLE_SIZE - 1)) != 0) freemempos -= PAGE_SIZE; + /* allocate contiguous L1 page table */ valloc_pages(kernel_l1pt, L1_TABLE_SIZE / PAGE_SIZE); + /* now allocate L2 page tables; they are linked to L1 below */ for (loop = 0; loop < NUM_KERNEL_PTS; ++loop) { if (!(loop % (PAGE_SIZE / L2_TABLE_SIZE_REAL))) { valloc_pages(kernel_pt_table[loop], @@ -286,11 +308,18 @@ (loop % (PAGE_SIZE / L2_TABLE_SIZE_REAL)) * L2_TABLE_SIZE_REAL; kernel_pt_table[loop].pv_va = - kernel_pt_table[loop].pv_pa + 0xb0000000; + kernel_pt_table[loop].pv_pa + + (KERNVIRTADDR - KERNPHYSADDR); } } - freemem_pt = freemempos; - freemempos = 0x10100000; + freemem_pt = freemempos; /* base of allocated pt's */ + + /* + * Re-align allocation boundary so we can map there area + * write-back instead of write-through for the stacks and + * related structures allocated below. + */ + freemempos = PHYSADDR + 0x100000; /* * Allocate a page for the system page mapped to V0x00000000 * This page will just contain the system vectors and can be @@ -306,30 +335,25 @@ alloc_pages(minidataclean.pv_pa, 1); valloc_pages(msgbufpv, round_page(MSGBUF_SIZE) / PAGE_SIZE); #ifdef ARM_USE_SMALL_ALLOC +#error "I am broken" /* XXX save people grief */ freemempos -= PAGE_SIZE; freemem_pt = trunc_page(freemem_pt); freemem_after = freemempos - ((freemem_pt - 0x10100000) / PAGE_SIZE) * sizeof(struct arm_small_page); - arm_add_smallalloc_pages((void *)(freemem_after + 0xb0000000) + arm_add_smallalloc_pages((void *)(freemem_after + (KERNVIRTADDR - KERNPHYSADDR) , (void *)0xc0100000, freemem_pt - 0x10100000, 1); freemem_after -= ((freemem_after - 0x10001000) / PAGE_SIZE) * sizeof(struct arm_small_page); - arm_add_smallalloc_pages((void *)(freemem_after + 0xb0000000) + arm_add_smallalloc_pages((void *)(freemem_after + (KEYVIRTADDR - KERNPHYSADDR)) , (void *)0xc0001000, trunc_page(freemem_after) - 0x10001000, 0); freemempos = trunc_page(freemem_after); freemempos -= PAGE_SIZE; #endif - /* - * Allocate memory for the l1 and l2 page tables. The scheme to avoid - * wasting memory by allocating the l1pt on the first 16k memory was - * taken from NetBSD rpc_machdep.c. NKPT should be greater than 12 for - * this to work (which is supposed to be the case). - */ /* - * Now we start construction of the L1 page table - * We start by mapping the L2 page tables into the L1. - * This means that we can replace L1 mappings later on if necessary + * Now construct the L1 page table. First map the L2 + * page tables into the L1 so we can replace L1 mappings + * later on if necessary */ l1pagetable = kernel_l1pt.pv_va; @@ -348,19 +372,17 @@ VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); pmap_map_chunk(l1pagetable, KERNBASE + 0x100000, PHYSADDR + 0x100000, 0x100000, VM_PROT_READ|VM_PROT_WRITE, PTE_PAGETABLE); - pmap_map_chunk(l1pagetable, KERNBASE + 0x200000, PHYSADDR + 0x200000, - (((uint32_t)(lastaddr) - KERNBASE - 0x200000) + L1_S_SIZE) & ~(L1_S_SIZE - 1), + pmap_map_chunk(l1pagetable, KERNEL_TEXT_BASE, KERNEL_TEXT_PHYS, + next_chunk2(((uint32_t)lastaddr) - KERNEL_TEXT_BASE, L1_S_SIZE), VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); - freemem_after = ((int)lastaddr + PAGE_SIZE) & ~(PAGE_SIZE - 1); - afterkern = round_page(((vm_offset_t)lastaddr + L1_S_SIZE) & ~(L1_S_SIZE - - 1)); + freemem_after = next_page((int)lastaddr); + afterkern = round_page(next_chunk2((vm_offset_t)lastaddr, L1_S_SIZE)); for (i = 0; i < KERNEL_PT_AFKERNEL_NUM; i++) { pmap_link_l2pt(l1pagetable, afterkern + i * 0x00100000, &kernel_pt_table[KERNEL_PT_AFKERNEL + i]); } pmap_map_entry(l1pagetable, afterkern, minidataclean.pv_pa, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); - #ifdef ARM_USE_SMALL_ALLOC if ((freemem_after + 2 * PAGE_SIZE) <= afterkern) { @@ -390,6 +412,7 @@ setttb(kernel_l1pt.pv_pa); cpu_tlb_flushID(); cpu_domains(DOMAIN_CLIENT << (PMAP_DOMAIN_KERNEL*2)); + /* * Pages were allocated during the secondary bootstrap for the * stacks for different CPU modes. @@ -398,17 +421,10 @@ * Since the ARM stacks use STMFD etc. we must set r13 to the top end * of the stack memory. */ - - - set_stackptr(PSR_IRQ32_MODE, - irqstack.pv_va + IRQ_STACK_SIZE * PAGE_SIZE); - set_stackptr(PSR_ABT32_MODE, - abtstack.pv_va + ABT_STACK_SIZE * PAGE_SIZE); - set_stackptr(PSR_UND32_MODE, - undstack.pv_va + UND_STACK_SIZE * PAGE_SIZE); + set_stackptr(PSR_IRQ32_MODE, irqstack.pv_va + IRQ_STACK_SIZE*PAGE_SIZE); + set_stackptr(PSR_ABT32_MODE, abtstack.pv_va + ABT_STACK_SIZE*PAGE_SIZE); + set_stackptr(PSR_UND32_MODE, undstack.pv_va + UND_STACK_SIZE*PAGE_SIZE); - - /* * We must now clean the cache again.... * Cleaning may be done by reading new data to displace any @@ -429,12 +445,12 @@ physmem = memsize / PAGE_SIZE; /* Set stack for exception handlers */ - + data_abort_handler_address = (u_int)data_abort_handler; prefetch_abort_handler_address = (u_int)prefetch_abort_handler; undefined_handler_address = (u_int)undefinedinstruction_bounce; undefined_init(); - + proc_linkup0(&proc0, &thread0); thread0.td_kstack = kernelstack.pv_va; thread0.td_pcb = (struct pcb *) @@ -442,25 +458,20 @@ thread0.td_pcb->pcb_flags = 0; thread0.td_frame = &proc0_tf; pcpup->pc_curpcb = thread0.td_pcb; - - /* Enable MMU, I-cache, D-cache, write buffer. */ arm_vector_init(ARM_VECTORS_HIGH, ARM_VEC_ALL); - - pmap_curmaxkvaddr = afterkern + PAGE_SIZE; dump_avail[0] = PHYSADDR; dump_avail[1] = PHYSADDR + memsize; dump_avail[2] = 0; dump_avail[3] = 0; - - pmap_bootstrap(pmap_curmaxkvaddr, - 0xd0000000, &kernel_l1pt); + + pmap_bootstrap(pmap_curmaxkvaddr, 0xd0000000, &kernel_l1pt); msgbufp = (void*)msgbufpv.pv_va; msgbufinit(msgbufp, MSGBUF_SIZE); mutex_init(); - + i = 0; #ifdef ARM_USE_SMALL_ALLOC phys_avail[i++] = PHYSADDR; @@ -473,7 +484,7 @@ phys_avail[i++] = trunc_page(PHYSADDR + memsize - 1); phys_avail[i++] = 0; phys_avail[i] = 0; - + /* Do basic tuning, hz etc */ init_param1(); init_param2(physmem); @@ -485,4 +496,6 @@ return ((void *)(kernelstack.pv_va + USPACE_SVC_STACK_TOP - sizeof(struct pcb))); +#undef next_page +#undef next_chunk2 } From owner-p4-projects@FreeBSD.ORG Tue Nov 25 18:30:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 1174E1065673; Tue, 25 Nov 2008 18:30:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C906F10656A6 for ; Tue, 25 Nov 2008 18:30:13 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BE8E68FC12 for ; Tue, 25 Nov 2008 18:30:13 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAPIUDw6095429 for ; Tue, 25 Nov 2008 18:30:13 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAPIUDS5095427 for perforce@freebsd.org; Tue, 25 Nov 2008 18:30:13 GMT (envelope-from sam@freebsd.org) Date: Tue, 25 Nov 2008 18:30:13 GMT Message-Id: <200811251830.mAPIUDS5095427@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 153541 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, 25 Nov 2008 18:30:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=153541 Change 153541 by sam@sam_ebb on 2008/11/25 18:29:19 recognize ixp435 cpu; probably needs tweaks Affected files ... .. //depot/projects/vap/sys/arm/arm/cpufunc.c#7 edit .. //depot/projects/vap/sys/arm/arm/identcpu.c#7 edit .. //depot/projects/vap/sys/arm/include/armreg.h#6 edit Differences ... ==== //depot/projects/vap/sys/arm/arm/cpufunc.c#7 (text+ko) ==== @@ -1211,7 +1211,7 @@ #endif /* CPU_XSCALE_PXA2X0 */ #ifdef CPU_XSCALE_IXP425 if (cputype == CPU_ID_IXP425_533 || cputype == CPU_ID_IXP425_400 || - cputype == CPU_ID_IXP425_266) { + cputype == CPU_ID_IXP425_266 || cputype == CPU_ID_IXP435) { cpufuncs = xscale_cpufuncs; #if defined(PERFCTRS) ==== //depot/projects/vap/sys/arm/arm/identcpu.c#7 (text+ko) ==== @@ -300,6 +300,10 @@ { CPU_ID_IXP425_266, CPU_CLASS_XSCALE, "IXP425 266MHz", ixp425_steppings }, + /* XXX ixp435 steppings? */ + { CPU_ID_IXP435, CPU_CLASS_XSCALE, "IXP435", + ixp425_steppings }, + { CPU_ID_ARM1136JS, CPU_CLASS_ARM11J, "ARM1136J-S", generic_steppings }, { CPU_ID_ARM1136JSR1, CPU_CLASS_ARM11J, "ARM1136J-S R1", ==== //depot/projects/vap/sys/arm/include/armreg.h#6 (text+ko) ==== @@ -174,6 +174,7 @@ #define CPU_ID_IXP425_533 0x690541c0 #define CPU_ID_IXP425_400 0x690541d0 #define CPU_ID_IXP425_266 0x690541f0 +#define CPU_ID_IXP435 0x69054040 /* ARM3-specific coprocessor 15 registers */ #define ARM3_CP15_FLUSH 1 From owner-p4-projects@FreeBSD.ORG Tue Nov 25 19:00:45 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7426A1065674; Tue, 25 Nov 2008 19:00:45 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 38430106564A for ; Tue, 25 Nov 2008 19:00:45 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 285C58FC17 for ; Tue, 25 Nov 2008 19:00:45 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAPJ0j53098043 for ; Tue, 25 Nov 2008 19:00:45 GMT (envelope-from rene@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAPJ0jqg098041 for perforce@freebsd.org; Tue, 25 Nov 2008 19:00:45 GMT (envelope-from rene@FreeBSD.org) Date: Tue, 25 Nov 2008 19:00:45 GMT Message-Id: <200811251900.mAPJ0jqg098041@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to rene@FreeBSD.org using -f From: Rene Ladan To: Perforce Change Reviews Cc: Subject: PERFORCE change 153545 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, 25 Nov 2008 19:00:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=153545 Change 153545 by rene@rene_self on 2008/11/25 19:00:10 IFC Affected files ... .. //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#4 integrate Differences ... ==== //depot/projects/docproj_nl/en_US.ISO8859-1/books/handbook/geom/chapter.sgml#4 (text+ko) ==== @@ -1,6 +1,6 @@ @@ -147,7 +147,7 @@ Creating a stripe of unformatted ATA disks - Load the geom_stripe + Load the geom_stripe.ko module: &prompt.root; kldload geom_stripe @@ -167,13 +167,11 @@ for example /dev/ad2 and /dev/ad3: - &prompt.root; gstripe label -v st0 /dev/ad2 /dev/ad3 + &prompt.root; gstripe label -v st0 /dev/ad2 /dev/ad3 +Metadata value stored on /dev/ad2. +Metadata value stored on /dev/ad3. +Done. - Write a standard label, also known as a partition @@ -206,12 +204,15 @@ To mount this striped file system automatically during the boot process, place the volume information in - /etc/fstab file: + /etc/fstab file. For this purpose, a permanent mount + point, named stripe, is + created: - &prompt.root; echo "/dev/stripe/st0a /mnt ufs rw 2 2" \ + &prompt.root; mkdir /stripe +&prompt.root; echo "/dev/stripe/st0a /stripe ufs rw 2 2" \ >> /etc/fstab - The geom_stripe module must also be automatically loaded during + The geom_stripe.ko module must also be automatically loaded during system initialization, by adding a line to /boot/loader.conf: @@ -290,9 +291,11 @@ Edit the /etc/fstab file, replacing references to the old da0 with the - new device nodes of the gm0 mirror device. - As the root user, edit the - /etc/fstab: + new device nodes of the gm0 mirror device. + + + If &man.vi.1; is your preferred editor, the following is + an easy way to accomplish this task: &prompt.root; vi /etc/fstab @@ -302,6 +305,7 @@ replace all old da0 references with gm0 by typing :%s/da/mirror\/gm/g. + The resulting fstab file should look similar to the following. It does not matter if the disk @@ -380,7 +384,9 @@ OK? boot If this works then for whatever reason the module was not - being loaded properly. Place: + being loaded properly. Check whether the relevant entry in + /boot/loader.conf is correct. If the problem + persists, place: options GEOM_MIRROR @@ -518,27 +524,30 @@ Label Types and Examples There are two types of labels, a generic label and a - file system label. The difference between the labels is - the auto detection associated with permanent labels, and the - fact that this type of label will be persistent across reboots. - These labels are given a special directory in + file system label. Labels can be permanent or temporary. + Permanent labels can be created with the &man.tunefs.8; + or &man.newfs.8; commands. They will then be created + in a sub-directory of /dev, which will be named - based on their file system type. For example, + according to their file system type. For example, UFS2 file system labels will be created in the /dev/ufs - directory. + directory. Permanent labels can also be created with the + glabel label command. These are not file system + specific, and will be created in the /dev/label directory. - A generic label will go away with the next reboot. These + A temporary label will go away with the next reboot. These labels will be created in the /dev/label directory and - are perfect for experimentation. + are perfect for experimentation. A temporary label can be + created using the glabel create command. For more + information, please read the manual page of &man.glabel.8;. - Permanent labels may be placed on the file system using the - tunefs or newfs - utilities. To create a permanent label for a + To create a permanent label for a UFS2 file system without destroying any data, issue the following command: @@ -582,6 +591,65 @@ label: &prompt.root; glabel destroy home + + The following example shows how to label the partitions of a + boot disk. + + + Labeling Partitions on the Boot Disk + + By permanently labeling the partitions on the boot disk, + the system should be able to continue to boot normally, even + if the disk is moved to another controller or transferred + to a different system. For this example, it is assumed that a + single ATA disk is used, which is currently + recognized by the system as ad0. It is + also assumed that the standard &os; partition scheme is used, with + /, + /var, + /usr and + /tmp file systems, as well + as a swap partition. + + Reboot the system, and at the &man.loader.8; prompt, press + 4 to boot into single user mode. Then enter the + following commands: + + &prompt.root; glabel label rootfs /dev/ad0s1a +GEOM_LABEL: Label for provider /dev/ad0s1a is label/rootfs +&prompt.root; glabel label var /dev/ad0s1d +GEOM_LABEL: Label for provider /dev/ad0s1d is label/var +&prompt.root; glabel label usr /dev/ad0s1f +GEOM_LABEL: Label for provider /dev/ad0s1f is label/usr +&prompt.root; glabel label tmp /dev/ad0s1e +GEOM_LABEL: Label for provider /dev/ad0s1e is label/tmp +&prompt.root; glabel label swap /dev/ad0s1b +GEOM_LABEL: Label for provider /dev/ad0s1b is label/swap +&prompt.root; exit + + The system will continue with multi-user boot. After the boot + completes, edit /etc/fstab and replace the + conventional device names, with their respective labels. The + final /etc/fstab file will look like the + following: + + # Device Mountpoint FStype Options Dump Pass# +/dev/label/swap none swap sw 0 0 +/dev/label/rootfs / ufs rw 1 1 +/dev/label/tmp /tmp ufs rw 2 2 +/dev/label/usr /usr ufs rw 2 2 +/dev/label/var /var ufs rw 2 2 + + The system can now be rebooted. If everything went well, it + will come up normally and mount will show: + + &prompt.root; mount +/dev/label/rootfs on / (ufs, local) +devfs on /dev (devfs, local) +/dev/label/tmp on /tmp (ufs, local, soft-updates) +/dev/label/usr on /usr (ufs, local, soft-updates) +/dev/label/var on /var (ufs, local, soft-updates) + @@ -611,8 +679,9 @@ This method is yet another mechanism to protect against data loss and inconsistencies of the file system. Unlike Soft Updates which tracks and enforces meta-data updates and Snapshots which - is an image of the file system, an actual log is stored at the - end sector and, in some cases, may be stored on another disk + is an image of the file system, an actual log is stored in disk + space specifically reserved for this task, + and in some cases may be stored on another disk entirely. Unlike other file system journaling implementations, the @@ -626,6 +695,19 @@ options UFS_GJOURNAL + If journaled volumes need to be mounted during startup, the + geom_journal.ko kernel module will also have to be + loaded, by adding the following line in + /boot/loader.conf: + + geom_journal_load="YES" + + Alternatively, this function can also be built into a custom + kernel, by adding the following line in the kernel configuration + file: + + options GEOM_JOURNAL + Creating a journal on a free file system may now be done using the following steps, considering that the da4 is a new SCSI @@ -669,6 +751,11 @@ the actual journal but this does not protect against data loss incurred as a result of misusing tunefs. + + It is also possible to journal the boot disk of a &os; system. + Please refer to the article Implementing UFS Journaling on + a Desktop PC for detailed instructions on this task. From owner-p4-projects@FreeBSD.ORG Tue Nov 25 19:19:04 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id A9AA51065678; Tue, 25 Nov 2008 19:19:04 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6D9EE1065673 for ; Tue, 25 Nov 2008 19:19:04 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5C9E88FC17 for ; Tue, 25 Nov 2008 19:19:04 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAPJJ4wh000643 for ; Tue, 25 Nov 2008 19:19:04 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAPJJ4jl000641 for perforce@freebsd.org; Tue, 25 Nov 2008 19:19:04 GMT (envelope-from trasz@freebsd.org) Date: Tue, 25 Nov 2008 19:19:04 GMT Message-Id: <200811251919.mAPJJ4jl000641@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 153548 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, 25 Nov 2008 19:19:04 -0000 http://perforce.freebsd.org/chv.cgi?CH=153548 Change 153548 by trasz@trasz_victim7 on 2008/11/25 19:18:50 Exchange 00.t and 02.t, as 02.t has just been MFp4-ed as 00.t. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/00.t#5 edit .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/02.t#5 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/00.t#5 (text+ko) ==== @@ -1,14 +1,15 @@ #!/bin/sh # -# This is a wrapper script to run tools-nfs4.test. +# This is a wrapper script to run tools-posix.test. # # If any of the tests fails, here is how to debug it: go to # the directory with problematic filesystem mounted on it, -# and do /path/to/test run /path/to/test tools-nfs4.test, e.g. +# and do /path/to/test run /path/to/test tools-posix.test, e.g. # -# /usr/src/tools/regression/acltools/run /usr/src/tools/regression/acltools/tools-nfs4.test +# /usr/src/tools/regression/acltools/run /usr/src/tools/regression/acltools/tools-posix.test # # Output should be obvious. +# echo "1..4" @@ -23,7 +24,7 @@ MD=`mdconfig -at swap -s 10m` MNT=`mktemp -dt acltools` newfs /dev/$MD > /dev/null -mount -o nfs4acls /dev/$MD $MNT +mount -o acls /dev/$MD $MNT if [ $? -ne 0 ]; then echo "not ok 1 - mount failed." exit 1 @@ -36,13 +37,13 @@ # First, check whether we can crash the kernel by creating too many # entries. For some reason this won't work in the test file. touch xxx -setfacl -x5 xxx -while :; do setfacl -a0 u:42:rwx:allow xxx 2> /dev/null; if [ $? -ne 0 ]; then break; fi; done +i=0; +while :; do i=$(($i+1)); setfacl -m u:$i:rwx xxx 2> /dev/null; if [ $? -ne 0 ]; then break; fi; done chmod 600 xxx rm xxx echo "ok 2" -perl $TESTDIR/run $TESTDIR/tools-nfs4.test > /dev/null +perl $TESTDIR/run $TESTDIR/tools-posix.test > /dev/null if [ $? -eq 0 ]; then echo "ok 3" ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/02.t#5 (text+ko) ==== @@ -1,15 +1,14 @@ #!/bin/sh # -# This is a wrapper script to run tools-posix.test. +# This is a wrapper script to run tools-nfs4.test. # # If any of the tests fails, here is how to debug it: go to # the directory with problematic filesystem mounted on it, -# and do /path/to/test run /path/to/test tools-posix.test, e.g. +# and do /path/to/test run /path/to/test tools-nfs4.test, e.g. # -# /usr/src/tools/regression/acltools/run /usr/src/tools/regression/acltools/tools-posix.test +# /usr/src/tools/regression/acltools/run /usr/src/tools/regression/acltools/tools-nfs4.test # # Output should be obvious. -# echo "1..4" @@ -24,7 +23,7 @@ MD=`mdconfig -at swap -s 10m` MNT=`mktemp -dt acltools` newfs /dev/$MD > /dev/null -mount -o acls /dev/$MD $MNT +mount -o nfs4acls /dev/$MD $MNT if [ $? -ne 0 ]; then echo "not ok 1 - mount failed." exit 1 @@ -37,13 +36,13 @@ # First, check whether we can crash the kernel by creating too many # entries. For some reason this won't work in the test file. touch xxx -i=0; -while :; do i=$(($i+1)); setfacl -m u:$i:rwx xxx 2> /dev/null; if [ $? -ne 0 ]; then break; fi; done +setfacl -x5 xxx +while :; do setfacl -a0 u:42:rwx:allow xxx 2> /dev/null; if [ $? -ne 0 ]; then break; fi; done chmod 600 xxx rm xxx echo "ok 2" -perl $TESTDIR/run $TESTDIR/tools-posix.test > /dev/null +perl $TESTDIR/run $TESTDIR/tools-nfs4.test > /dev/null if [ $? -eq 0 ]; then echo "ok 3" From owner-p4-projects@FreeBSD.ORG Tue Nov 25 19:31:35 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B3B031065677; Tue, 25 Nov 2008 19:31:35 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 773B11065675 for ; Tue, 25 Nov 2008 19:31:35 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 31F0D8FC16 for ; Tue, 25 Nov 2008 19:31:35 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAPJVZBp001777 for ; Tue, 25 Nov 2008 19:31:35 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAPJVZ5Z001775 for perforce@freebsd.org; Tue, 25 Nov 2008 19:31:35 GMT (envelope-from ed@FreeBSD.org) Date: Tue, 25 Nov 2008 19:31:35 GMT Message-Id: <200811251931.mAPJVZ5Z001775@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 153551 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, 25 Nov 2008 19:31:35 -0000 http://perforce.freebsd.org/chv.cgi?CH=153551 Change 153551 by ed@ed_dull on 2008/11/25 19:30:53 IFC. Also revert utmpx-changes. Affected files ... .. //depot/projects/mpsafetty/ObsoleteFiles.inc#17 integrate .. //depot/projects/mpsafetty/include/Makefile#6 integrate .. //depot/projects/mpsafetty/include/utmp.h#3 branch .. //depot/projects/mpsafetty/include/utmpx.h#2 delete .. //depot/projects/mpsafetty/sys/arm/at91/at91_machdep.c#1 branch .. //depot/projects/mpsafetty/sys/arm/at91/at91board.h#1 branch .. //depot/projects/mpsafetty/sys/arm/at91/at91var.h#3 integrate .. //depot/projects/mpsafetty/sys/arm/at91/board_bwct.c#1 branch .. //depot/projects/mpsafetty/sys/arm/at91/board_hl200.c#1 branch .. //depot/projects/mpsafetty/sys/arm/at91/board_kb920x.c#1 branch .. //depot/projects/mpsafetty/sys/arm/at91/board_tsc4370.c#1 branch .. //depot/projects/mpsafetty/sys/arm/at91/files.at91#2 integrate .. //depot/projects/mpsafetty/sys/arm/at91/files.kb920x#2 delete .. //depot/projects/mpsafetty/sys/arm/at91/kb920x_machdep.c#4 delete .. //depot/projects/mpsafetty/sys/arm/at91/std.at91#2 integrate .. //depot/projects/mpsafetty/sys/arm/at91/std.bwct#1 branch .. //depot/projects/mpsafetty/sys/arm/at91/std.hl200#1 branch .. //depot/projects/mpsafetty/sys/arm/at91/std.kb920x#2 integrate .. //depot/projects/mpsafetty/sys/arm/at91/std.tsc4370#1 branch .. //depot/projects/mpsafetty/sys/arm/conf/BWCT#5 integrate .. //depot/projects/mpsafetty/sys/arm/conf/HL200#5 integrate .. //depot/projects/mpsafetty/sys/cddl/dev/cyclic/cyclic.c#2 integrate .. //depot/projects/mpsafetty/sys/cddl/dev/dtrace/i386/dtrace_subr.c#2 integrate .. //depot/projects/mpsafetty/sys/dev/acpica/acpi_pcib.c#2 integrate .. //depot/projects/mpsafetty/sys/geom/vinum/geom_vinum.c#3 integrate .. //depot/projects/mpsafetty/sys/geom/vinum/geom_vinum_list.c#2 integrate .. //depot/projects/mpsafetty/sys/geom/vinum/geom_vinum_move.c#2 integrate .. //depot/projects/mpsafetty/sys/geom/vinum/geom_vinum_rename.c#3 integrate .. //depot/projects/mpsafetty/sys/geom/vinum/geom_vinum_rm.c#4 integrate .. //depot/projects/mpsafetty/sys/i386/i386/identcpu.c#5 integrate .. //depot/projects/mpsafetty/sys/i386/i386/intr_machdep.c#3 integrate .. //depot/projects/mpsafetty/sys/kern/vfs_cache.c#7 integrate .. //depot/projects/mpsafetty/sys/modules/nfsserver/Makefile#4 integrate .. //depot/projects/mpsafetty/tools/regression/acltools/00.t#1 branch .. //depot/projects/mpsafetty/tools/regression/acltools/run#1 branch .. //depot/projects/mpsafetty/tools/regression/acltools/tools-posix.test#1 branch Differences ... ==== //depot/projects/mpsafetty/ObsoleteFiles.inc#17 (text+ko) ==== @@ -14,8 +14,6 @@ # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last. # -# 20081116: removal of utmp(5), replaced by utmpx(5) -OLD_FILES+=usr/include/utmp.h # 20080928: removal of inaccurate device_ids(9) manual page OLD_FILES+=usr/share/man/man9/device_ids.9.gz OLD_FILES+=usr/share/man/man9/major.9.gz ==== //depot/projects/mpsafetty/include/Makefile#6 (text+ko) ==== @@ -23,7 +23,7 @@ stdbool.h stddef.h stdio.h stdlib.h string.h stringlist.h \ strings.h sysexits.h tar.h tgmath.h \ time.h timeconv.h timers.h ttyent.h \ - ulimit.h unistd.h utime.h utmpx.h uuid.h varargs.h vis.h wchar.h \ + ulimit.h unistd.h utime.h utmp.h uuid.h varargs.h vis.h wchar.h \ wctype.h wordexp.h MHDRS= float.h floatingpoint.h stdarg.h ==== //depot/projects/mpsafetty/sys/arm/at91/at91var.h#3 (text) ==== @@ -23,7 +23,7 @@ * SUCH DAMAGE. */ -/* $FreeBSD: src/sys/arm/at91/at91var.h,v 1.2 2008/11/25 00:13:26 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91var.h,v 1.3 2008/11/25 18:40:40 imp Exp $ */ #ifndef _AT91VAR_H_ #define _AT91VAR_H_ @@ -43,5 +43,4 @@ struct resource_list resources; }; - #endif /* _AT91VAR_H_ */ ==== //depot/projects/mpsafetty/sys/arm/at91/files.at91#2 (text) ==== @@ -1,6 +1,7 @@ -# $FreeBSD: src/sys/arm/at91/files.at91,v 1.7 2007/01/05 02:06:53 ticso Exp $ +# $FreeBSD: src/sys/arm/at91/files.at91,v 1.9 2008/11/25 19:05:46 imp Exp $ arm/arm/cpufunc_asm_arm9.S standard arm/arm/irq_dispatch.S standard +arm/at91/at91_machdep.c standard arm/at91/at91.c standard arm/at91/at91_st.c standard arm/at91/at91_mci.c optional at91_mci @@ -18,3 +19,10 @@ arm/at91/uart_bus_at91usart.c optional uart arm/at91/uart_cpu_at91rm9200usart.c optional uart arm/at91/uart_dev_at91usart.c optional uart +# +# All the boards we support +# +arm/at91/board_bwct.c optional at91_board_bwct +arm/at91/board_hl200.c optional at91_board_hl200 +arm/at91/board_kb920x.c optional at91_board_kb920x +arm/at91/board_tsc4370.c optional at91_board_tsc4370 ==== //depot/projects/mpsafetty/sys/arm/at91/std.at91#2 (text) ==== @@ -1,6 +1,6 @@ -# $FreeBSD: src/sys/arm/at91/std.at91,v 1.4 2007/10/25 22:57:19 cognet Exp $ +# $FreeBSD: src/sys/arm/at91/std.at91,v 1.5 2008/11/25 16:38:10 imp Exp $ files "../at91/files.at91" -cpu CPU_ARM9 +cpu CPU_ARM9 makeoptions CONF_CFLAGS=-mcpu=arm9 -options PHYSADDR=0x20000000 +options PHYSADDR=0x20000000 ==== //depot/projects/mpsafetty/sys/arm/at91/std.kb920x#2 (text) ==== @@ -1,9 +1,10 @@ -#$FreeBSD: src/sys/arm/at91/std.kb920x,v 1.5 2007/10/25 22:57:19 cognet Exp $ +#$FreeBSD: src/sys/arm/at91/std.kb920x,v 1.7 2008/11/25 19:05:46 imp Exp $ include "../at91/std.at91" -files "../at91/files.kb920x" options STARTUP_PAGETABLE_ADDR=0x20800000 makeoptions KERNPHYSADDR=0x20000000 +options KERNPHYSADDR=0x20000000 makeoptions KERNVIRTADDR=0xc0000000 -options KERNPHYSADDR=0x20000000 options KERNVIRTADDR=0xc0000000 + +device at91_board_kb920x ==== //depot/projects/mpsafetty/sys/arm/conf/BWCT#5 (text+ko) ==== @@ -15,14 +15,14 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/BWCT,v 1.6 2008/10/23 01:51:55 marcel Exp $ +# $FreeBSD: src/sys/arm/conf/BWCT,v 1.7 2008/11/25 19:05:46 imp Exp $ ident BWCT options VERBOSE_INIT_ARM options AT91_BWCT -include "../at91/std.kb920x" +include "../at91/std.bwct" #To statically compile in device wiring instead of /boot/device.hints #hints "hints.at91rm9200" ==== //depot/projects/mpsafetty/sys/arm/conf/HL200#5 (text+ko) ==== @@ -1,5 +1,4 @@ -# KB920X -- Custom kernel configuration for the KB9200, 9201 and 9202 -# AT91RM9200 based Hot-e configuration file +# Kernel configuration for the AT91RM9200 based Hot-e configuration file # # For more information on this file, please read the handbook section on # Kernel Configuration Files: @@ -16,27 +15,18 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/arm/conf/HL200,v 1.6 2008/10/23 01:51:55 marcel Exp $ +# $FreeBSD: src/sys/arm/conf/HL200,v 1.7 2008/11/25 19:05:46 imp Exp $ ident HL200 -include "../at91/std.at91" -files "../at91/files.kb920x" - -options STARTUP_PAGETABLE_ADDR=0x20000000 -makeoptions KERNPHYSADDR=0x20100000 -makeoptions KERNVIRTADDR=0xc0100000 -options KERNPHYSADDR=0x20100000 -options KERNVIRTADDR=0xc0100000 +include "../at91/std.hl200" #To statically compile in device wiring instead of /boot/device.hints -#hints "GENERIC.hints" #Default places to look for devices. hints "KB920X.hints" makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols options DDB options KDB -options AT91C_MASTER_CLOCK=45000000 options SCHED_4BSD #4BSD scheduler options INET #InterNETworking @@ -46,17 +36,17 @@ #options UFS_ACL #Support for access control lists #options UFS_DIRHASH #Improve performance on big directories #options MD_ROOT #MD is a potential root device -#options MD_ROOT_SIZE=4096 # 3MB ram disk +#options MD_ROOT_SIZE=4096 # 3MB ram disk #options ROOTDEVNAME=\"ufs:/dev/mmcsd0s1a\" options NFSCLIENT #Network Filesystem Client #options NFSSERVER #Network Filesystem Server #options NFSLOCKD #Network Lock Manager options NFS_ROOT #NFS usable as /, requires NFSCLIENT -options BOOTP_NFSROOT -options BOOTP -options BOOTP_NFSV3 -options BOOTP_WIRED_TO=ate0 -options BOOTP_COMPAT +options BOOTP_NFSROOT +options BOOTP +options BOOTP_NFSV3 +options BOOTP_WIRED_TO=ate0 +options BOOTP_COMPAT #options MSDOSFS #MSDOS Filesystem #options CD9660 #ISO 9660 Filesystem @@ -124,20 +114,20 @@ device rue # RealTek RTL8150 USB Ethernet device udav # usb serial -device ucom -device uark -device ubsa -device ubser -device uftdi -device uipaq -device uplcom -device uvisor -device uvscom +device ucom +device uark +device ubsa +#device ubser # not yet converted. +device uftdi +device uipaq +device uplcom +device uvisor +device uvscom # SCSI peripherals -device scbus # SCSI bus (required for SCSI) -device da # Direct Access (disks) -device cd # CD -device pass # Passthrough device (direct SCSI access) +device scbus # SCSI bus (required for SCSI) +device da # Direct Access (disks) +device cd # CD +device pass # Passthrough device (direct SCSI access) # Wireless NIC cards device wlan # 802.11 support device wlan_wep # 802.11 WEP support ==== //depot/projects/mpsafetty/sys/cddl/dev/cyclic/cyclic.c#2 (text+ko) ==== @@ -21,7 +21,7 @@ * * Portions Copyright 2008 John Birrell * - * $FreeBSD: src/sys/cddl/dev/cyclic/cyclic.c,v 1.1 2008/05/23 22:21:58 jb Exp $ + * $FreeBSD: src/sys/cddl/dev/cyclic/cyclic.c,v 1.2 2008/11/25 19:25:54 ganbold Exp $ * * This is a simplified version of the cyclic timer subsystem from * OpenSolaris. In the FreeBSD version, we don't use interrupt levels. @@ -1341,12 +1341,11 @@ static void cyclic_uninit(void) { - struct pcpu *pc; cpu_t *c; int id; for (id = 0; id <= mp_maxid; id++) { - if ((pc = pcpu_find(id)) == NULL) + if (pcpu_find(id) == NULL) continue; c = &solaris_cpu[id]; ==== //depot/projects/mpsafetty/sys/cddl/dev/dtrace/i386/dtrace_subr.c#2 (text+ko) ==== @@ -19,7 +19,7 @@ * * CDDL HEADER END * - * $FreeBSD: src/sys/cddl/dev/dtrace/i386/dtrace_subr.c,v 1.1 2008/05/23 05:59:41 jb Exp $ + * $FreeBSD: src/sys/cddl/dev/dtrace/i386/dtrace_subr.c,v 1.2 2008/11/25 19:25:54 ganbold Exp $ * */ /* @@ -403,7 +403,6 @@ { cpumask_t map; int i; - struct pcpu *cp; /* The current CPU is the reference one. */ tsc_skew[curcpu] = 0; @@ -412,7 +411,7 @@ if (i == curcpu) continue; - if ((cp = pcpu_find(i)) == NULL) + if (pcpu_find(i) == NULL) continue; map = 0; ==== //depot/projects/mpsafetty/sys/dev/acpica/acpi_pcib.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.60 2005/12/03 21:17:17 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_pcib.c,v 1.61 2008/11/25 19:06:20 ganbold Exp $"); #include "opt_acpi.h" #include @@ -127,7 +127,6 @@ int acpi_pcib_attach(device_t dev, ACPI_BUFFER *prt, int busno) { - device_t child; ACPI_STATUS status; ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__); @@ -157,7 +156,7 @@ /* * Attach the PCI bus proper. */ - if ((child = device_add_child(dev, "pci", busno)) == NULL) { + if (device_add_child(dev, "pci", busno) == NULL) { device_printf(device_get_parent(dev), "couldn't attach pci bus\n"); return_VALUE(ENXIO); } ==== //depot/projects/mpsafetty/sys/geom/vinum/geom_vinum.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum.c,v 1.22 2008/10/26 17:20:37 lulf Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum.c,v 1.23 2008/11/25 19:13:58 lulf Exp $"); #include #include @@ -165,12 +165,20 @@ plexes = gctl_get_paraml(req, "plexes", sizeof(*plexes)); subdisks = gctl_get_paraml(req, "subdisks", sizeof(*subdisks)); drives = gctl_get_paraml(req, "drives", sizeof(*drives)); + if (volumes == NULL || plexes == NULL || subdisks == NULL || + drives == NULL) { + gctl_error(req, "number of objects not given"); + return (-1); + } /* First, handle drive definitions ... */ for (i = 0; i < *drives; i++) { snprintf(buf, sizeof(buf), "drive%d", i); d2 = gctl_get_paraml(req, buf, sizeof(*d2)); - + if (d2 == NULL) { + gctl_error(req, "no drive definition given"); + return (-1); + } d = gv_find_drive(sc, d2->name); if (d != NULL) { gctl_error(req, "drive '%s' is already known", @@ -205,7 +213,10 @@ error = 0; snprintf(buf, sizeof(buf), "volume%d", i); v2 = gctl_get_paraml(req, buf, sizeof(*v2)); - + if (v2 == NULL) { + gctl_error(req, "no volume definition given"); + return (-1); + } v = gv_find_vol(sc, v2->name); if (v != NULL) { gctl_error(req, "volume '%s' is already known", @@ -226,7 +237,10 @@ error = 0; snprintf(buf, sizeof(buf), "plex%d", i); p2 = gctl_get_paraml(req, buf, sizeof(*p2)); - + if (p2 == NULL) { + gctl_error(req, "no plex definition given"); + return (-1); + } p = gv_find_plex(sc, p2->name); if (p != NULL) { gctl_error(req, "plex '%s' is already known", p->name); @@ -260,7 +274,10 @@ error = 0; snprintf(buf, sizeof(buf), "sd%d", i); s2 = gctl_get_paraml(req, buf, sizeof(*s2)); - + if (s2 == NULL) { + gctl_error(req, "no subdisk definition given"); + return (-1); + } s = gv_find_sd(sc, s2->name); if (s != NULL) { gctl_error(req, "subdisk '%s' is already known", @@ -405,7 +422,10 @@ /* Return configuration in string form. */ } else if (!strcmp(verb, "getconfig")) { comment = gctl_get_param(req, "comment", NULL); - + if (comment == NULL) { + gctl_error(req, "no comment parameter given"); + return; + } sb = sbuf_new(NULL, NULL, GV_CFG_LEN, SBUF_FIXEDLEN); gv_format_config(sc, sb, 0, comment); sbuf_finish(sb); ==== //depot/projects/mpsafetty/sys/geom/vinum/geom_vinum_list.c#2 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_list.c,v 1.3 2005/01/06 18:27:30 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_list.c,v 1.4 2008/11/25 19:13:58 lulf Exp $"); #include #include @@ -62,6 +62,10 @@ } flags = gctl_get_paraml(req, "flags", sizeof(*flags)); + if (flags == NULL) { + gctl_error(req, "no flags given"); + return; + } sc = gp->softc; @@ -69,6 +73,10 @@ /* Figure out which command was given. */ cmd = gctl_get_param(req, "cmd", NULL); + if (cmd == NULL) { + gctl_error(req, "no command given"); + return; + } /* List specific objects or everything. */ if (!strcmp(cmd, "list") || !strcmp(cmd, "l")) { ==== //depot/projects/mpsafetty/sys/geom/vinum/geom_vinum_move.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_move.c,v 1.3 2006/02/08 21:32:45 le Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_move.c,v 1.4 2008/11/25 19:13:58 lulf Exp $"); #include #include @@ -56,7 +56,15 @@ sc = gp->softc; argc = gctl_get_paraml(req, "argc", sizeof(*argc)); + if (argc == NULL) { + gctl_error(req, "no arguments given"); + return; + } flags = gctl_get_paraml(req, "flags", sizeof(*flags)); + if (flags == NULL) { + gctl_error(req, "no flags given"); + return; + } destination = gctl_get_param(req, "destination", NULL); if (destination == NULL) { gctl_error(req, "no destination given"); ==== //depot/projects/mpsafetty/sys/geom/vinum/geom_vinum_rename.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_rename.c,v 1.4 2008/07/19 13:53:11 lulf Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_rename.c,v 1.5 2008/11/25 19:13:58 lulf Exp $"); #include #include @@ -65,6 +65,10 @@ sc = gp->softc; flags = gctl_get_paraml(req, "flags", sizeof(*flags)); + if (flags == NULL) { + gctl_error(req, "no flags given"); + return; + } newname = gctl_get_param(req, "newname", NULL); if (newname == NULL) { ==== //depot/projects/mpsafetty/sys/geom/vinum/geom_vinum_rm.c#4 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_rm.c,v 1.15 2008/10/26 17:20:37 lulf Exp $"); +__FBSDID("$FreeBSD: src/sys/geom/vinum/geom_vinum_rm.c,v 1.16 2008/11/25 19:13:58 lulf Exp $"); #include #include @@ -59,13 +59,18 @@ int i, type, err; argc = gctl_get_paraml(req, "argc", sizeof(*argc)); - flags = gctl_get_paraml(req, "flags", sizeof(*flags)); if (argc == NULL || *argc == 0) { gctl_error(req, "no arguments given"); return; } + flags = gctl_get_paraml(req, "flags", sizeof(*flags)); + if (flags == NULL) { + gctl_error(req, "no flags given"); + return; + } + sc = gp->softc; for (i = 0; i < *argc; i++) { ==== //depot/projects/mpsafetty/sys/i386/i386/identcpu.c#5 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/i386/i386/identcpu.c,v 1.193 2008/10/22 21:03:30 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/i386/i386/identcpu.c,v 1.194 2008/11/25 13:35:06 takawata Exp $"); #include "opt_cpu.h" @@ -846,7 +846,8 @@ * mention the capability. */ if (!tsc_is_invariant && - (strcmp(cpu_vendor, "AuthenticAMD") == 0 && + ((strcmp(cpu_vendor, "AuthenticAMD") == 0 || + (strcmp(cpu_vendor, "GenuineIntel") == 0))&& ((amd_pminfo & AMDPM_TSC_INVARIANT) != 0 || I386_CPU_FAMILY(cpu_id) >= 0x10 || cpu_id == 0x60fb2))) { ==== //depot/projects/mpsafetty/sys/i386/i386/intr_machdep.c#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/i386/i386/intr_machdep.c,v 1.37 2008/09/18 03:19:46 kmacy Exp $ + * $FreeBSD: src/sys/i386/i386/intr_machdep.c,v 1.38 2008/11/25 18:48:13 ganbold Exp $ */ /* @@ -230,11 +230,8 @@ intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame) { struct intr_event *ie; - struct thread *td; int vector; - td = curthread; - /* * We count software interrupts when we process them. The * code here follows previous practice, but there's an ==== //depot/projects/mpsafetty/sys/kern/vfs_cache.c#7 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/kern/vfs_cache.c,v 1.126 2008/09/24 18:51:33 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/vfs_cache.c,v 1.127 2008/11/25 15:36:15 marcus Exp $"); #include #include @@ -716,7 +716,8 @@ { char *bp, *tmpbuf; struct filedesc *fdp; - int error; + struct vnode *cdir, *rdir; + int error, vfslocked; if (disablecwd) return (ENODEV); @@ -728,9 +729,18 @@ tmpbuf = malloc(buflen, M_TEMP, M_WAITOK); fdp = td->td_proc->p_fd; FILEDESC_SLOCK(fdp); - error = vn_fullpath1(td, fdp->fd_cdir, fdp->fd_rdir, tmpbuf, - &bp, buflen); + cdir = fdp->fd_cdir; + VREF(cdir); + rdir = fdp->fd_rdir; + VREF(rdir); FILEDESC_SUNLOCK(fdp); + error = vn_fullpath1(td, cdir, rdir, tmpbuf, &bp, buflen); + vfslocked = VFS_LOCK_GIANT(rdir->v_mount); + vrele(rdir); + VFS_UNLOCK_GIANT(vfslocked); + vfslocked = VFS_LOCK_GIANT(cdir->v_mount); + vrele(cdir); + VFS_UNLOCK_GIANT(vfslocked); if (!error) { if (bufseg == UIO_SYSSPACE) @@ -771,7 +781,8 @@ { char *buf; struct filedesc *fdp; - int error; + struct vnode *rdir; + int error, vfslocked; if (disablefullpath) return (ENODEV); @@ -781,8 +792,13 @@ buf = malloc(MAXPATHLEN, M_TEMP, M_WAITOK); fdp = td->td_proc->p_fd; FILEDESC_SLOCK(fdp); - error = vn_fullpath1(td, vn, fdp->fd_rdir, buf, retbuf, MAXPATHLEN); + rdir = fdp->fd_rdir; + VREF(rdir); FILEDESC_SUNLOCK(fdp); + error = vn_fullpath1(td, vn, rdir, buf, retbuf, MAXPATHLEN); + vfslocked = VFS_LOCK_GIANT(rdir->v_mount); + vrele(rdir); + VFS_UNLOCK_GIANT(vfslocked); if (!error) *freebuf = buf; ==== //depot/projects/mpsafetty/sys/modules/nfsserver/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/modules/nfsserver/Makefile,v 1.28 2008/11/06 10:53:35 des Exp $ +# $FreeBSD: src/sys/modules/nfsserver/Makefile,v 1.29 2008/11/25 16:11:41 dfr Exp $ .PATH: ${.CURDIR}/../../nfsserver ${.CURDIR}/../../nfs KMOD= nfsserver @@ -6,6 +6,7 @@ nfs_fha.c nfs_serv.c nfs_srvkrpc.c nfs_srvsock.c nfs_srvcache.c \ nfs_srvsubs.c nfs_syscalls.c nfs_common.c \ opt_mac.h \ + opt_kgssapi.h \ opt_nfs.h SRCS+= opt_inet6.h From owner-p4-projects@FreeBSD.ORG Tue Nov 25 19:46:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 11B281065674; Tue, 25 Nov 2008 19:46:51 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C92A4106564A for ; Tue, 25 Nov 2008 19:46:50 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B7C828FC1F for ; Tue, 25 Nov 2008 19:46:50 +0000 (UTC) (envelope-from ed@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAPJkovK003082 for ; Tue, 25 Nov 2008 19:46:50 GMT (envelope-from ed@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAPJkoO7003078 for perforce@freebsd.org; Tue, 25 Nov 2008 19:46:50 GMT (envelope-from ed@FreeBSD.org) Date: Tue, 25 Nov 2008 19:46:50 GMT Message-Id: <200811251946.mAPJkoO7003078@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to ed@FreeBSD.org using -f From: Ed Schouten To: Perforce Change Reviews Cc: Subject: PERFORCE change 153552 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, 25 Nov 2008 19:46:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=153552 Change 153552 by ed@ed_dull on 2008/11/25 19:46:27 As an experiment, add libteken to the syscons source code. What's libteken? Our syscons driver uses a terminal type called cons25. There's nothing wrong with cons25, but the problem is that it isn't really compatible with other systems out there. For example, I SSH to my HP2626 switch from syscons, it won't work. libteken is an attempt to emulate an xterm-color. Eventually we should also place the UTF-8 handling inside libteken. libteken is simply a library that converts input (output from, say, a TTY) to drawing commands that can be used by syscons. There are a couple of reasons why we want to put this in a library: - Having a well-defined API that doesn't depend on syscons itself allows me to easily develop this in userspace. I've got a simple application built with ncurses that emulates a terminal inside xterm itself. - It's hard to do right. There are always very small edge cases that can mess up the rendering. If we only write it once, we could for example teach window(1) how to use it as well. - If we ever get multiple console drivers, it's only a matter of building on top of libteken to get the terminal emulation working properly. So why did I choose xterm-color? It seems like this is the most commonly used terminal type. There are a lot of terminal-emulators that already use xterm-color. Even Mac OS X's Terminal.app just uses it. It's probably the safest approach. libteken is hardly finished. There are a lot of loose ends. The reason why I'm adding it to the MPSAFE TTY branch already is because I want to find out how efficient it is right now and if it can be fitted inside the syscons code. Affected files ... .. //depot/projects/mpsafetty/sys/conf/files#27 edit .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken.c#1 add .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken.h#1 add .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_internal.h#1 add .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_state.c#1 add .. //depot/projects/mpsafetty/sys/dev/syscons/teken/teken_subr.c#1 add Differences ... ==== //depot/projects/mpsafetty/sys/conf/files#27 (text+ko) ==== @@ -1270,6 +1270,9 @@ dev/syscons/star/star_saver.c optional star_saver dev/syscons/syscons.c optional sc dev/syscons/sysmouse.c optional sc +dev/syscons/teken/teken.c optional sc +dev/syscons/teken/teken_state.c optional sc +dev/syscons/teken/teken_subr.c optional sc dev/syscons/warp/warp_saver.c optional warp_saver dev/tdfx/tdfx_linux.c optional tdfx_linux tdfx compat_linux dev/tdfx/tdfx_pci.c optional tdfx pci From owner-p4-projects@FreeBSD.ORG Tue Nov 25 23:23:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D4DF21065676; Tue, 25 Nov 2008 23:23:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 98BDB106567F for ; Tue, 25 Nov 2008 23:23:32 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 763A28FC19 for ; Tue, 25 Nov 2008 23:23:32 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAPNNWLN035217 for ; Tue, 25 Nov 2008 23:23:32 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAPNNVt2035215 for perforce@freebsd.org; Tue, 25 Nov 2008 23:23:31 GMT (envelope-from zec@tel.fer.hr) Date: Tue, 25 Nov 2008 23:23:31 GMT Message-Id: <200811252323.mAPNNVt2035215@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153561 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, 25 Nov 2008 23:23:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=153561 Change 153561 by zec@zec_tpx32 on 2008/11/25 23:22:34 Prepend a missing V_ on variable use. Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_nbr.c#17 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet6/nd6_nbr.c#17 (text+ko) ==== @@ -153,7 +153,7 @@ "(wrong ip6 dst)\n")); goto bad; } - } else if (!nd6_onlink_ns_rfc4861) { + } else if (!V_nd6_onlink_ns_rfc4861) { struct sockaddr_in6 src_sa6; /* From owner-p4-projects@FreeBSD.ORG Tue Nov 25 23:30:40 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 32C251065670; Tue, 25 Nov 2008 23:30:40 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EA6C51065674 for ; Tue, 25 Nov 2008 23:30:39 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C76F18FC17 for ; Tue, 25 Nov 2008 23:30:39 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAPNUdWc035794 for ; Tue, 25 Nov 2008 23:30:39 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAPNUdON035792 for perforce@freebsd.org; Tue, 25 Nov 2008 23:30:39 GMT (envelope-from zec@tel.fer.hr) Date: Tue, 25 Nov 2008 23:30:39 GMT Message-Id: <200811252330.mAPNUdON035792@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153562 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, 25 Nov 2008 23:30:40 -0000 http://perforce.freebsd.org/chv.cgi?CH=153562 Change 153562 by zec@zec_tpx32 on 2008/11/25 23:30:20 Prepend a missing V_ on variable use. Affected files ... .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#16 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#16 (text+ko) ==== @@ -2007,7 +2007,7 @@ ipsec_attach(void) { SECPOLICY_LOCK_INIT(&V_ip4_def_policy); - ip4_def_policy.refcnt = 1; /* NB: disallow free */ + V_ip4_def_policy.refcnt = 1; /* NB: disallow free */ } SYSINIT(ipsec, SI_SUB_PROTO_DOMAIN, SI_ORDER_FIRST, ipsec_attach, NULL); From owner-p4-projects@FreeBSD.ORG Tue Nov 25 23:47:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0F66A1065675; Tue, 25 Nov 2008 23:47:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C83D0106564A for ; Tue, 25 Nov 2008 23:47:57 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id BEA5D8FC22 for ; Tue, 25 Nov 2008 23:47:57 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAPNlvPK037097 for ; Tue, 25 Nov 2008 23:47:57 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAPNlvda037095 for perforce@freebsd.org; Tue, 25 Nov 2008 23:47:57 GMT (envelope-from zec@tel.fer.hr) Date: Tue, 25 Nov 2008 23:47:57 GMT Message-Id: <200811252347.mAPNlvda037095@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153564 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, 25 Nov 2008 23:47:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=153564 Change 153564 by zec@zec_tpx32 on 2008/11/25 23:47:35 static struct sockaddr key_src should most probably be virtualized as well (?) Affected files ... .. //depot/projects/vimage-commit2/src/sys/netipsec/keysock.c#14 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/vipsec.h#9 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netipsec/keysock.c#14 (text+ko) ==== @@ -74,10 +74,9 @@ #ifdef VIMAGE_GLOBALS static struct key_cb key_cb; struct pfkeystat pfkeystat; +static struct sockaddr key_src; #endif -static struct sockaddr key_src = { 2, PF_KEY, }; - static int key_sendup0 __P((struct rawcb *, struct mbuf *, int)); /* @@ -573,6 +572,9 @@ { INIT_VNET_IPSEC(curvnet); + V_key_src.sa_len = 2; + V_key_src.sa_family = PF_KEY; + bzero((caddr_t)&V_key_cb, sizeof(V_key_cb)); ipsec_init(); key_init(); ==== //depot/projects/vimage-commit2/src/sys/netipsec/vipsec.h#9 (text+ko) ==== @@ -106,7 +106,7 @@ struct pfkeystat _pfkeystat; struct key_cb _key_cb; - + struct sockaddr _key_src; LIST_HEAD(, secpolicy) _sptree[IPSEC_DIR_MAX]; LIST_HEAD(, secashead) _sahtree; LIST_HEAD(, secreg) _regtree[SADB_SATYPE_MAX + 1]; From owner-p4-projects@FreeBSD.ORG Wed Nov 26 00:26:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7C9C71065676; Wed, 26 Nov 2008 00:26:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3F7031065672; Wed, 26 Nov 2008 00:26:32 +0000 (UTC) (envelope-from prvs=julian=20980669f@elischer.org) Received: from smtp-outbound.ironport.com (smtp-outbound.ironport.com [63.251.108.112]) by mx1.freebsd.org (Postfix) with ESMTP id 2E5168FC14; Wed, 26 Nov 2008 00:26:32 +0000 (UTC) (envelope-from prvs=julian=20980669f@elischer.org) Received: from jelischer-laptop.sfo.ironport.com (HELO julian-mac.elischer.org) ([10.251.22.38]) by smtp-outbound.ironport.com with ESMTP; 25 Nov 2008 16:15:12 -0800 Message-ID: <492C9515.9020703@elischer.org> Date: Tue, 25 Nov 2008 16:15:17 -0800 From: Julian Elischer User-Agent: Thunderbird 2.0.0.18 (Macintosh/20081105) MIME-Version: 1.0 To: Marko Zec References: <200811252347.mAPNlvda037095@repoman.freebsd.org> In-Reply-To: <200811252347.mAPNlvda037095@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 153564 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, 26 Nov 2008 00:26:32 -0000 Marko Zec wrote: > http://perforce.freebsd.org/chv.cgi?CH=153564 > > Change 153564 by zec@zec_tpx32 on 2008/11/25 23:47:35 > > static struct sockaddr key_src should most probably be > virtualized as well (?) > why? is it ever written to? > Affected files ... > > .. //depot/projects/vimage-commit2/src/sys/netipsec/keysock.c#14 edit > .. //depot/projects/vimage-commit2/src/sys/netipsec/vipsec.h#9 edit > > Differences ... > > ==== //depot/projects/vimage-commit2/src/sys/netipsec/keysock.c#14 (text+ko) ==== > > @@ -74,10 +74,9 @@ > #ifdef VIMAGE_GLOBALS > static struct key_cb key_cb; > struct pfkeystat pfkeystat; > +static struct sockaddr key_src; > #endif > > -static struct sockaddr key_src = { 2, PF_KEY, }; > - > static int key_sendup0 __P((struct rawcb *, struct mbuf *, int)); > > /* > @@ -573,6 +572,9 @@ > { > INIT_VNET_IPSEC(curvnet); > > + V_key_src.sa_len = 2; > + V_key_src.sa_family = PF_KEY; > + > bzero((caddr_t)&V_key_cb, sizeof(V_key_cb)); > ipsec_init(); > key_init(); > > ==== //depot/projects/vimage-commit2/src/sys/netipsec/vipsec.h#9 (text+ko) ==== > > @@ -106,7 +106,7 @@ > > struct pfkeystat _pfkeystat; > struct key_cb _key_cb; > - > + struct sockaddr _key_src; > LIST_HEAD(, secpolicy) _sptree[IPSEC_DIR_MAX]; > LIST_HEAD(, secashead) _sahtree; > LIST_HEAD(, secreg) _regtree[SADB_SATYPE_MAX + 1]; From owner-p4-projects@FreeBSD.ORG Wed Nov 26 00:37:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8D3101065672; Wed, 26 Nov 2008 00:37:48 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 51133106564A for ; Wed, 26 Nov 2008 00:37:48 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 43C368FC0A for ; Wed, 26 Nov 2008 00:37:48 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAQ0bmPj043003 for ; Wed, 26 Nov 2008 00:37:48 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAQ0blxs043001 for perforce@freebsd.org; Wed, 26 Nov 2008 00:37:47 GMT (envelope-from zec@tel.fer.hr) Date: Wed, 26 Nov 2008 00:37:47 GMT Message-Id: <200811260037.mAQ0blxs043001@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153565 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, 26 Nov 2008 00:37:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=153565 Change 153565 by zec@zec_tca51 on 2008/11/26 00:37:42 A step towards unbreaking kernel build... Affected files ... .. //depot/projects/vimage/src/sys/contrib/altq/altq/altq_subr.c#12 edit .. //depot/projects/vimage/src/sys/net/if.c#50 edit .. //depot/projects/vimage/src/sys/netinet/in.c#22 edit .. //depot/projects/vimage/src/sys/netinet/in_gif.c#16 edit .. //depot/projects/vimage/src/sys/netinet/ip_input.c#41 edit .. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#31 edit .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#61 edit .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#47 edit .. //depot/projects/vimage/src/sys/netinet/tcp_var.h#28 edit .. //depot/projects/vimage/src/sys/netinet/vinet.h#35 edit .. //depot/projects/vimage/src/sys/netinet6/in6_var.h#7 edit .. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#39 edit .. //depot/projects/vimage/src/sys/netinet6/ip6_var.h#15 edit .. //depot/projects/vimage/src/sys/netinet6/nd6.c#36 edit .. //depot/projects/vimage/src/sys/netinet6/nd6.h#11 edit .. //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#22 edit .. //depot/projects/vimage/src/sys/netinet6/raw_ip6.c#29 edit .. //depot/projects/vimage/src/sys/netinet6/scope6.c#20 edit .. //depot/projects/vimage/src/sys/netinet6/tcp6_var.h#4 edit .. //depot/projects/vimage/src/sys/netinet6/vinet6.h#26 edit .. //depot/projects/vimage/src/sys/netipsec/ipsec.c#30 edit .. //depot/projects/vimage/src/sys/netipsec/key.c#29 edit .. //depot/projects/vimage/src/sys/netipsec/keysock.c#19 edit .. //depot/projects/vimage/src/sys/netipsec/vipsec.h#17 edit .. //depot/projects/vimage/src/sys/netipsec/xform_ah.c#21 edit .. //depot/projects/vimage/src/sys/netipsec/xform_esp.c#20 edit Differences ... ==== //depot/projects/vimage/src/sys/contrib/altq/altq/altq_subr.c#12 (text+ko) ==== @@ -47,6 +47,7 @@ #include #include #include +#include #include #include ==== //depot/projects/vimage/src/sys/net/if.c#50 (text+ko) ==== @@ -370,7 +370,6 @@ static void if_init(void *dummy __unused) { - INIT_VNET_NET(curvnet); #ifdef VIMAGE vnet_mod_register(&vnet_net_modinfo); ==== //depot/projects/vimage/src/sys/netinet/in.c#22 (text+ko) ==== @@ -70,7 +70,6 @@ static int subnetsarelocal; static int sameprefixcarponly; extern struct inpcbinfo ripcbinfo; -extern struct inpcbinfo udbinfo; #endif SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, OID_AUTO, subnets_are_local, ==== //depot/projects/vimage/src/sys/netinet/in_gif.c#16 (text+ko) ==== @@ -85,9 +85,6 @@ .pr_usrreqs = &rip_usrreqs }; -#ifdef VIMAGE_GLOBALS -extern int ip_gif_ttl; -#endif SYSCTL_V_INT(V_NET, vnet_gif, _net_inet_ip, IPCTL_GIF_TTL, gifttl, CTLFLAG_RW, ip_gif_ttl, 0, ""); ==== //depot/projects/vimage/src/sys/netinet/ip_input.c#41 (text+ko) ==== @@ -168,7 +168,9 @@ SYSCTL_V_STRUCT(V_NET, vnet_inet, _net_inet_ip, IPCTL_STATS, stats, CTLFLAG_RW, ipstat, ipstat, "IP statistics (struct ipstat, netinet/ip_var.h)"); +#ifdef VIMAGE_GLOBALS static uma_zone_t ipq_zone; +#endif static struct mtx ipqlock; #define IPQ_LOCK() mtx_lock(&ipqlock) ==== //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#31 (text+ko) ==== @@ -105,19 +105,6 @@ #define TCP_HOSTCACHE_EXPIRE 60*60 /* one hour */ #define TCP_HOSTCACHE_PRUNE 5*60 /* every 5 minutes */ -struct tcp_hostcache { - struct hc_head *hashbase; - uma_zone_t zone; - u_int hashsize; - u_int hashmask; - u_int bucket_limit; - u_int cache_count; - u_int cache_limit; - int expire; - int prune; - int purgeall; -}; - #ifdef VIMAGE_GLOBALS static struct tcp_hostcache tcp_hostcache; static struct callout tcp_hc_callout; ==== //depot/projects/vimage/src/sys/netinet/tcp_subr.c#61 (text+ko) ==== @@ -121,11 +121,11 @@ static int icmp_may_rst; static int tcp_isn_reseed_interval; static int tcp_inflight_enable; -static int tcp_inflight_rttthresh; static int tcp_inflight_min; static int tcp_inflight_max; static int tcp_inflight_stab; #endif +static int tcp_inflight_rttthresh; static int sysctl_net_inet_tcp_mss_check(SYSCTL_HANDLER_ARGS) @@ -191,9 +191,11 @@ SYSCTL_INT(_net_inet_tcp, OID_AUTO, log_debug, CTLFLAG_RW, &tcp_log_debug, 0, "Log errors caused by incoming TCP segments"); +static int tcp_tcbhashsize = 0; SYSCTL_INT(_net_inet_tcp, OID_AUTO, tcbhashsize, CTLFLAG_RDTUN, &tcp_tcbhashsize, 0, "Size of TCP control-block hashtable"); +static int do_tcpdrain = 1; SYSCTL_INT(_net_inet_tcp, OID_AUTO, do_tcpdrain, CTLFLAG_RW, &do_tcpdrain, 0, "Enable tcp_drain routine for extra help when low on mbufs"); @@ -220,6 +222,7 @@ CTLFLAG_RW, tcp_inflight_enable, 0, "Enable automatic TCP inflight data limiting"); +static int tcp_inflight_debug = 0; SYSCTL_INT(_net_inet_tcp_inflight, OID_AUTO, debug, CTLFLAG_RW, &tcp_inflight_debug, 0, "Debug TCP inflight calculations"); ==== //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#47 (text+ko) ==== @@ -105,12 +105,12 @@ int tcp_sc_rst_sock_fail; #endif -SYSCTL_INT(_net_inet_tcp, OID_AUTO, syncookies, CTLFLAG_RW, - &tcp_syncookies, 0, +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, syncookies, + CTLFLAG_RW, tcp_syncookies, 0, "Use TCP SYN cookies if the syncache overflows"); -SYSCTL_INT(_net_inet_tcp, OID_AUTO, syncookies_only, CTLFLAG_RW, - &tcp_syncookiesonly, 0, +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, syncookies_only, + CTLFLAG_RW, tcp_syncookiesonly, 0, "Use only TCP SYN cookies"); #ifdef TCP_OFFLOAD_DISABLE @@ -855,7 +855,7 @@ * B. check that the syncookie is valid. If it is, then * cobble up a fake syncache entry, and return. */ - if (!tcp_syncookies) { + if (!V_tcp_syncookies) { SCH_UNLOCK(sch); if ((s = tcp_log_addrs(inc, th, NULL, NULL))) log(LOG_DEBUG, "%s; %s: Spurious ACK, " @@ -1117,7 +1117,7 @@ syncache_drop(sc, sch); sc = uma_zalloc(V_tcp_syncache.zone, M_NOWAIT | M_ZERO); if (sc == NULL) { - if (tcp_syncookies) { + if (V_tcp_syncookies) { bzero(&scs, sizeof(scs)); sc = &scs; } else { @@ -1226,7 +1226,7 @@ if ((th->th_flags & (TH_ECE|TH_CWR)) && V_tcp_do_ecn) sc->sc_flags |= SCF_ECN; - if (tcp_syncookies) { + if (V_tcp_syncookies) { syncookie_generate(sch, sc, &flowtmp); #ifdef INET6 if (autoflowlabel) @@ -1245,7 +1245,7 @@ * Do a standard 3-way handshake. */ if (TOEPCB_ISSET(sc) || syncache_respond(sc) == 0) { - if (tcp_syncookies && tcp_syncookiesonly && sc != &scs) + if (V_tcp_syncookies && V_tcp_syncookiesonly && sc != &scs) syncache_free(sc); else if (sc != &scs) syncache_insert(sc, sch); /* locks and unlocks sch */ ==== //depot/projects/vimage/src/sys/netinet/tcp_var.h#28 (text+ko) ==== @@ -50,6 +50,7 @@ struct mbuf *tqe_m; /* mbuf contains packet */ }; LIST_HEAD(tsegqe_head, tseg_qent); +extern int tcp_reass_qsize; extern struct uma_zone *tcp_reass_zone; struct sackblk { @@ -507,7 +508,9 @@ MALLOC_DECLARE(M_TCPLOG); #endif -#ifndef VIMAGE +extern int tcp_log_in_vain; + +#ifdef VIMAGE_GLOBALS extern struct inpcbhead tcb; /* head of queue of active tcpcb's */ extern struct inpcbinfo tcbinfo; extern struct tcpstat tcpstat; /* tcp statistics */ @@ -543,6 +546,7 @@ extern int tcp_sc_rst_sock_fail; /* RST on sock alloc failure */ extern int tcp_do_ecn; /* TCP ECN enabled/disabled */ extern int tcp_ecn_maxretries; +#endif /* VIMAGE_GLOBALS */ int tcp_addoptions(struct tcpopt *, u_char *); struct tcpcb * ==== //depot/projects/vimage/src/sys/netinet/vinet.h#35 (text+ko) ==== @@ -93,11 +93,14 @@ struct tcp_hostcache _tcp_hostcache; struct callout _tcp_hc_callout; struct tcp_syncache _tcp_syncache; + int _tcp_syncookies; + int _tcp_syncookiesonly; + int _tcp_sc_rst_sock_fail; + struct inpcbhead _divcb; struct inpcbinfo _divcbinfo; TAILQ_HEAD(, tcptw) _twq_2msl; - int _tcp_sc_rst_sock_fail; int _tcp_mssdflt; int _tcp_v6mssdflt; int _tcp_minmss; ==== //depot/projects/vimage/src/sys/netinet6/in6_var.h#7 (text+ko) ==== @@ -470,7 +470,7 @@ #endif #ifdef _KERNEL -#ifndef VIMAGE +#ifdef VIMAGE_GLOBALS extern struct in6_ifaddr *in6_ifaddr; extern struct icmp6stat icmp6stat; ==== //depot/projects/vimage/src/sys/netinet6/ip6_input.c#39 (text+ko) ==== @@ -322,7 +322,7 @@ /* This must be after route_init(), which is now SI_ORDER_THIRD */ SYSINIT(netinet6init2, SI_SUB_PROTO_DOMAIN, SI_ORDER_MIDDLE, ip6_init2, NULL); -#ifndef VIMAGE +#ifdef VIMAGE_GLOBALS extern struct route_in6 ip6_forward_rt; #endif ==== //depot/projects/vimage/src/sys/netinet6/ip6_var.h#15 (text+ko) ==== @@ -279,7 +279,7 @@ #define IP6_HDR_ALIGNED_P(ip) ((((intptr_t) (ip)) & 3) == 0) #endif -#ifndef VIMAGE +#ifdef VIMAGE_GLOBALS extern struct ip6stat ip6stat; /* statistics */ extern int ip6_defhlim; /* default hop limit */ extern int ip6_defmcasthlim; /* default multicast hop limit */ @@ -294,7 +294,7 @@ #endif extern struct socket *ip6_mrouter; /* multicast routing daemon */ -#ifndef VIMAGE +#ifdef VIMAGE_GLOBALS extern int ip6_sendredirects; /* send IP redirects when forwarding? */ extern int ip6_maxfragpackets; /* Maximum packets in reassembly queue */ extern int ip6_maxfrags; /* Maximum fragments in reassembly queue */ @@ -317,7 +317,7 @@ extern int ip6_lowportmax; /* maximum reserved port */ extern int ip6_use_tempaddr; /* whether to use temporary addresses. */ -#ifndef VIMAGE +#ifdef VIMAGE_GLOBALS extern int ip6_prefer_tempaddr; /* whether to prefer temporary addresses in the source address selection */ #endif ==== //depot/projects/vimage/src/sys/netinet6/nd6.c#36 (text+ko) ==== @@ -151,10 +151,8 @@ V_nd6_recalc_reachtm_interval = ND6_RECALC_REACHTM_INTERVAL; -#ifdef INET6 - V_dad_ignore_ns = 0; /* ignore NS in DAD - specwise incorrect*/ -#endif - V_dad_maxtry = 15; /* max # of *tries* to transmit DAD packet */ + V_dad_maxtry = 15; /* max # of *tries* to transmit DAD packet */ + V_dad_ignore_ns = 0; /* ignore NS in DAD - specwise incorrect*/ V_llinfo_nd6.ln_next = &V_llinfo_nd6; V_llinfo_nd6.ln_prev = &V_llinfo_nd6; ==== //depot/projects/vimage/src/sys/netinet6/nd6.h#11 (text+ko) ==== @@ -328,7 +328,7 @@ LIST_HEAD(nd_prhead, nd_prefix); /* nd6.c */ -#ifndef VIMAGE +#ifdef VIMAGE_GLOBALS extern int nd6_prune; extern int nd6_delay; extern int nd6_umaxtries; ==== //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#22 (text+ko) ==== @@ -87,9 +87,7 @@ #ifdef VIMAGE_GLOBALS extern int nd6_recalc_reachtm_interval; -#endif -#ifdef VIMAGE_GLOBALS static struct ifnet *nd6_defifp; int nd6_defifindex; ==== //depot/projects/vimage/src/sys/netinet6/raw_ip6.c#29 (text+ko) ==== @@ -112,19 +112,14 @@ * Raw interface to IP6 protocol. */ -#ifndef VIMAGE +#ifdef VIMAGE_GLOBALS extern struct inpcbhead ripcb; extern struct inpcbinfo ripcbinfo; - struct rip6stat rip6stat; #endif extern u_long rip_sendspace; extern u_long rip_recvspace; -#ifdef VIMAGE_GLOBALS -struct rip6stat rip6stat; -#endif - /* * Hooks for multicast forwarding. */ ==== //depot/projects/vimage/src/sys/netinet6/scope6.c#20 (text+ko) ==== @@ -50,6 +50,7 @@ #include #include + /* * The scope6_lock protects the global sid default stored in * sid_default below. ==== //depot/projects/vimage/src/sys/netinet6/tcp6_var.h#4 (text+ko) ==== @@ -67,7 +67,7 @@ SYSCTL_DECL(_net_inet6_tcp6); #endif -#ifndef VIMAGE +#ifdef VIMAGE_GLOBALS extern int tcp_v6mssdflt; /* XXX */ #endif ==== //depot/projects/vimage/src/sys/netinet6/vinet6.h#26 (text+ko) ==== @@ -103,7 +103,6 @@ int _ip6_keepfaith; int _ip6stealth; time_t _ip6_log_time; - int _nd6_onlink_ns_rfc4861; int _pmtu_expire; int _pmtu_probe; ==== //depot/projects/vimage/src/sys/netipsec/ipsec.c#30 (text+ko) ==== @@ -184,7 +184,6 @@ CTLFLAG_RW, ipsec_integrity, 0, "Emulate man-in-the-middle attack"); #endif -#ifndef VIMAGE #ifdef INET6 #ifdef VIMAGE_GLOBALS struct ipsecstat ipsec6stat; @@ -194,9 +193,7 @@ int ip6_ah_net_deflev; int ip6_ipsec_ecn; #endif -#endif /* !VIMAGE */ -#ifdef INET6 SYSCTL_DECL(_net_inet6_ipsec6); /* net.inet6.ipsec6 */ @@ -2030,38 +2027,10 @@ { INIT_VNET_IPSEC(curvnet); - #ifdef IPSEC_DEBUG - V_ipsec_debug = 1; - #else - V_ipsec_debug = 0; - #endif - SECPOLICY_LOCK_INIT(&V_ip4_def_policy); V_ip4_def_policy.refcnt = 1; /* NB: disallow free */ - V_ip4_ah_offsetmask = 0; /* maybe IP_DF? */ - V_ip4_ipsec_dfbit = 0; /* DF bit on encap. 0: clear 1: set 2: copy */ - V_ip4_esp_trans_deflev = IPSEC_LEVEL_USE; - V_ip4_esp_net_deflev = IPSEC_LEVEL_USE; - V_ip4_ah_trans_deflev = IPSEC_LEVEL_USE; - V_ip4_ah_net_deflev = IPSEC_LEVEL_USE; - V_ip4_ipsec_ecn = 0; - - V_crypto_support = CRYPTOCAP_F_HARDWARE | CRYPTOCAP_F_SOFTWARE; -#ifdef REGRESSION - V_ipsec_replay = 0; - V_ipsec_integrity = 0; -#endif - -#ifdef INET6 - V_ip6_esp_trans_deflev = IPSEC_LEVEL_USE; - V_ip6_esp_net_deflev = IPSEC_LEVEL_USE; - V_ip6_ah_trans_deflev = IPSEC_LEVEL_USE; - V_ip6_ah_net_deflev = IPSEC_LEVEL_USE; - V_ip6_ipsec_ecn = 0; /* ECN ignore(-1)/forbidden(0)/allowed(1) */ -#endif - - return 0; + return (0); } /* XXX finish this! */ @@ -2070,7 +2039,7 @@ vnet_ipsec_idetach(unused) const void *unused; { - return 0; + return (0); } #endif SYSINIT(ipsec, SI_SUB_PROTO_DOMAIN, SI_ORDER_FIRST, ipsec_attach, NULL); ==== //depot/projects/vimage/src/sys/netipsec/key.c#29 (text+ko) ==== @@ -130,7 +130,6 @@ static int ipsec_esp_keymin; static int ipsec_esp_auth; static int ipsec_ah_keymin; -static u_int32_t acq_seq = 0; static LIST_HEAD(_sptree, secpolicy) sptree[IPSEC_DIR_MAX]; /* SPD */ static LIST_HEAD(_sahtree, secashead) sahtree; /* SAD */ @@ -190,7 +189,6 @@ static const u_int saorder_state_valid_prefer_new[] = { SADB_SASTATE_MATURE, SADB_SASTATE_DYING, }; -#ifndef VIMAGE static u_int saorder_state_alive[] = { /* except DEAD */ SADB_SASTATE_MATURE, SADB_SASTATE_DYING, SADB_SASTATE_LARVAL @@ -199,7 +197,6 @@ SADB_SASTATE_MATURE, SADB_SASTATE_DYING, SADB_SASTATE_LARVAL, SADB_SASTATE_DEAD }; -#endif static const int minsize[] = { sizeof(struct sadb_msg), /* SADB_EXT_RESERVED */ @@ -7209,14 +7206,6 @@ V_ipsec_esp_auth = 0; V_ipsec_ah_keymin = 128; - V_saorder_state_alive[0] = SADB_SASTATE_MATURE; - V_saorder_state_alive[1] = SADB_SASTATE_DYING; - V_saorder_state_alive[2] = SADB_SASTATE_LARVAL; - V_saorder_state_any[0] = SADB_SASTATE_MATURE; - V_saorder_state_any[1] = SADB_SASTATE_DYING; - V_saorder_state_any[2] = SADB_SASTATE_LARVAL; - V_saorder_state_any[3] = SADB_SASTATE_DEAD; - #ifdef VIMAGE if (IS_DEFAULT_VNET(curvnet)) { #endif ==== //depot/projects/vimage/src/sys/netipsec/keysock.c#19 (text+ko) ==== @@ -66,7 +66,6 @@ #include -#ifndef VIMAGE struct key_cb { int key_count; int any_count; @@ -75,9 +74,7 @@ #ifdef VIMAGE_GLOBALS static struct key_cb key_cb; struct pfkeystat pfkeystat; -#endif - -static struct sockaddr key_src = { 2, PF_KEY, }; +static struct sockaddr key_src; #endif static int key_sendup0 __P((struct rawcb *, struct mbuf *, int)); ==== //depot/projects/vimage/src/sys/netipsec/vipsec.h#17 (text+ko) ==== @@ -141,7 +141,7 @@ #define V_ip4_esp_trans_deflev VNET_IPSEC(ip4_esp_trans_deflev) #define V_ip4_ipsec_dfbit VNET_IPSEC(ip4_ipsec_dfbit) #define V_ip4_ipsec_ecn VNET_IPSEC(ip4_ipsec_ecn) -#define V_ip6_ah_net_deflev VNET_IPSEC(ip6_ah_net_deflev) +#define V_ip6_ah_net_deflev VNET_IPSEC(ip6_ah_net_deflev) #define V_ip6_ah_trans_deflev VNET_IPSEC(ip6_ah_trans_deflev) #define V_ip6_esp_net_deflev VNET_IPSEC(ip6_esp_net_deflev) #define V_ip6_esp_randpad VNET_IPSEC(ip6_esp_randpad) ==== //depot/projects/vimage/src/sys/netipsec/xform_ah.c#21 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netipsec/xform_esp.c#20 (text+ko) ==== @@ -997,13 +997,13 @@ { INIT_VNET_IPSEC(curvnet); - V_esp_enable = 1; - V_esp_max_ivlen = 0; - #define MAXIV(xform) \ if (xform.blocksize > V_esp_max_ivlen) \ V_esp_max_ivlen = xform.blocksize \ + V_esp_enable = 1; + V_esp_max_ivlen = 0; + MAXIV(enc_xform_des); /* SADB_EALG_DESCBC */ MAXIV(enc_xform_3des); /* SADB_EALG_3DESCBC */ MAXIV(enc_xform_rijndael128); /* SADB_X_EALG_AES */ From owner-p4-projects@FreeBSD.ORG Wed Nov 26 01:07:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 78EE41065675; Wed, 26 Nov 2008 01:07:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3D6961065673 for ; Wed, 26 Nov 2008 01:07:37 +0000 (UTC) (envelope-from zec@freebsd.org) Received: from xaqua.tel.fer.hr (xaqua.tel.fer.hr [161.53.19.25]) by mx1.freebsd.org (Postfix) with ESMTP id F290D8FC19 for ; Wed, 26 Nov 2008 01:07:35 +0000 (UTC) (envelope-from zec@freebsd.org) Received: by xaqua.tel.fer.hr (Postfix, from userid 20006) id 937129B64D; Wed, 26 Nov 2008 01:45:12 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.1.7 (2006-10-05) on xaqua.tel.fer.hr X-Spam-Level: X-Spam-Status: No, score=-4.2 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.7 Received: from localhost (imunes.tel.fer.hr [161.53.19.8]) by xaqua.tel.fer.hr (Postfix) with ESMTP id 0F50B9B647; Wed, 26 Nov 2008 01:45:09 +0100 (CET) From: Marko Zec To: Julian Elischer Date: Wed, 26 Nov 2008 01:45:02 +0100 User-Agent: KMail/1.9.7 References: <200811252347.mAPNlvda037095@repoman.freebsd.org> <492C9515.9020703@elischer.org> In-Reply-To: <492C9515.9020703@elischer.org> MIME-Version: 1.0 Content-Disposition: inline Message-Id: <200811260145.02922.zec@freebsd.org> Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 153564 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, 26 Nov 2008 01:07:37 -0000 On Wednesday 26 November 2008 01:15:17 Julian Elischer wrote: > Marko Zec wrote: > > http://perforce.freebsd.org/chv.cgi?CH=153564 > > > > Change 153564 by zec@zec_tpx32 on 2008/11/25 23:47:35 > > > > static struct sockaddr key_src should most probably be > > virtualized as well (?) > > why? > > is it ever written to? no it isn't - a call to sbappendaddr() has key_src as an argument but as a const... good catch, thanks! Marko > > Affected files ... > > > > .. //depot/projects/vimage-commit2/src/sys/netipsec/keysock.c#14 > > edit .. //depot/projects/vimage-commit2/src/sys/netipsec/vipsec.h#9 > > edit > > > > Differences ... > > > > ==== //depot/projects/vimage-commit2/src/sys/netipsec/keysock.c#14 > > (text+ko) ==== > > > > @@ -74,10 +74,9 @@ > > #ifdef VIMAGE_GLOBALS > > static struct key_cb key_cb; > > struct pfkeystat pfkeystat; > > +static struct sockaddr key_src; > > #endif > > > > -static struct sockaddr key_src = { 2, PF_KEY, }; > > - > > static int key_sendup0 __P((struct rawcb *, struct mbuf *, int)); > > > > /* > > @@ -573,6 +572,9 @@ > > { > > INIT_VNET_IPSEC(curvnet); > > > > + V_key_src.sa_len = 2; > > + V_key_src.sa_family = PF_KEY; > > + > > bzero((caddr_t)&V_key_cb, sizeof(V_key_cb)); > > ipsec_init(); > > key_init(); > > > > ==== //depot/projects/vimage-commit2/src/sys/netipsec/vipsec.h#9 > > (text+ko) ==== > > > > @@ -106,7 +106,7 @@ > > > > struct pfkeystat _pfkeystat; > > struct key_cb _key_cb; > > - > > + struct sockaddr _key_src; > > LIST_HEAD(, secpolicy) _sptree[IPSEC_DIR_MAX]; > > LIST_HEAD(, secashead) _sahtree; > > LIST_HEAD(, secreg) _regtree[SADB_SATYPE_MAX + 1]; From owner-p4-projects@FreeBSD.ORG Wed Nov 26 01:21:32 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B61B41065673; Wed, 26 Nov 2008 01:21:32 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7A597106564A for ; Wed, 26 Nov 2008 01:21:32 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6C6138FC13 for ; Wed, 26 Nov 2008 01:21:32 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAQ1LWvr070753 for ; Wed, 26 Nov 2008 01:21:32 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAQ1LWIF070751 for perforce@freebsd.org; Wed, 26 Nov 2008 01:21:32 GMT (envelope-from zec@tel.fer.hr) Date: Wed, 26 Nov 2008 01:21:32 GMT Message-Id: <200811260121.mAQ1LWIF070751@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153566 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, 26 Nov 2008 01:21:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=153566 Change 153566 by zec@zec_tpx32 on 2008/11/26 01:20:55 Revert change 153564 - key_src is never written to so it doesn't make any sense to virtualize / replicate it. Pointed out by: julian Affected files ... .. //depot/projects/vimage-commit2/src/sys/netipsec/keysock.c#15 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/vipsec.h#10 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netipsec/keysock.c#15 (text+ko) ==== @@ -74,9 +74,10 @@ #ifdef VIMAGE_GLOBALS static struct key_cb key_cb; struct pfkeystat pfkeystat; -static struct sockaddr key_src; #endif +static struct sockaddr key_src = { 2, PF_KEY }; + static int key_sendup0 __P((struct rawcb *, struct mbuf *, int)); /* @@ -572,9 +573,6 @@ { INIT_VNET_IPSEC(curvnet); - V_key_src.sa_len = 2; - V_key_src.sa_family = PF_KEY; - bzero((caddr_t)&V_key_cb, sizeof(V_key_cb)); ipsec_init(); key_init(); ==== //depot/projects/vimage-commit2/src/sys/netipsec/vipsec.h#10 (text+ko) ==== @@ -106,7 +106,6 @@ struct pfkeystat _pfkeystat; struct key_cb _key_cb; - struct sockaddr _key_src; LIST_HEAD(, secpolicy) _sptree[IPSEC_DIR_MAX]; LIST_HEAD(, secashead) _sahtree; LIST_HEAD(, secreg) _regtree[SADB_SATYPE_MAX + 1]; From owner-p4-projects@FreeBSD.ORG Wed Nov 26 01:22:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E716D1065672; Wed, 26 Nov 2008 01:22:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AB86B106564A for ; Wed, 26 Nov 2008 01:22:33 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9CFC98FC0C for ; Wed, 26 Nov 2008 01:22:33 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAQ1MXum070831 for ; Wed, 26 Nov 2008 01:22:33 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAQ1MXco070829 for perforce@freebsd.org; Wed, 26 Nov 2008 01:22:33 GMT (envelope-from zec@tel.fer.hr) Date: Wed, 26 Nov 2008 01:22:33 GMT Message-Id: <200811260122.mAQ1MXco070829@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153567 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, 26 Nov 2008 01:22:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=153567 Change 153567 by zec@zec_tca51 on 2008/11/26 01:22:05 Unbreak GENETRIC and VIMAGE kernel builds. Affected files ... .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#55 edit .. //depot/projects/vimage/src/sys/netinet/tcp_timewait.c#21 edit .. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#40 edit .. //depot/projects/vimage/src/sys/netinet/udp_var.h#9 edit .. //depot/projects/vimage/src/sys/netinet6/in6_proto.c#34 edit .. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#40 edit .. //depot/projects/vimage/src/sys/netinet6/ip6_var.h#16 edit .. //depot/projects/vimage/src/sys/netinet6/nd6.c#37 edit .. //depot/projects/vimage/src/sys/netinet6/nd6_nbr.c#27 edit .. //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#23 edit .. //depot/projects/vimage/src/sys/nfsclient/nfs_vnops.c#22 edit Differences ... ==== //depot/projects/vimage/src/sys/netinet/ip_fw2.c#55 (text+ko) ==== @@ -1798,7 +1798,6 @@ add_table_entry(struct ip_fw_chain *ch, uint16_t tbl, in_addr_t addr, uint8_t mlen, uint32_t value) { - INIT_VNET_IPFW(curvnet); struct radix_node_head *rnh; struct table_entry *ent; ==== //depot/projects/vimage/src/sys/netinet/tcp_timewait.c#21 (text+ko) ==== @@ -150,8 +150,8 @@ &maxtcptw, 0, sysctl_maxtcptw, "IU", "Maximum number of compressed TCP TIME_WAIT entries"); -SYSCTL_INT(_net_inet_tcp, OID_AUTO, nolocaltimewait, CTLFLAG_RW, - &nolocaltimewait, 0, +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_tcp, OID_AUTO, nolocaltimewait, + CTLFLAG_RW, nolocaltimewait, 0, "Do not create compressed TCP TIME_WAIT entries for local connections"); void ==== //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#40 (text+ko) ==== @@ -113,7 +113,8 @@ SYSCTL_INT(_net_inet_udp, OID_AUTO, log_in_vain, CTLFLAG_RW, &udp_log_in_vain, 0, "Log all incoming UDP packets"); -SYSCTL_INT(_net_inet_udp, OID_AUTO, blackhole, CTLFLAG_RW, &udp_blackhole, 0, +SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_udp, OID_AUTO, blackhole, + CTLFLAG_RW, udp_blackhole, 0, "Do not send port unreachables for refused connects"); u_long udp_sendspace = 9216; /* really max datagram size */ ==== //depot/projects/vimage/src/sys/netinet/udp_var.h#9 (text+ko) ==== @@ -99,10 +99,10 @@ extern struct inpcbhead udb; extern struct inpcbinfo udbinfo; extern struct udpstat udpstat; +extern int udp_blackhole; #endif extern u_long udp_sendspace; extern u_long udp_recvspace; -extern int udp_blackhole; extern int udp_log_in_vain; void udp_ctlinput(int, struct sockaddr *, void *); ==== //depot/projects/vimage/src/sys/netinet6/in6_proto.c#34 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet6/ip6_input.c#40 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netinet6/ip6_var.h#16 (text+ko) ==== @@ -316,8 +316,8 @@ extern int ip6_lowportmin; /* minimum reserved port */ extern int ip6_lowportmax; /* maximum reserved port */ +#ifdef VIMAGE_GLOBALS extern int ip6_use_tempaddr; /* whether to use temporary addresses. */ -#ifdef VIMAGE_GLOBALS extern int ip6_prefer_tempaddr; /* whether to prefer temporary addresses in the source address selection */ #endif ==== //depot/projects/vimage/src/sys/netinet6/nd6.c#37 (text+ko) ==== @@ -50,6 +50,7 @@ #include #include #include +#include #include #include @@ -158,10 +159,10 @@ V_llinfo_nd6.ln_prev = &V_llinfo_nd6; LIST_INIT(&V_nd_prefix); - ip6_use_tempaddr = 0; - ip6_temp_preferred_lifetime = DEF_TEMP_PREFERRED_LIFETIME; - ip6_temp_valid_lifetime = DEF_TEMP_VALID_LIFETIME; - ip6_temp_regen_advance = TEMPADDR_REGEN_ADVANCE; + V_ip6_use_tempaddr = 0; + V_ip6_temp_preferred_lifetime = DEF_TEMP_PREFERRED_LIFETIME; + V_ip6_temp_valid_lifetime = DEF_TEMP_VALID_LIFETIME; + V_ip6_temp_regen_advance = TEMPADDR_REGEN_ADVANCE; V_ip6_desync_factor = 0; ==== //depot/projects/vimage/src/sys/netinet6/nd6_nbr.c#27 (text+ko) ==== @@ -1099,7 +1099,8 @@ }; #ifdef VIMAGE_GLOBALS -static struct dadq_head dadq; +static TAILQ_HEAD(, dadq) dadq; +int dad_init; #endif static struct dadq * ==== //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#23 (text+ko) ==== @@ -95,8 +95,6 @@ int ip6_desync_factor; u_int32_t ip6_temp_preferred_lifetime; u_int32_t ip6_temp_valid_lifetime; -int ip6_temp_preferred_lifetime; -static int ip6_temp_valid_lifetime; int ip6_temp_regen_advance; #endif ==== //depot/projects/vimage/src/sys/nfsclient/nfs_vnops.c#22 (text+ko) ==== @@ -1411,7 +1411,7 @@ if (v3) { tl = nfsm_build(u_int32_t *, NFSX_UNSIGNED); if (fmode & O_EXCL) { - CURVNET_SET(VFSTONFS(dvp->v_mount)->nm_so->so_vnet); + CURVNET_SET(VFSTONFS(dvp->v_mount)->nm_rpcclnt.rc_so->so_vnet); *tl = txdr_unsigned(NFSV3CREATE_EXCLUSIVE); tl = nfsm_build(u_int32_t *, NFSX_V3CREATEVERF); #ifdef INET From owner-p4-projects@FreeBSD.ORG Wed Nov 26 01:34:46 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9C5091065675; Wed, 26 Nov 2008 01:34:46 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 60A031065672 for ; Wed, 26 Nov 2008 01:34:46 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 51E198FC18 for ; Wed, 26 Nov 2008 01:34:46 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAQ1Yj2F071720 for ; Wed, 26 Nov 2008 01:34:45 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAQ1YjvJ071718 for perforce@freebsd.org; Wed, 26 Nov 2008 01:34:45 GMT (envelope-from zec@tel.fer.hr) Date: Wed, 26 Nov 2008 01:34:45 GMT Message-Id: <200811260134.mAQ1YjvJ071718@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153568 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, 26 Nov 2008 01:34:47 -0000 http://perforce.freebsd.org/chv.cgi?CH=153568 Change 153568 by zec@zec_tca51 on 2008/11/26 01:33:45 Unbreak LINT / VLINT builds as well. It looks like saorder_state_any and saorder_state_alive variables are de facto const, so revert them back from V_ to plain globals. Hmm... Affected files ... .. //depot/projects/vimage/src/sys/netipsec/key.c#30 edit .. //depot/projects/vimage/src/sys/netipsec/keysock.c#20 edit .. //depot/projects/vimage/src/sys/netipsec/vipsec.h#18 edit Differences ... ==== //depot/projects/vimage/src/sys/netipsec/key.c#30 (text+ko) ==== @@ -2699,9 +2699,9 @@ /* searching all SA registerd in the secindex. */ for (stateidx = 0; - stateidx < _ARRAYLEN(V_saorder_state_any); + stateidx < _ARRAYLEN(saorder_state_any); stateidx++) { - u_int state = V_saorder_state_any[stateidx]; + u_int state = saorder_state_any[stateidx]; LIST_FOREACH_SAFE(sav, &sah->savtree[state], chain, nextsav) { if (sav->refcnt == 0) { /* sanity check */ @@ -2985,10 +2985,10 @@ SAHTREE_LOCK_ASSERT(); /* search all status */ for (stateidx = 0; - stateidx < _ARRAYLEN(V_saorder_state_alive); + stateidx < _ARRAYLEN(saorder_state_alive); stateidx++) { - state = V_saorder_state_alive[stateidx]; + state = saorder_state_alive[stateidx]; LIST_FOREACH(sav, &sah->savtree[state], chain) { /* sanity check */ @@ -5315,9 +5315,9 @@ /* Delete all non-LARVAL SAs. */ for (stateidx = 0; - stateidx < _ARRAYLEN(V_saorder_state_alive); + stateidx < _ARRAYLEN(saorder_state_alive); stateidx++) { - state = V_saorder_state_alive[stateidx]; + state = saorder_state_alive[stateidx]; if (state == SADB_SASTATE_LARVAL) continue; for (sav = LIST_FIRST(&sah->savtree[state]); @@ -6520,9 +6520,9 @@ continue; for (stateidx = 0; - stateidx < _ARRAYLEN(V_saorder_state_alive); + stateidx < _ARRAYLEN(saorder_state_alive); stateidx++) { - state = V_saorder_state_any[stateidx]; + state = saorder_state_any[stateidx]; for (sav = LIST_FIRST(&sah->savtree[state]); sav != NULL; sav = nextsav) { @@ -6605,9 +6605,9 @@ continue; for (stateidx = 0; - stateidx < _ARRAYLEN(V_saorder_state_any); + stateidx < _ARRAYLEN(saorder_state_any); stateidx++) { - state = V_saorder_state_any[stateidx]; + state = saorder_state_any[stateidx]; LIST_FOREACH(sav, &sah->savtree[state], chain) { cnt++; } @@ -6635,9 +6635,9 @@ } for (stateidx = 0; - stateidx < _ARRAYLEN(V_saorder_state_any); + stateidx < _ARRAYLEN(saorder_state_any); stateidx++) { - state = V_saorder_state_any[stateidx]; + state = saorder_state_any[stateidx]; LIST_FOREACH(sav, &sah->savtree[state], chain) { n = key_setdumpsa(sav, SADB_DUMP, satype, --cnt, mhp->msg->sadb_msg_pid); ==== //depot/projects/vimage/src/sys/netipsec/keysock.c#20 (text+ko) ==== @@ -66,11 +66,6 @@ #include -struct key_cb { - int key_count; - int any_count; -}; - #ifdef VIMAGE_GLOBALS static struct key_cb key_cb; struct pfkeystat pfkeystat; ==== //depot/projects/vimage/src/sys/netipsec/vipsec.h#18 (text+ko) ==== @@ -80,8 +80,6 @@ int _key_preferred_oldsa; u_int32_t _acq_seq; - u_int _saorder_state_alive[3]; - u_int _saorder_state_any[4]; int _esp_enable; struct espstat _espstat; int _esp_max_ivlen; @@ -175,8 +173,6 @@ #define V_policy_id VNET_IPSEC(policy_id) #define V_regtree VNET_IPSEC(regtree) #define V_sahtree VNET_IPSEC(sahtree) -#define V_saorder_state_alive VNET_IPSEC(saorder_state_alive) -#define V_saorder_state_any VNET_IPSEC(saorder_state_any) #define V_spacqtree VNET_IPSEC(spacqtree) #define V_sptree VNET_IPSEC(sptree) From owner-p4-projects@FreeBSD.ORG Wed Nov 26 01:44:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C0DB0106567B; Wed, 26 Nov 2008 01:44:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 84B58106564A; Wed, 26 Nov 2008 01:44:21 +0000 (UTC) (envelope-from prvs=julian=20980669f@elischer.org) Received: from smtp-outbound.ironport.com (smtp-outbound.ironport.com [63.251.108.112]) by mx1.freebsd.org (Postfix) with ESMTP id 70E728FC14; Wed, 26 Nov 2008 01:44:21 +0000 (UTC) (envelope-from prvs=julian=20980669f@elischer.org) Received: from jelischer-laptop.sfo.ironport.com (HELO julian-mac.elischer.org) ([10.251.22.38]) by smtp-outbound.ironport.com with ESMTP; 25 Nov 2008 17:44:22 -0800 Message-ID: <492CA9FB.9040406@elischer.org> Date: Tue, 25 Nov 2008 17:44:27 -0800 From: Julian Elischer User-Agent: Thunderbird 2.0.0.18 (Macintosh/20081105) MIME-Version: 1.0 To: Marko Zec References: <200811260134.mAQ1YjvJ071718@repoman.freebsd.org> In-Reply-To: <200811260134.mAQ1YjvJ071718@repoman.freebsd.org> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Perforce Change Reviews Subject: Re: PERFORCE change 153568 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, 26 Nov 2008 01:44:22 -0000 Marko Zec wrote: > http://perforce.freebsd.org/chv.cgi?CH=153568 > > Change 153568 by zec@zec_tca51 on 2008/11/26 01:33:45 > > Unbreak LINT / VLINT builds as well. > > It looks like saorder_state_any and saorder_state_alive > variables are de facto const, so revert them back from V_ > to plain globals. Hmm... > actually marking them const may be a good idea. From owner-p4-projects@FreeBSD.ORG Wed Nov 26 01:46:59 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 938881065676; Wed, 26 Nov 2008 01:46:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3DA6D1065673 for ; Wed, 26 Nov 2008 01:46:59 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2C07B8FC14 for ; Wed, 26 Nov 2008 01:46:59 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAQ1kwRn072672 for ; Wed, 26 Nov 2008 01:46:58 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAQ1kwVH072670 for perforce@freebsd.org; Wed, 26 Nov 2008 01:46:58 GMT (envelope-from zec@tel.fer.hr) Date: Wed, 26 Nov 2008 01:46:58 GMT Message-Id: <200811260146.mAQ1kwVH072670@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153569 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, 26 Nov 2008 01:46:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=153569 Change 153569 by zec@zec_tpx32 on 2008/11/26 01:46:22 IFC @ 153563 Affected files ... .. //depot/projects/vimage/src/sys/amd64/amd64/elf_machdep.c#4 integrate .. //depot/projects/vimage/src/sys/amd64/include/atomic.h#4 integrate .. //depot/projects/vimage/src/sys/amd64/linux32/linux32_sysvec.c#10 integrate .. //depot/projects/vimage/src/sys/arm/arm/elf_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91.c#8 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_machdep.c#1 branch .. //depot/projects/vimage/src/sys/arm/at91/at91_mci.c#11 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_mcireg.h#3 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_pdcreg.h#2 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_pio.c#4 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_pioreg.h#3 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_piovar.h#3 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_pmc.c#6 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_pmcreg.h#2 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_pmcvar.h#2 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_rtc.c#3 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_rtcreg.h#2 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_spi.c#4 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_spireg.h#3 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_ssc.c#4 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_sscreg.h#2 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_st.c#5 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_streg.h#2 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_twi.c#5 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_twiio.h#2 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_twireg.h#3 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_usartreg.h#2 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91board.h#1 branch .. //depot/projects/vimage/src/sys/arm/at91/at91rm92reg.h#4 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91var.h#2 integrate .. //depot/projects/vimage/src/sys/arm/at91/board_bwct.c#1 branch .. //depot/projects/vimage/src/sys/arm/at91/board_hl200.c#1 branch .. //depot/projects/vimage/src/sys/arm/at91/board_kb920x.c#1 branch .. //depot/projects/vimage/src/sys/arm/at91/board_tsc4370.c#1 branch .. //depot/projects/vimage/src/sys/arm/at91/files.at91#3 integrate .. //depot/projects/vimage/src/sys/arm/at91/files.kb920x#2 delete .. //depot/projects/vimage/src/sys/arm/at91/if_ate.c#11 integrate .. //depot/projects/vimage/src/sys/arm/at91/if_atereg.h#3 integrate .. //depot/projects/vimage/src/sys/arm/at91/kb920x_machdep.c#10 delete .. //depot/projects/vimage/src/sys/arm/at91/ohci_atmelarm.c#5 integrate .. //depot/projects/vimage/src/sys/arm/at91/std.at91#3 integrate .. //depot/projects/vimage/src/sys/arm/at91/std.bwct#1 branch .. //depot/projects/vimage/src/sys/arm/at91/std.hl200#1 branch .. //depot/projects/vimage/src/sys/arm/at91/std.kb920x#3 integrate .. //depot/projects/vimage/src/sys/arm/at91/std.tsc4370#1 branch .. //depot/projects/vimage/src/sys/arm/at91/uart_bus_at91usart.c#2 integrate .. //depot/projects/vimage/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#5 integrate .. //depot/projects/vimage/src/sys/arm/at91/uart_dev_at91usart.c#10 integrate .. //depot/projects/vimage/src/sys/arm/conf/BWCT#5 integrate .. //depot/projects/vimage/src/sys/arm/conf/DB-78XXX#3 integrate .. //depot/projects/vimage/src/sys/arm/conf/DB-88F5XXX#3 integrate .. //depot/projects/vimage/src/sys/arm/conf/DB-88F6XXX#3 integrate .. //depot/projects/vimage/src/sys/arm/conf/HL200#4 integrate .. //depot/projects/vimage/src/sys/arm/include/atomic.h#5 integrate .. //depot/projects/vimage/src/sys/arm/mv/common.c#2 integrate .. //depot/projects/vimage/src/sys/arm/mv/discovery/db78xxx.c#2 integrate .. //depot/projects/vimage/src/sys/arm/mv/discovery/discovery.c#2 integrate .. //depot/projects/vimage/src/sys/arm/mv/files.mv#2 integrate .. //depot/projects/vimage/src/sys/arm/mv/kirkwood/db88f6xxx.c#2 integrate .. //depot/projects/vimage/src/sys/arm/mv/kirkwood/kirkwood.c#2 integrate .. //depot/projects/vimage/src/sys/arm/mv/mv_pci.c#1 branch .. //depot/projects/vimage/src/sys/arm/mv/mvreg.h#2 integrate .. //depot/projects/vimage/src/sys/arm/mv/mvvar.h#2 integrate .. //depot/projects/vimage/src/sys/arm/mv/obio.c#2 integrate .. //depot/projects/vimage/src/sys/arm/mv/orion/db88f5xxx.c#2 integrate .. //depot/projects/vimage/src/sys/arm/mv/orion/orion.c#2 integrate .. //depot/projects/vimage/src/sys/boot/arm/uboot/Makefile#2 integrate .. //depot/projects/vimage/src/sys/boot/arm/uboot/conf.c#2 integrate .. //depot/projects/vimage/src/sys/boot/arm/uboot/version#2 integrate .. //depot/projects/vimage/src/sys/boot/common/interp.c#2 integrate .. //depot/projects/vimage/src/sys/boot/i386/Makefile#5 integrate .. //depot/projects/vimage/src/sys/boot/i386/gptzfsboot/Makefile#1 branch .. //depot/projects/vimage/src/sys/boot/i386/libi386/biosdisk.c#4 integrate .. //depot/projects/vimage/src/sys/boot/i386/zfsboot/zfsboot.c#2 integrate .. //depot/projects/vimage/src/sys/boot/uboot/lib/devicename.c#3 integrate .. //depot/projects/vimage/src/sys/boot/uboot/lib/disk.c#3 integrate .. //depot/projects/vimage/src/sys/boot/uboot/lib/glue.c#6 integrate .. //depot/projects/vimage/src/sys/boot/uboot/lib/glue.h#5 integrate .. //depot/projects/vimage/src/sys/boot/uboot/lib/libuboot.h#3 integrate .. //depot/projects/vimage/src/sys/boot/uboot/lib/net.c#5 integrate .. //depot/projects/vimage/src/sys/boot/zfs/Makefile#2 integrate .. //depot/projects/vimage/src/sys/boot/zfs/zfs.c#2 integrate .. //depot/projects/vimage/src/sys/boot/zfs/zfsimpl.c#2 integrate .. //depot/projects/vimage/src/sys/cddl/boot/zfs/zfsimpl.h#2 integrate .. //depot/projects/vimage/src/sys/cddl/boot/zfs/zfssubr.c#2 integrate .. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#3 integrate .. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#4 integrate .. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/vnode.h#3 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#3 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#4 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#3 integrate .. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#6 integrate .. //depot/projects/vimage/src/sys/cddl/dev/cyclic/cyclic.c#2 integrate .. //depot/projects/vimage/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#2 integrate .. //depot/projects/vimage/src/sys/compat/ia32/ia32_sysvec.c#7 integrate .. //depot/projects/vimage/src/sys/compat/svr4/svr4_sysvec.c#5 integrate .. //depot/projects/vimage/src/sys/conf/files#44 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_hpet.c#9 integrate .. //depot/projects/vimage/src/sys/dev/acpica/acpi_pcib.c#2 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-pci.h#16 integrate .. //depot/projects/vimage/src/sys/dev/ata/chipsets/ata-marvell.c#3 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_ath.c#23 integrate .. //depot/projects/vimage/src/sys/dev/ath/if_athvar.h#12 integrate .. //depot/projects/vimage/src/sys/dev/bce/if_bcereg.h#12 integrate .. //depot/projects/vimage/src/sys/dev/cardbus/cardbus_device.c#3 integrate .. //depot/projects/vimage/src/sys/dev/cardbus/cardbusvar.h#3 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_ael1002.c#8 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_common.h#10 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/common/cxgb_t3_hw.c#12 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_adapter.h#15 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_config.h#7 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_main.c#19 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_multiq.c#3 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_osdep.h#14 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/cxgb_sge.c#19 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/sys/cxgb_support.c#6 integrate .. //depot/projects/vimage/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#3 integrate .. //depot/projects/vimage/src/sys/dev/dcons/dcons_crom.c#3 integrate .. //depot/projects/vimage/src/sys/dev/dcons/dcons_os.c#7 integrate .. //depot/projects/vimage/src/sys/dev/fdc/fdc_pccard.c#2 integrate .. //depot/projects/vimage/src/sys/dev/fxp/if_fxp.c#6 integrate .. //depot/projects/vimage/src/sys/dev/fxp/if_fxpreg.h#2 integrate .. //depot/projects/vimage/src/sys/dev/fxp/if_fxpvar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_arm.c#3 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_ia64.c#3 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_powerpc.c#3 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_sparc64.c#3 integrate .. //depot/projects/vimage/src/sys/dev/iscsi/initiator/isc_cam.c#3 integrate .. //depot/projects/vimage/src/sys/dev/iscsi/initiator/isc_sm.c#3 integrate .. //depot/projects/vimage/src/sys/dev/iscsi/initiator/isc_soc.c#5 integrate .. //depot/projects/vimage/src/sys/dev/iscsi/initiator/isc_subr.c#2 integrate .. //depot/projects/vimage/src/sys/dev/iscsi/initiator/iscsi.c#4 integrate .. //depot/projects/vimage/src/sys/dev/iscsi/initiator/iscsi.h#2 integrate .. //depot/projects/vimage/src/sys/dev/iscsi/initiator/iscsi_subr.c#2 integrate .. //depot/projects/vimage/src/sys/dev/iscsi/initiator/iscsivar.h#2 integrate .. //depot/projects/vimage/src/sys/dev/mmc/mmcsd.c#11 integrate .. //depot/projects/vimage/src/sys/dev/msk/if_msk.c#15 integrate .. //depot/projects/vimage/src/sys/dev/mxge/if_mxge.c#13 integrate .. //depot/projects/vimage/src/sys/dev/mxge/if_mxge_var.h#9 integrate .. //depot/projects/vimage/src/sys/dev/nmdm/nmdm.c#5 integrate .. //depot/projects/vimage/src/sys/dev/nxge/xge-osdep.h#3 integrate .. //depot/projects/vimage/src/sys/dev/random/randomdev.c#2 integrate .. //depot/projects/vimage/src/sys/dev/random/randomdev_soft.c#5 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/hda/hdac.c#25 integrate .. //depot/projects/vimage/src/sys/dev/sound/pci/hda/hdac_private.h#8 integrate .. //depot/projects/vimage/src/sys/dev/uart/uart_dev_quicc.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_zyd.c#13 integrate .. //depot/projects/vimage/src/sys/dev/usb/if_zydreg.h#6 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_device.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_generic.c#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_generic.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_msctest.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_msctest.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/core/usb2_request.c#4 integrate .. //depot/projects/vimage/src/sys/dev/usb2/ethernet/if_aue2.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_devid.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_devtable.h#3 integrate .. //depot/projects/vimage/src/sys/dev/usb2/include/usb2_standard.h#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/quirk/usb2_quirk.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb2/serial/u3g2.c#1 branch .. //depot/projects/vimage/src/sys/dev/usb2/serial/ugensa2.c#4 integrate .. //depot/projects/vimage/src/sys/fs/unionfs/union.h#6 integrate .. //depot/projects/vimage/src/sys/fs/unionfs/union_subr.c#14 integrate .. //depot/projects/vimage/src/sys/fs/unionfs/union_vfsops.c#9 integrate .. //depot/projects/vimage/src/sys/fs/unionfs/union_vnops.c#13 integrate .. //depot/projects/vimage/src/sys/geom/geom_ccd.c#3 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum.c#3 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_list.c#2 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_move.c#2 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_rename.c#3 integrate .. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_rm.c#5 integrate .. //depot/projects/vimage/src/sys/i386/i386/elf_machdep.c#4 integrate .. //depot/projects/vimage/src/sys/i386/i386/identcpu.c#12 integrate .. //depot/projects/vimage/src/sys/i386/i386/intr_machdep.c#9 integrate .. //depot/projects/vimage/src/sys/i386/ibcs2/ibcs2_sysvec.c#4 integrate .. //depot/projects/vimage/src/sys/i386/include/atomic.h#4 integrate .. //depot/projects/vimage/src/sys/i386/include/xen/xen-os.h#3 integrate .. //depot/projects/vimage/src/sys/i386/linux/linux_sysvec.c#7 integrate .. //depot/projects/vimage/src/sys/ia64/ia64/elf_machdep.c#5 integrate .. //depot/projects/vimage/src/sys/ia64/include/atomic.h#6 integrate .. //depot/projects/vimage/src/sys/kern/imgact_aout.c#5 integrate .. //depot/projects/vimage/src/sys/kern/kern_shutdown.c#10 integrate .. //depot/projects/vimage/src/sys/kern/kern_thr.c#14 integrate .. //depot/projects/vimage/src/sys/kern/subr_bufring.c#1 branch .. //depot/projects/vimage/src/sys/kern/uipc_socket.c#27 integrate .. //depot/projects/vimage/src/sys/kern/vfs_cache.c#14 integrate .. //depot/projects/vimage/src/sys/kern/vfs_export.c#16 integrate .. //depot/projects/vimage/src/sys/mips/mips/elf_machdep.c#3 integrate .. //depot/projects/vimage/src/sys/modules/nfsserver/Makefile#3 integrate .. //depot/projects/vimage/src/sys/modules/uart/Makefile#2 integrate .. //depot/projects/vimage/src/sys/modules/usb2/Makefile#2 integrate .. //depot/projects/vimage/src/sys/net/if.c#51 integrate .. //depot/projects/vimage/src/sys/net/if_ethersubr.c#32 integrate .. //depot/projects/vimage/src/sys/net/if_fddisubr.c#6 integrate .. //depot/projects/vimage/src/sys/net/if_fwsubr.c#8 integrate .. //depot/projects/vimage/src/sys/net/if_lagg.c#19 integrate .. //depot/projects/vimage/src/sys/net/if_tun.c#12 integrate .. //depot/projects/vimage/src/sys/net/if_var.h#21 integrate .. //depot/projects/vimage/src/sys/net/if_vlan.c#14 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_hostap.c#6 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_output.c#15 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_var.h#17 integrate .. //depot/projects/vimage/src/sys/net80211/ieee80211_wds.c#5 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_base.c#43 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_iface.c#16 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_l2tp.c#8 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_socket.c#6 integrate .. //depot/projects/vimage/src/sys/netinet/ip_divert.c#21 integrate .. //depot/projects/vimage/src/sys/netinet/raw_ip.c#33 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec.c#31 integrate .. //depot/projects/vimage/src/sys/powerpc/include/atomic.h#5 integrate .. //depot/projects/vimage/src/sys/powerpc/powerpc/elf_machdep.c#4 integrate .. //depot/projects/vimage/src/sys/security/audit/audit_bsm.c#11 integrate .. //depot/projects/vimage/src/sys/sparc64/include/atomic.h#3 integrate .. //depot/projects/vimage/src/sys/sparc64/include/intr_machdep.h#6 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/schizo.c#3 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/schizoreg.h#2 integrate .. //depot/projects/vimage/src/sys/sparc64/pci/schizovar.h#2 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/elf_machdep.c#6 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/intr_machdep.c#8 integrate .. //depot/projects/vimage/src/sys/sparc64/sparc64/nexus.c#4 integrate .. //depot/projects/vimage/src/sys/sun4v/include/atomic.h#3 integrate .. //depot/projects/vimage/src/sys/sys/buf_ring.h#1 branch .. //depot/projects/vimage/src/sys/sys/disklabel.h#4 integrate .. //depot/projects/vimage/src/sys/sys/mbuf.h#14 integrate .. //depot/projects/vimage/src/sys/sys/param.h#32 integrate .. //depot/projects/vimage/src/sys/sys/sysent.h#9 integrate .. //depot/projects/vimage/src/sys/sys/termios.h#6 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_dirhash.c#7 integrate .. //depot/projects/vimage/src/sys/ufs/ufs/ufs_lookup.c#9 integrate Differences ... ==== //depot/projects/vimage/src/sys/amd64/amd64/elf_machdep.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.27 2008/09/24 10:14:37 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.28 2008/11/22 12:36:15 kib Exp $"); #include #include @@ -72,7 +72,8 @@ .sv_copyout_strings = exec_copyout_strings, .sv_setregs = exec_setregs, .sv_fixlimit = NULL, - .sv_maxssiz = NULL + .sv_maxssiz = NULL, + .sv_flags = SV_ABI_FREEBSD | SV_LP64 }; static Elf64_Brandinfo freebsd_brand_info = { ==== //depot/projects/vimage/src/sys/amd64/include/atomic.h#4 (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/amd64/include/atomic.h,v 1.45 2008/03/16 21:20:48 pjd Exp $ + * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.46 2008/11/22 05:55:56 kmacy Exp $ */ #ifndef _MACHINE_ATOMIC_H_ #define _MACHINE_ATOMIC_H_ @@ -32,6 +32,10 @@ #error this file needs sys/cdefs.h as a prerequisite #endif +#define mb() __asm__ __volatile__ ("mfence;": : :"memory") +#define wmb() __asm__ __volatile__ ("sfence;": : :"memory") +#define rmb() __asm__ __volatile__ ("lfence;": : :"memory") + /* * Various simple operations on memory, each of which is atomic in the * presence of interrupts and multiple processors. ==== //depot/projects/vimage/src/sys/amd64/linux32/linux32_sysvec.c#10 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.37 2008/10/19 10:02:26 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.38 2008/11/22 12:36:15 kib Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -1026,6 +1026,7 @@ .sv_setregs = exec_linux_setregs, .sv_fixlimit = linux32_fixlimit, .sv_maxssiz = &linux32_maxssiz, + .sv_flags = SV_ABI_LINUX | SV_ILP32 | SV_IA32 }; static Elf32_Brandinfo linux_brand = { ==== //depot/projects/vimage/src/sys/arm/arm/elf_machdep.c#5 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.9 2008/10/13 18:59:59 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.10 2008/11/22 12:36:15 kib Exp $"); #include #include @@ -72,7 +72,8 @@ .sv_copyout_strings = exec_copyout_strings, .sv_setregs = exec_setregs, .sv_fixlimit = NULL, - .sv_maxssiz = NULL + .sv_maxssiz = NULL, + .sv_flags = SV_ABI_FREEBSD | SV_ILP32 }; static Elf32_Brandinfo freebsd_brand_info = { ==== //depot/projects/vimage/src/sys/arm/at91/at91.c#8 (text) ==== @@ -10,20 +10,21 @@ * 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 ``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 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. + * 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 -__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.20 2008/10/26 22:53:59 stas Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.21 2008/11/25 00:13:26 imp Exp $"); #include #include ==== //depot/projects/vimage/src/sys/arm/at91/at91_mci.c#11 (text+ko) ==== @@ -11,20 +11,21 @@ * 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 ``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 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. + * 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 -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.10 2008/11/18 12:42:59 stas Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.11 2008/11/25 00:13:26 imp Exp $"); #include #include ==== //depot/projects/vimage/src/sys/arm/at91/at91_mcireg.h#3 (text+ko) ==== @@ -11,19 +11,20 @@ * 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 ``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 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. + * 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. */ -/* $FreeBSD: src/sys/arm/at91/at91_mcireg.h,v 1.2 2007/10/18 05:43:44 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_mcireg.h,v 1.3 2008/11/25 00:13:26 imp Exp $ */ #ifndef ARM_AT91_AT91_MCIREG_H #define ARM_AT91_AT91_MCIREG_H ==== //depot/projects/vimage/src/sys/arm/at91/at91_pdcreg.h#2 (text) ==== @@ -10,19 +10,20 @@ * 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 ``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 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. + * 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. */ -/* $FreeBSD: src/sys/arm/at91/at91_pdcreg.h,v 1.1 2006/05/11 14:30:28 cognet Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_pdcreg.h,v 1.2 2008/11/25 00:13:26 imp Exp $ */ #ifndef ARM_AT91_AT91_PDCREG_H #define ARM_AT91_AT91_PDCREG_H ==== //depot/projects/vimage/src/sys/arm/at91/at91_pio.c#4 (text) ==== @@ -10,20 +10,21 @@ * 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 ``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 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. + * 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 -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pio.c,v 1.6 2008/08/19 22:17:14 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pio.c,v 1.7 2008/11/25 00:13:26 imp Exp $"); #include #include ==== //depot/projects/vimage/src/sys/arm/at91/at91_pioreg.h#3 (text) ==== @@ -10,19 +10,20 @@ * 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 ``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 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. + * 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. */ -/* $FreeBSD: src/sys/arm/at91/at91_pioreg.h,v 1.2 2007/01/01 00:46:54 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_pioreg.h,v 1.3 2008/11/25 00:13:26 imp Exp $ */ #ifndef ARM_AT91_AT91_PIOREG_H #define ARM_AT91_AT91_PIOREG_H ==== //depot/projects/vimage/src/sys/arm/at91/at91_piovar.h#3 (text+ko) ==== @@ -10,19 +10,20 @@ * 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 ``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 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. + * 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. */ -/* $FreeBSD: src/sys/arm/at91/at91_piovar.h,v 1.3 2008/08/19 22:17:14 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_piovar.h,v 1.4 2008/11/25 00:13:26 imp Exp $ */ #ifndef ARM_AT91_AT91_PIOVAR_H #define ARM_AT91_AT91_PIOVAR_H ==== //depot/projects/vimage/src/sys/arm/at91/at91_pmc.c#6 (text) ==== @@ -10,22 +10,23 @@ * 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 ``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 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. + * 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 "opt_at91.h" #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pmc.c,v 1.7 2008/08/19 22:16:10 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pmc.c,v 1.8 2008/11/25 00:13:26 imp Exp $"); #include #include ==== //depot/projects/vimage/src/sys/arm/at91/at91_pmcreg.h#2 (text) ==== @@ -10,19 +10,20 @@ * 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 ``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 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. + * 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. */ -/* $FreeBSD: src/sys/arm/at91/at91_pmcreg.h,v 1.1 2006/03/24 07:37:56 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_pmcreg.h,v 1.2 2008/11/25 00:13:26 imp Exp $ */ #ifndef ARM_AT91_AT91_PMCREG_H #define ARM_AT91_AT91_PMCREG_H ==== //depot/projects/vimage/src/sys/arm/at91/at91_pmcvar.h#2 (text) ==== @@ -10,19 +10,20 @@ * 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 ``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 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. + * 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. */ -/* $FreeBSD: src/sys/arm/at91/at91_pmcvar.h,v 1.1 2006/03/24 07:37:56 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_pmcvar.h,v 1.2 2008/11/25 00:13:26 imp Exp $ */ #ifndef ARM_AT91_AT91_PMCVAR_H #define ARM_AT91_AT91_PMCVAR_H ==== //depot/projects/vimage/src/sys/arm/at91/at91_rtc.c#3 (text) ==== @@ -10,20 +10,21 @@ * 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 ``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 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. + * 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 -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_rtc.c,v 1.4 2007/02/27 13:39:34 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_rtc.c,v 1.5 2008/11/25 00:13:26 imp Exp $"); #include #include ==== //depot/projects/vimage/src/sys/arm/at91/at91_rtcreg.h#2 (text) ==== @@ -10,19 +10,20 @@ * 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 ``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 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. + * 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. */ -/* $FreeBSD: src/sys/arm/at91/at91_rtcreg.h,v 1.2 2006/07/14 22:06:01 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_rtcreg.h,v 1.3 2008/11/25 00:13:26 imp Exp $ */ #ifndef ARM_AT91_AT91_RTCREG_H #define ARM_AT91_AT91_RTCREG_H ==== //depot/projects/vimage/src/sys/arm/at91/at91_spi.c#4 (text) ==== @@ -10,20 +10,21 @@ * 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 ``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 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. + * 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 -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_spi.c,v 1.7 2008/10/07 17:23:16 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_spi.c,v 1.8 2008/11/25 00:13:26 imp Exp $"); #include #include ==== //depot/projects/vimage/src/sys/arm/at91/at91_spireg.h#3 (text) ==== @@ -10,19 +10,20 @@ * 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 ``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 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. + * 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. */ -/* $FreeBSD: src/sys/arm/at91/at91_spireg.h,v 1.3 2007/01/01 00:50:25 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_spireg.h,v 1.4 2008/11/25 00:13:26 imp Exp $ */ #ifndef ARM_AT91_AT91_SPIREG_H #define ARM_AT91_AT91_SPIREG_H ==== //depot/projects/vimage/src/sys/arm/at91/at91_ssc.c#4 (text) ==== @@ -10,20 +10,21 @@ * 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 ``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 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. + * 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 -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_ssc.c,v 1.5 2008/09/05 22:29:50 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_ssc.c,v 1.6 2008/11/25 00:13:26 imp Exp $"); #include #include ==== //depot/projects/vimage/src/sys/arm/at91/at91_sscreg.h#2 (text) ==== @@ -10,19 +10,20 @@ * 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 ``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 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. + * 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. */ -/* $FreeBSD: src/sys/arm/at91/at91_sscreg.h,v 1.3 2006/10/25 07:58:18 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_sscreg.h,v 1.4 2008/11/25 00:13:26 imp Exp $ */ #ifndef ARM_AT91_AT91_SSCREG_H #define ARM_AT91_AT91_SSCREG_H ==== //depot/projects/vimage/src/sys/arm/at91/at91_st.c#5 (text) ==== @@ -10,20 +10,21 @@ * 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 ``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 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. + * 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 -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_st.c,v 1.9 2007/03/27 21:03:35 n_hibma Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_st.c,v 1.10 2008/11/25 00:13:26 imp Exp $"); #include #include ==== //depot/projects/vimage/src/sys/arm/at91/at91_streg.h#2 (text) ==== @@ -10,19 +10,20 @@ * 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 ``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 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. + * 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. */ -/* $FreeBSD: src/sys/arm/at91/at91_streg.h,v 1.1 2006/02/04 23:32:13 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_streg.h,v 1.2 2008/11/25 00:13:26 imp Exp $ */ #ifndef ARM_AT91_AT91STREG_H #define ARM_AT91_AT91STREG_H ==== //depot/projects/vimage/src/sys/arm/at91/at91_twi.c#5 (text) ==== @@ -10,20 +10,21 @@ * 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 ``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 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. + * 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 -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.12 2008/08/04 20:46:15 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.13 2008/11/25 00:13:26 imp Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Nov 26 01:50:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 789591065676; Wed, 26 Nov 2008 01:50:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3D9A81065670 for ; Wed, 26 Nov 2008 01:50:02 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2E6108FC16 for ; Wed, 26 Nov 2008 01:50:02 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAQ1o2sZ072903 for ; Wed, 26 Nov 2008 01:50:02 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAQ1o2qH072901 for perforce@freebsd.org; Wed, 26 Nov 2008 01:50:02 GMT (envelope-from zec@tel.fer.hr) Date: Wed, 26 Nov 2008 01:50:02 GMT Message-Id: <200811260150.mAQ1o2qH072901@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153570 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, 26 Nov 2008 01:50:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=153570 Change 153570 by zec@zec_tca51 on 2008/11/26 01:49:07 Mark arrays saorder_state_any and saorder_state_alive as const Suggested by: julian Affected files ... .. //depot/projects/vimage-commit2/src/sys/netipsec/key.c#18 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netipsec/key.c#18 (text+ko) ==== @@ -189,11 +189,11 @@ static const u_int saorder_state_valid_prefer_new[] = { SADB_SASTATE_MATURE, SADB_SASTATE_DYING, }; -static u_int saorder_state_alive[] = { +static const u_int saorder_state_alive[] = { /* except DEAD */ SADB_SASTATE_MATURE, SADB_SASTATE_DYING, SADB_SASTATE_LARVAL }; -static u_int saorder_state_any[] = { +static const u_int saorder_state_any[] = { SADB_SASTATE_MATURE, SADB_SASTATE_DYING, SADB_SASTATE_LARVAL, SADB_SASTATE_DEAD }; From owner-p4-projects@FreeBSD.ORG Wed Nov 26 01:53:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 934841065673; Wed, 26 Nov 2008 01:53:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 56B8E1065670 for ; Wed, 26 Nov 2008 01:53:06 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D07B58FC0A for ; Wed, 26 Nov 2008 01:53:05 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAQ1r5Tu073142 for ; Wed, 26 Nov 2008 01:53:05 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAQ1r57V073140 for perforce@freebsd.org; Wed, 26 Nov 2008 01:53:05 GMT (envelope-from zec@tel.fer.hr) Date: Wed, 26 Nov 2008 01:53:05 GMT Message-Id: <200811260153.mAQ1r57V073140@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153571 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, 26 Nov 2008 01:53:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=153571 Change 153571 by zec@zec_tca51 on 2008/11/26 01:53:04 IFC @ 153563 Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/elf_machdep.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/atomic.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_sysvec.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/elf_machdep.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_machdep.c#1 branch .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_mci.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_mcireg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_pdcreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_pio.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_pioreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_piovar.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_pmc.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_pmcreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_pmcvar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_rtc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_rtcreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_spi.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_spireg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_ssc.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_sscreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_st.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_streg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_twi.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_twiio.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_twireg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_usartreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91board.h#1 branch .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91rm92reg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/at91var.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/board_bwct.c#1 branch .. //depot/projects/vimage-commit2/src/sys/arm/at91/board_hl200.c#1 branch .. //depot/projects/vimage-commit2/src/sys/arm/at91/board_kb920x.c#1 branch .. //depot/projects/vimage-commit2/src/sys/arm/at91/board_tsc4370.c#1 branch .. //depot/projects/vimage-commit2/src/sys/arm/at91/files.at91#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/files.kb920x#2 delete .. //depot/projects/vimage-commit2/src/sys/arm/at91/if_ate.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/if_atereg.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/kb920x_machdep.c#3 delete .. //depot/projects/vimage-commit2/src/sys/arm/at91/ohci_atmelarm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/std.at91#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/std.bwct#1 branch .. //depot/projects/vimage-commit2/src/sys/arm/at91/std.hl200#1 branch .. //depot/projects/vimage-commit2/src/sys/arm/at91/std.kb920x#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/std.tsc4370#1 branch .. //depot/projects/vimage-commit2/src/sys/arm/at91/uart_bus_at91usart.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/at91/uart_dev_at91usart.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/BWCT#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/DB-78XXX#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/DB-88F5XXX#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/DB-88F6XXX#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/HL200#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/include/atomic.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/common.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/discovery/db78xxx.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/discovery/discovery.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/files.mv#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/kirkwood/db88f6xxx.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/kirkwood/kirkwood.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/mv_pci.c#1 branch .. //depot/projects/vimage-commit2/src/sys/arm/mv/mvreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/mvvar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/obio.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/orion/db88f5xxx.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/orion/orion.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/arm/uboot/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/arm/uboot/conf.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/arm/uboot/version#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/common/interp.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/Makefile#3 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/gptzfsboot/Makefile#1 branch .. //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/zfsboot/zfsboot.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/devicename.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/disk.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/glue.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/glue.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/libuboot.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/uboot/lib/net.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/boot/zfs/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/zfs/zfs.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/zfs/zfsimpl.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/boot/zfs/zfsimpl.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/boot/zfs/zfssubr.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/sys/vnode.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/dev/cyclic/cyclic.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ia32/ia32_sysvec.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_sysvec.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files#16 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_pcib.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-pci.h#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-marvell.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/if_ath.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/if_athvar.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bce/if_bcereg.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cardbus/cardbus_device.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cardbus/cardbusvar.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/common/cxgb_ael1002.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/common/cxgb_common.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/common/cxgb_t3_hw.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_adapter.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_config.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_main.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_multiq.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_osdep.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_sge.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/sys/cxgb_support.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/dcons/dcons_crom.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/dcons/dcons_os.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/fdc/fdc_pccard.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/fxp/if_fxpreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/fxp/if_fxpvar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/hwpmc/hwpmc_arm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/hwpmc/hwpmc_ia64.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/hwpmc/hwpmc_powerpc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/hwpmc/hwpmc_sparc64.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iscsi/initiator/isc_cam.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iscsi/initiator/isc_sm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iscsi/initiator/isc_soc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iscsi/initiator/isc_subr.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iscsi/initiator/iscsi.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iscsi/initiator/iscsi.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iscsi/initiator/iscsi_subr.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/iscsi/initiator/iscsivar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mmc/mmcsd.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/msk/if_msk.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mxge/if_mxge.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mxge/if_mxge_var.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/nmdm/nmdm.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/nxge/xge-osdep.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/random/randomdev.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/random/randomdev_soft.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/hda/hdac.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/hda/hdac_private.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/uart/uart_dev_quicc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/if_zyd.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/if_zydreg.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_device.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_generic.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_generic.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_msctest.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_msctest.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/core/usb2_request.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/ethernet/if_aue2.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/include/usb2_devid.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/include/usb2_devtable.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/include/usb2_standard.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/quirk/usb2_quirk.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/u3g2.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/usb2/serial/ugensa2.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/fs/unionfs/union.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/unionfs/union_subr.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/fs/unionfs/union_vfsops.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/fs/unionfs/union_vnops.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/geom/geom_ccd.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_list.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_move.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_rename.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/geom/vinum/geom_vinum_rm.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/elf_machdep.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/identcpu.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/intr_machdep.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/ibcs2/ibcs2_sysvec.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/atomic.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/xen/xen-os.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/linux/linux_sysvec.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/ia64/ia64/elf_machdep.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/ia64/include/atomic.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/imgact_aout.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_shutdown.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_thr.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_bufring.c#1 branch .. //depot/projects/vimage-commit2/src/sys/kern/uipc_socket.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_cache.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_export.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/mips/mips/elf_machdep.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/modules/nfsserver/Makefile#3 integrate .. //depot/projects/vimage-commit2/src/sys/modules/uart/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/usb2/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/net/if.c#23 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_fddisubr.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_fwsubr.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_lagg.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_tun.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_var.h#8 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_vlan.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_hostap.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_output.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_var.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_wds.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_iface.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_l2tp.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_socket.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_divert.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/include/atomic.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powerpc/elf_machdep.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit_bsm.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/include/atomic.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/include/intr_machdep.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/pci/schizo.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/pci/schizoreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/pci/schizovar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/elf_machdep.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/intr_machdep.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/nexus.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/sun4v/include/atomic.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/buf_ring.h#1 branch .. //depot/projects/vimage-commit2/src/sys/sys/disklabel.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/mbuf.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/param.h#16 integrate .. //depot/projects/vimage-commit2/src/sys/sys/sysent.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/sys/termios.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ufs/ufs_dirhash.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ufs/ufs_lookup.c#4 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/elf_machdep.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.27 2008/09/24 10:14:37 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.28 2008/11/22 12:36:15 kib Exp $"); #include #include @@ -72,7 +72,8 @@ .sv_copyout_strings = exec_copyout_strings, .sv_setregs = exec_setregs, .sv_fixlimit = NULL, - .sv_maxssiz = NULL + .sv_maxssiz = NULL, + .sv_flags = SV_ABI_FREEBSD | SV_LP64 }; static Elf64_Brandinfo freebsd_brand_info = { ==== //depot/projects/vimage-commit2/src/sys/amd64/include/atomic.h#2 (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/amd64/include/atomic.h,v 1.45 2008/03/16 21:20:48 pjd Exp $ + * $FreeBSD: src/sys/amd64/include/atomic.h,v 1.46 2008/11/22 05:55:56 kmacy Exp $ */ #ifndef _MACHINE_ATOMIC_H_ #define _MACHINE_ATOMIC_H_ @@ -32,6 +32,10 @@ #error this file needs sys/cdefs.h as a prerequisite #endif +#define mb() __asm__ __volatile__ ("mfence;": : :"memory") +#define wmb() __asm__ __volatile__ ("sfence;": : :"memory") +#define rmb() __asm__ __volatile__ ("lfence;": : :"memory") + /* * Various simple operations on memory, each of which is atomic in the * presence of interrupts and multiple processors. ==== //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_sysvec.c#4 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.37 2008/10/19 10:02:26 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_sysvec.c,v 1.38 2008/11/22 12:36:15 kib Exp $"); #include "opt_compat.h" #ifndef COMPAT_IA32 @@ -1026,6 +1026,7 @@ .sv_setregs = exec_linux_setregs, .sv_fixlimit = linux32_fixlimit, .sv_maxssiz = &linux32_maxssiz, + .sv_flags = SV_ABI_LINUX | SV_ILP32 | SV_IA32 }; static Elf32_Brandinfo linux_brand = { ==== //depot/projects/vimage-commit2/src/sys/arm/arm/elf_machdep.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.9 2008/10/13 18:59:59 raj Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/elf_machdep.c,v 1.10 2008/11/22 12:36:15 kib Exp $"); #include #include @@ -72,7 +72,8 @@ .sv_copyout_strings = exec_copyout_strings, .sv_setregs = exec_setregs, .sv_fixlimit = NULL, - .sv_maxssiz = NULL + .sv_maxssiz = NULL, + .sv_flags = SV_ABI_FREEBSD | SV_ILP32 }; static Elf32_Brandinfo freebsd_brand_info = { ==== //depot/projects/vimage-commit2/src/sys/arm/at91/at91.c#5 (text) ==== @@ -10,20 +10,21 @@ * 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 ``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 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. + * 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 -__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.20 2008/10/26 22:53:59 stas Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.21 2008/11/25 00:13:26 imp Exp $"); #include #include ==== //depot/projects/vimage-commit2/src/sys/arm/at91/at91_mci.c#8 (text+ko) ==== @@ -11,20 +11,21 @@ * 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 ``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 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. + * 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 -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.10 2008/11/18 12:42:59 stas Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.11 2008/11/25 00:13:26 imp Exp $"); #include #include ==== //depot/projects/vimage-commit2/src/sys/arm/at91/at91_mcireg.h#2 (text+ko) ==== @@ -11,19 +11,20 @@ * 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 ``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 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. + * 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. */ -/* $FreeBSD: src/sys/arm/at91/at91_mcireg.h,v 1.2 2007/10/18 05:43:44 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_mcireg.h,v 1.3 2008/11/25 00:13:26 imp Exp $ */ #ifndef ARM_AT91_AT91_MCIREG_H #define ARM_AT91_AT91_MCIREG_H ==== //depot/projects/vimage-commit2/src/sys/arm/at91/at91_pdcreg.h#2 (text) ==== @@ -10,19 +10,20 @@ * 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 ``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 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. + * 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. */ -/* $FreeBSD: src/sys/arm/at91/at91_pdcreg.h,v 1.1 2006/05/11 14:30:28 cognet Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_pdcreg.h,v 1.2 2008/11/25 00:13:26 imp Exp $ */ #ifndef ARM_AT91_AT91_PDCREG_H #define ARM_AT91_AT91_PDCREG_H ==== //depot/projects/vimage-commit2/src/sys/arm/at91/at91_pio.c#3 (text) ==== @@ -10,20 +10,21 @@ * 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 ``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 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. + * 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 -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pio.c,v 1.6 2008/08/19 22:17:14 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pio.c,v 1.7 2008/11/25 00:13:26 imp Exp $"); #include #include ==== //depot/projects/vimage-commit2/src/sys/arm/at91/at91_pioreg.h#2 (text) ==== @@ -10,19 +10,20 @@ * 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 ``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 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. + * 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. */ -/* $FreeBSD: src/sys/arm/at91/at91_pioreg.h,v 1.2 2007/01/01 00:46:54 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_pioreg.h,v 1.3 2008/11/25 00:13:26 imp Exp $ */ #ifndef ARM_AT91_AT91_PIOREG_H #define ARM_AT91_AT91_PIOREG_H ==== //depot/projects/vimage-commit2/src/sys/arm/at91/at91_piovar.h#3 (text+ko) ==== @@ -10,19 +10,20 @@ * 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 ``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 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. + * 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. */ -/* $FreeBSD: src/sys/arm/at91/at91_piovar.h,v 1.3 2008/08/19 22:17:14 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_piovar.h,v 1.4 2008/11/25 00:13:26 imp Exp $ */ #ifndef ARM_AT91_AT91_PIOVAR_H #define ARM_AT91_AT91_PIOVAR_H ==== //depot/projects/vimage-commit2/src/sys/arm/at91/at91_pmc.c#4 (text) ==== @@ -10,22 +10,23 @@ * 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 ``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 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. + * 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 "opt_at91.h" #include -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pmc.c,v 1.7 2008/08/19 22:16:10 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pmc.c,v 1.8 2008/11/25 00:13:26 imp Exp $"); #include #include ==== //depot/projects/vimage-commit2/src/sys/arm/at91/at91_pmcreg.h#2 (text) ==== @@ -10,19 +10,20 @@ * 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 ``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 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. + * 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. */ -/* $FreeBSD: src/sys/arm/at91/at91_pmcreg.h,v 1.1 2006/03/24 07:37:56 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_pmcreg.h,v 1.2 2008/11/25 00:13:26 imp Exp $ */ #ifndef ARM_AT91_AT91_PMCREG_H #define ARM_AT91_AT91_PMCREG_H ==== //depot/projects/vimage-commit2/src/sys/arm/at91/at91_pmcvar.h#2 (text) ==== @@ -10,19 +10,20 @@ * 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 ``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 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. + * 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. */ -/* $FreeBSD: src/sys/arm/at91/at91_pmcvar.h,v 1.1 2006/03/24 07:37:56 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_pmcvar.h,v 1.2 2008/11/25 00:13:26 imp Exp $ */ #ifndef ARM_AT91_AT91_PMCVAR_H #define ARM_AT91_AT91_PMCVAR_H ==== //depot/projects/vimage-commit2/src/sys/arm/at91/at91_rtc.c#2 (text) ==== @@ -10,20 +10,21 @@ * 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 ``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 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. + * 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 -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_rtc.c,v 1.4 2007/02/27 13:39:34 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_rtc.c,v 1.5 2008/11/25 00:13:26 imp Exp $"); #include #include ==== //depot/projects/vimage-commit2/src/sys/arm/at91/at91_rtcreg.h#2 (text) ==== @@ -10,19 +10,20 @@ * 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 ``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 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. + * 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. */ -/* $FreeBSD: src/sys/arm/at91/at91_rtcreg.h,v 1.2 2006/07/14 22:06:01 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_rtcreg.h,v 1.3 2008/11/25 00:13:26 imp Exp $ */ #ifndef ARM_AT91_AT91_RTCREG_H #define ARM_AT91_AT91_RTCREG_H ==== //depot/projects/vimage-commit2/src/sys/arm/at91/at91_spi.c#3 (text) ==== @@ -10,20 +10,21 @@ * 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 ``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 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. + * 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 -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_spi.c,v 1.7 2008/10/07 17:23:16 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_spi.c,v 1.8 2008/11/25 00:13:26 imp Exp $"); #include #include ==== //depot/projects/vimage-commit2/src/sys/arm/at91/at91_spireg.h#2 (text) ==== @@ -10,19 +10,20 @@ * 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 ``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 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. + * 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. */ -/* $FreeBSD: src/sys/arm/at91/at91_spireg.h,v 1.3 2007/01/01 00:50:25 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_spireg.h,v 1.4 2008/11/25 00:13:26 imp Exp $ */ #ifndef ARM_AT91_AT91_SPIREG_H #define ARM_AT91_AT91_SPIREG_H ==== //depot/projects/vimage-commit2/src/sys/arm/at91/at91_ssc.c#3 (text) ==== @@ -10,20 +10,21 @@ * 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 ``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 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. + * 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 -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_ssc.c,v 1.5 2008/09/05 22:29:50 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_ssc.c,v 1.6 2008/11/25 00:13:26 imp Exp $"); #include #include ==== //depot/projects/vimage-commit2/src/sys/arm/at91/at91_sscreg.h#2 (text) ==== @@ -10,19 +10,20 @@ * 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 ``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 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. + * 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. */ -/* $FreeBSD: src/sys/arm/at91/at91_sscreg.h,v 1.3 2006/10/25 07:58:18 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_sscreg.h,v 1.4 2008/11/25 00:13:26 imp Exp $ */ #ifndef ARM_AT91_AT91_SSCREG_H #define ARM_AT91_AT91_SSCREG_H ==== //depot/projects/vimage-commit2/src/sys/arm/at91/at91_st.c#2 (text) ==== @@ -10,20 +10,21 @@ * 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 ``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 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. + * 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 -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_st.c,v 1.9 2007/03/27 21:03:35 n_hibma Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_st.c,v 1.10 2008/11/25 00:13:26 imp Exp $"); #include #include ==== //depot/projects/vimage-commit2/src/sys/arm/at91/at91_streg.h#2 (text) ==== @@ -10,19 +10,20 @@ * 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 ``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 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. + * 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. */ -/* $FreeBSD: src/sys/arm/at91/at91_streg.h,v 1.1 2006/02/04 23:32:13 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_streg.h,v 1.2 2008/11/25 00:13:26 imp Exp $ */ #ifndef ARM_AT91_AT91STREG_H #define ARM_AT91_AT91STREG_H ==== //depot/projects/vimage-commit2/src/sys/arm/at91/at91_twi.c#3 (text) ==== @@ -10,20 +10,21 @@ * 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 ``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 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. + * 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 -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.12 2008/08/04 20:46:15 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.13 2008/11/25 00:13:26 imp Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Nov 26 01:56:09 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5F5B31065675; Wed, 26 Nov 2008 01:56:09 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 236DD1065672 for ; Wed, 26 Nov 2008 01:56:09 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 13D9B8FC17 for ; Wed, 26 Nov 2008 01:56:09 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAQ1u8fg073394 for ; Wed, 26 Nov 2008 01:56:08 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAQ1u8k8073392 for perforce@freebsd.org; Wed, 26 Nov 2008 01:56:08 GMT (envelope-from zec@tel.fer.hr) Date: Wed, 26 Nov 2008 01:56:08 GMT Message-Id: <200811260156.mAQ1u8k8073392@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153572 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, 26 Nov 2008 01:56:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=153572 Change 153572 by zec@zec_tca51 on 2008/11/26 01:55:22 constify Affected files ... .. //depot/projects/vimage/src/sys/netipsec/key.c#31 edit Differences ... ==== //depot/projects/vimage/src/sys/netipsec/key.c#31 (text+ko) ==== @@ -189,11 +189,11 @@ static const u_int saorder_state_valid_prefer_new[] = { SADB_SASTATE_MATURE, SADB_SASTATE_DYING, }; -static u_int saorder_state_alive[] = { +static const u_int saorder_state_alive[] = { /* except DEAD */ SADB_SASTATE_MATURE, SADB_SASTATE_DYING, SADB_SASTATE_LARVAL }; -static u_int saorder_state_any[] = { +static const u_int saorder_state_any[] = { SADB_SASTATE_MATURE, SADB_SASTATE_DYING, SADB_SASTATE_LARVAL, SADB_SASTATE_DEAD }; From owner-p4-projects@FreeBSD.ORG Wed Nov 26 08:53:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5963B1065670; Wed, 26 Nov 2008 08:53:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1C8861065673 for ; Wed, 26 Nov 2008 08:53:22 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 078C78FC13 for ; Wed, 26 Nov 2008 08:53:22 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAQ8rLlF074891 for ; Wed, 26 Nov 2008 08:53:21 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAQ8rL2K074873 for perforce@freebsd.org; Wed, 26 Nov 2008 08:53:21 GMT (envelope-from trasz@freebsd.org) Date: Wed, 26 Nov 2008 08:53:21 GMT Message-Id: <200811260853.mAQ8rL2K074873@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 153582 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, 26 Nov 2008 08:53:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=153582 Change 153582 by trasz@trasz_strashydlo on 2008/11/26 08:52:33 IFC. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/UPDATING#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/df/df.1#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/df/df.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/bin/sh/eval.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/cddl/compat/opensolaris/misc/deviceid.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/etc/mtree/BSD.include.dist#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/include/Makefile#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/Makefile#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc.3#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc.atom.3#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc.core.3#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc.core2.3#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libstand/nfs.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb20/libusb20.3#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb20/libusb20.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb20/libusb20.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb20/libusb20_compat01.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb20/libusb20_compat01.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb20/libusb20_desc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb20/libusb20_desc.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libusb20/libusb20_ugen20.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/Makefile#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/gr_util.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/lib/libutil/realhostname.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/doc/en_US.ISO8859-1/hardware/article.sgml#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/release/doc/en_US.ISO8859-1/relnotes/article.sgml#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/geom/class/part/gpart.8#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/iscontrol/auth_subr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/iscontrol/config.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/iscontrol/fsm.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/iscontrol/iscontrol.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/iscontrol/iscontrol.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/iscontrol/iscontrol.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/iscontrol/iscsi.conf.5#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/iscontrol/login.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/iscontrol/misc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sbin/iscontrol/pdu.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man5/fstab.5#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man7/hier.7#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/Makefile#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/vfs_mountedon.9#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/vn_fullpath.9#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/share/mk/bsd.libnames.mk#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/amd64/elf_machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/include/atomic.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/amd64/linux32/linux32_sysvec.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/arm/elf_machdep.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91_machdep.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91_mci.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91_mcireg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91_pdcreg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91_pio.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91_pioreg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91_piovar.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91_pmc.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91_pmcreg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91_pmcvar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91_rtc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91_rtcreg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91_spi.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91_spireg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91_ssc.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91_sscreg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91_st.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91_streg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91_twi.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91_twiio.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91_twireg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91_usartreg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91board.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91rm92reg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/at91var.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/board_bwct.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/board_hl200.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/board_kb920x.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/board_tsc4370.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/files.at91#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/files.kb920x#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/if_ate.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/if_atereg.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/kb920x_machdep.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/ohci_atmelarm.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/std.at91#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/std.bwct#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/std.hl200#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/std.kb920x#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/std.tsc4370#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/uart_bus_at91usart.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/uart_cpu_at91rm9200usart.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/at91/uart_dev_at91usart.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/BWCT#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/DB-78XXX#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/DB-88F5XXX#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/DB-88F6XXX#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/conf/HL200#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/include/atomic.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/common.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/discovery/db78xxx.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/discovery/discovery.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/files.mv#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/kirkwood/db88f6xxx.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/kirkwood/kirkwood.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/mv_pci.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/mvreg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/mvvar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/obio.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/orion/db88f5xxx.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/arm/mv/orion/orion.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/arm/uboot/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/arm/uboot/conf.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/arm/uboot/version#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/common/interp.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/i386/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/i386/gptzfsboot/Makefile#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/i386/zfsboot/zfsboot.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/uboot/lib/devicename.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/uboot/lib/disk.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/uboot/lib/glue.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/uboot/lib/glue.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/uboot/lib/libuboot.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/uboot/lib/net.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/zfs/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/zfs/zfs.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/boot/zfs/zfsimpl.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/boot/zfs/zfsimpl.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/boot/zfs/zfssubr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/compat/opensolaris/sys/vnode.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/cyclic/cyclic.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/dev/dtrace/i386/dtrace_subr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/ia32/ia32_sysvec.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/compat/svr4/svr4_sysvec.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/conf/files#22 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpica/acpi.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpica/acpi_hpet.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/acpica/acpi_pcib.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/ata-pci.h#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ata/chipsets/ata-marvell.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_ath.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/ath/if_athvar.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bce/if_bce.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/bce/if_bcereg.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cardbus/cardbus_device.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cardbus/cardbusvar.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/common/cxgb_ael1002.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/common/cxgb_common.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/common/cxgb_t3_hw.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_adapter.h#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_config.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_main.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_multiq.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_osdep.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/cxgb_sge.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/sys/cxgb_support.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/dcons/dcons_crom.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/dcons/dcons_os.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fdc/fdc_pccard.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fxp/if_fxp.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fxp/if_fxpreg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/fxp/if_fxpvar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_arm.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_ia64.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_powerpc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/hwpmc/hwpmc_sparc64.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iscsi/initiator/isc_cam.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iscsi/initiator/isc_sm.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iscsi/initiator/isc_soc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iscsi/initiator/isc_subr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iscsi/initiator/iscsi.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iscsi/initiator/iscsi.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iscsi/initiator/iscsi_subr.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/iscsi/initiator/iscsivar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mmc/mmcsd.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/msk/if_msk.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mxge/if_mxge.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/mxge/if_mxge_var.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/nmdm/nmdm.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/nxge/xge-osdep.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/random/randomdev.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/random/randomdev_soft.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sio/sio_pci.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sio/sio_puc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/hda/hdac.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/sound/pci/hda/hdac_private.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/uart/uart_dev_quicc.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/if_zyd.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/if_zydreg.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb/rio500_usb.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/bluetooth/ng_ubt2.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ehci2.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/ehci2.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/controller/uss820dci_pccard.c#3 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_busdma.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_core.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_dev.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_dev.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_device.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_generic.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_generic.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_hub.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_msctest.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_msctest.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_request.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usb2_util.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/core/usbdevs#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/ethernet/if_aue2.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/image/uscanner2.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/urio2_ioctl.h#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_devid.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_devtable.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_ioctl.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/include/usb2_standard.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/quirk/usb2_quirk.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/u3g2.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/ubsa2.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/serial/ugensa2.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/sound/uaudio2.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/storage/umass2.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/dev/usb2/storage/urio2.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/cd9660/cd9660_bmap.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/cd9660/cd9660_node.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/cd9660/cd9660_node.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/cd9660/cd9660_vfsops.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/cd9660/cd9660_vnops.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/unionfs/union.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/unionfs/union_subr.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/unionfs/union_vfsops.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/fs/unionfs/union_vnops.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/geom_ccd.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/part/g_part_bsd.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_list.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_move.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_rename.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/geom/vinum/geom_vinum_rm.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/elf_machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/identcpu.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/i386/intr_machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/ibcs2/ibcs2_sysvec.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/atomic.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/include/xen/xen-os.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/i386/linux/linux_sysvec.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/ia64/elf_machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ia64/include/atomic.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/isa/isa_common.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/isa/isa_common.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/isa/isahint.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/isa/isavar.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/bus_if.m#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/imgact_aout.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_shutdown.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/kern_thr.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_bufring.c#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/subr_bus.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/uipc_socket.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_cache.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/kern/vfs_export.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/mips/mips/elf_machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/nfsserver/Makefile#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/uart/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/modules/usb2/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_ethersubr.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_fddisubr.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_fwsubr.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_gif.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_lagg.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_loop.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_tun.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_var.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/if_vlan.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/raw_cb.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net/route.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_hostap.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_output.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_var.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/net80211/ieee80211_wds.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_base.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_iface.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_l2tp.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netgraph/ng_socket.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/if_ether.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/igmp.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_gif.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_mcast.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_pcb.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_pcb.h#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_proto.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_rmx.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/in_var.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_divert.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_fastfwd.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_icmp.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_icmp.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/ip_input.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/raw_ip.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_hostcache.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_input.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_output.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_reass.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_sack.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_subr.c#9 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_syncache.c#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_timewait.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/tcp_var.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/udp_usrreq.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet/vinet.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/frag6.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/icmp6.c#8 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_ifattach.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_proto.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_rmx.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/in6_src.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_forward.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_input.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/ip6_mroute.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/mld6.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/nd6.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/nd6_nbr.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/nd6_rtr.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/raw_ip6.c#10 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/scope6.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netinet6/vinet6.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/ipsec.c#7 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/ipsec.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/key.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/keysock.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/xform_ah.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/xform_esp.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/xform_ipcomp.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/netipsec/xform_ipip.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/include/atomic.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/powerpc/powerpc/elf_machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/security/audit/audit_bsm.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/include/atomic.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/include/intr_machdep.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/pci/schizo.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/pci/schizoreg.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/pci/schizovar.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/elf_machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/intr_machdep.c#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sparc64/sparc64/nexus.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sun4v/include/atomic.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/buf_ring.h#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/disklabel.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/mbuf.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/param.h#11 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/sysent.h#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/termios.h#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/sys/vimage.h#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_dirhash.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ufs/ufs_lookup.c#13 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/00.t#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/run#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/bin/sh/parameters/exitstatus1.0#1 branch .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/Makefile#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/fstest.c#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/chflags/00.t#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/chflags/01.t#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/chflags/02.t#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/chflags/03.t#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/chflags/04.t#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/chflags/05.t#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/chflags/06.t#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/chflags/07.t#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/chflags/08.t#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/chflags/09.t#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/chflags/11.t#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/chflags/12.t#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/chflags/13.t#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/chown/00.t#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/chown/05.t#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/chown/07.t#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/conf#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/link/00.t#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/misc.sh#4 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/open/16.t#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/open/23.t#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/rename/19.t#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/rename/21.t#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/rmdir/12.t#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/truncate/13.t#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/unlink/08.t#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/killall/killall.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.bin/window/wwend.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/Makefile#12 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/bluetooth/sdpd/sd.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ckdist/ckdist.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/config/config.5#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/config/config.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/config/config.y#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/config/configvers.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/config/lang.l#3 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/config/mkmakefile.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/dumpcis/Makefile#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/dumpcis/dumpcis.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/dumpcis/dumpcisfile.c#2 delete .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/dumpcis/main.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/dumpcis/printcis.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/dumpcis/readcis.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/dumpcis/readcis.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/ntp/doc/ntp-keygen.8#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pmcstat/pmcstat.8#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pmcstat/pmcstat.c#5 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pmcstat/pmcstat.h#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/pmcstat/pmcstat_log.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/usbconfig/dump.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/usbconfig/usbconfig.c#2 integrate .. //depot/projects/soc2008/trasz_nfs4acl/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.conf.5#3 integrate Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/Makefile#4 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile,v 1.353 2008/06/17 11:08:49 bz Exp $ +# $FreeBSD: src/Makefile,v 1.354 2008/11/24 11:23:14 des Exp $ # # The user-driven targets are: # @@ -292,22 +292,28 @@ universe_${target}: .if !defined(MAKE_JUST_KERNELS) @echo ">> ${target} started on `LC_ALL=C date`" - -cd ${.CURDIR} && ${MAKE} ${JFLAG} buildworld \ + @(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \ + ${MAKE} ${JFLAG} buildworld \ TARGET=${target} \ - __MAKE_CONF=/dev/null \ - > _.${target}.buildworld 2>&1 + > _.${target}.buildworld 2>&1 || \ + echo "${target} world failed," \ + "check _.${target}.buildworld for details") @echo ">> ${target} buildworld completed on `LC_ALL=C date`" .endif .if exists(${.CURDIR}/sys/${target}/conf/NOTES) - -cd ${.CURDIR}/sys/${target}/conf && ${MAKE} LINT \ - > ${.CURDIR}/_.${target}.makeLINT 2>&1 + @(cd ${.CURDIR}/sys/${target}/conf && env __MAKE_CONF=/dev/null \ + ${MAKE} LINT > ${.CURDIR}/_.${target}.makeLINT 2>&1 || \ + echo "${target} 'make LINT' failed," \ + "check _.${target}.makeLINT for details") .endif .for kernel in ${KERNCONFS} - -cd ${.CURDIR} && ${MAKE} ${JFLAG} buildkernel \ + @(cd ${.CURDIR} && env __MAKE_CONF=/dev/null \ + ${MAKE} ${JFLAG} buildkernel \ TARGET=${target} \ KERNCONF=${kernel} \ - __MAKE_CONF=/dev/null \ - > _.${target}.${kernel} 2>&1 + > _.${target}.${kernel} 2>&1 || \ + echo "${target} ${kernel} kernel failed," \ + "check _.${target}.${kernel} for details") .endfor @echo ">> ${target} completed on `LC_ALL=C date`" .endfor ==== //depot/projects/soc2008/trasz_nfs4acl/UPDATING#11 (text+ko) ==== @@ -22,6 +22,20 @@ to maximize performance. (To disable malloc debugging, run ln -s aj /etc/malloc.conf.) +20081121: + __FreeBSD_version 800054 adds memory barriers to + , new interfaces to ifnet to facilitate + multiple hardware transmit queues for cards that support + them, and a lock-less ring-buffer implementation to + enable drivers to more efficiently manage queueing of + packets. + +20081117: + A new version of ZFS (version 13) has been merged to -HEAD. + This version has zpool attribute "listsnapshots" off by + default, which means "zfs list" does not show snapshots, + and is the same as Solaris behavior. + 20081028: dummynet(4) ABI has changed. ipfw(8) needs to be recompiled. @@ -1149,4 +1163,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.546 2008/10/28 14:14:57 oleg Exp $ +$FreeBSD: src/UPDATING,v 1.549 2008/11/22 05:55:56 kmacy Exp $ ==== //depot/projects/soc2008/trasz_nfs4acl/bin/df/df.1#2 (text+ko) ==== @@ -27,9 +27,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)df.1 8.3 (Berkeley) 5/8/95 -.\" $FreeBSD: src/bin/df/df.1,v 1.40 2007/02/28 10:29:48 ru Exp $ +.\" $FreeBSD: src/bin/df/df.1,v 1.41 2008/11/23 13:03:44 pjd Exp $ .\" -.Dd April 22, 2004 +.Dd November 23, 2008 .Dt DF 1 .Os .Sh NAME @@ -38,7 +38,7 @@ .Sh SYNOPSIS .Nm .Op Fl b | g | H | h | k | m | P -.Op Fl aciln +.Op Fl acilnT .Op Fl t Ar type .Op Ar file | filesystem ... .Sh DESCRIPTION @@ -140,6 +140,8 @@ .Xr lsvfs 1 command can be used to find out the types of file systems that are available on the system. +.It Fl T +Include file system type. .El .Sh ENVIRONMENT .Bl -tag -width BLOCKSIZE ==== //depot/projects/soc2008/trasz_nfs4acl/bin/df/df.c#2 (text+ko) ==== @@ -44,7 +44,7 @@ #endif /* not lint */ #endif #include -__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.71 2007/07/04 00:00:37 scf Exp $"); +__FBSDID("$FreeBSD: src/bin/df/df.c,v 1.72 2008/11/23 13:03:44 pjd Exp $"); #include #include @@ -68,6 +68,7 @@ /* Maximum widths of various fields. */ struct maxwidths { int mntfrom; + int fstype; int total; int used; int avail; @@ -93,7 +94,7 @@ return (a > b ? a : b); } -static int aflag = 0, cflag, hflag, iflag, kflag, lflag = 0, nflag; +static int aflag = 0, cflag, hflag, iflag, kflag, lflag = 0, nflag, Tflag; static struct ufs_args mdev; int @@ -115,7 +116,7 @@ totalbuf.f_bsize = DEV_BSIZE; strlcpy(totalbuf.f_mntfromname, "total", MNAMELEN); vfslist = NULL; - while ((ch = getopt(argc, argv, "abcgHhiklmnPt:")) != -1) + while ((ch = getopt(argc, argv, "abcgHhiklmnPt:T")) != -1) switch (ch) { case 'a': aflag = 1; @@ -176,6 +177,9 @@ fstype = optarg; vfslist = makevfslist(optarg); break; + case 'T': + Tflag = 1; + break; case '?': default: usage(); @@ -391,6 +395,7 @@ if (++timesthrough == 1) { mwp->mntfrom = imax(mwp->mntfrom, (int)strlen("Filesystem")); + mwp->fstype = imax(mwp->fstype, (int)strlen("Type")); if (hflag) { header = " Size"; mwp->total = mwp->used = mwp->avail = @@ -402,8 +407,10 @@ mwp->used = imax(mwp->used, (int)strlen("Used")); mwp->avail = imax(mwp->avail, (int)strlen("Avail")); - (void)printf("%-*s %-*s %*s %*s Capacity", - mwp->mntfrom, "Filesystem", mwp->total, header, + (void)printf("%-*s", mwp->mntfrom, "Filesystem"); + if (Tflag) + (void)printf(" %-*s", mwp->fstype, "Type"); + (void)printf(" %-*s %*s %*s Capacity", mwp->total, header, mwp->used, "Used", mwp->avail, "Avail"); if (iflag) { mwp->iused = imax(mwp->iused, (int)strlen(" iused")); @@ -414,6 +421,8 @@ (void)printf(" Mounted on\n"); } (void)printf("%-*s", mwp->mntfrom, sfsp->f_mntfromname); + if (Tflag) + (void)printf(" %-*s", mwp->fstype, sfsp->f_fstypename); used = sfsp->f_blocks - sfsp->f_bfree; availblks = sfsp->f_bavail + used; if (hflag) { @@ -468,6 +477,7 @@ getbsize(&dummy, &blocksize); mwp->mntfrom = imax(mwp->mntfrom, (int)strlen(sfsp->f_mntfromname)); + mwp->fstype = imax(mwp->fstype, (int)strlen(sfsp->f_fstypename)); mwp->total = imax(mwp->total, int64width( fsbtoblk((int64_t)sfsp->f_blocks, sfsp->f_bsize, blocksize))); mwp->used = imax(mwp->used, @@ -505,7 +515,7 @@ { (void)fprintf(stderr, -"usage: df [-b | -g | -H | -h | -k | -m | -P] [-aciln] [-t type] [file | filesystem ...]\n"); +"usage: df [-b | -g | -H | -h | -k | -m | -P] [-acilnT] [-t type] [file | filesystem ...]\n"); exit(EX_USAGE); } ==== //depot/projects/soc2008/trasz_nfs4acl/bin/sh/eval.c#3 (text+ko) ==== @@ -36,7 +36,7 @@ #endif #endif /* not lint */ #include -__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.55 2008/07/30 21:07:04 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/eval.c,v 1.56 2008/11/23 20:23:57 stefanf Exp $"); #include #include @@ -791,6 +791,7 @@ for (sp = varlist.list ; sp ; sp = sp->next) mklocal(sp->text); funcnest++; + exitstatus = oexitstatus; if (flags & EV_TESTED) evaltree(cmdentry.u.func, EV_TESTED); else ==== //depot/projects/soc2008/trasz_nfs4acl/cddl/compat/opensolaris/misc/deviceid.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/deviceid.c,v 1.2 2008/03/28 22:16:05 jb Exp $"); +__FBSDID("$FreeBSD: src/cddl/compat/opensolaris/misc/deviceid.c,v 1.3 2008/11/22 13:33:06 pjd Exp $"); #include #include @@ -94,11 +94,7 @@ devid_get(int fd, ddi_devid_t *retdevid) { - if (ioctl(fd, DIOCGIDENT, retdevid->devid) == -1) - return (errno); - if (retdevid->devid[0] == '\0') - return (ENOENT); - return (0); + return (ENOENT); } int ==== //depot/projects/soc2008/trasz_nfs4acl/etc/mtree/BSD.include.dist#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.123 2008/05/26 10:39:46 bz Exp $ +# $FreeBSD: src/etc/mtree/BSD.include.dist,v 1.124 2008/11/19 08:56:35 alfred Exp $ # # Please see the file src/etc/mtree/README before making changes to this file. # @@ -120,6 +120,10 @@ .. usb .. + usb2 + include + .. + .. utopia .. vkbd ==== //depot/projects/soc2008/trasz_nfs4acl/include/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.2 (Berkeley) 1/4/94 -# $FreeBSD: src/include/Makefile,v 1.283 2008/09/26 19:23:22 peter Exp $ +# $FreeBSD: src/include/Makefile,v 1.284 2008/11/19 08:56:35 alfred Exp $ # # Doing a "make install" builds /usr/include. @@ -54,7 +54,7 @@ security/mac_mls security/mac_partition \ ufs/ffs ufs/ufs -LSUBSUBDIRS= dev/mpt/mpilib +LSUBSUBDIRS= dev/mpt/mpilib dev/usb2/include .if ${MACHINE_ARCH} == "powerpc" _dev_powermac_nvram= dev/powermac_nvram ==== //depot/projects/soc2008/trasz_nfs4acl/lib/Makefile#6 (text+ko) ==== @@ -1,5 +1,5 @@ # @(#)Makefile 8.1 (Berkeley) 6/4/93 -# $FreeBSD: src/lib/Makefile,v 1.233 2008/09/21 22:02:26 sam Exp $ +# $FreeBSD: src/lib/Makefile,v 1.234 2008/11/19 08:56:35 alfred Exp $ .include @@ -38,7 +38,8 @@ ${_libpmc} libproc librt ${_libsdp} ${_libsm} ${_libsmb} \ ${_libsmdb} \ ${_libsmutil} libstand ${_libtelnet} ${_libthr} libthread_db libufs \ - libugidfw ${_libusbhid} ${_libvgl} libwrap liby libz ${_bind} + libugidfw ${_libusbhid} ${_libusb20} ${_libvgl} libwrap liby libz \ + ${_bind} .if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf) _csu=csu/${MACHINE_ARCH}-elf @@ -136,6 +137,7 @@ .if ${MK_USB} != "no" _libusbhid= libusbhid +_libusb20= libusb20 .endif .include ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc.3#4 (text+ko) ==== @@ -21,9 +21,9 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libpmc/pmc.3,v 1.23 2008/10/04 12:35:02 jkoshy Exp $ +.\" $FreeBSD: src/lib/libpmc/pmc.3,v 1.24 2008/11/24 08:11:33 jkoshy Exp $ .\" -.Dd September 16, 2008 +.Dd November 24, 2008 .Os .Dt PMC 3 .Sh NAME @@ -446,6 +446,29 @@ being probed. Event names are PMC architecture dependent, but the PMC library defines machine independent aliases for commonly used events. +.Pp +Event specifiers spellings are case-insensitive and space characters, +periods, underscores and hyphens are considered equivalent to each other. +Thus the event specifiers +.Qq "Example Event" , +.Qq "example-event" , +and +.Qq "EXAMPLE_EVENT" +are equivalent. +.Ss PMC Architecture Dependent Events +PMC architecture dependent event specifiers are described in the +following manual pages: +.Bl -column " PMC_CLASS_TSC " "MANUAL PAGE " +.It Em "PMC Class" Ta Em "Manual Page" +.It Li PMC_CLASS_IAF Ta Xr pmc.iaf 3 +.It Li PMC_CLASS_IAP Ta Xr pmc.atom 3 , Xr pmc.core 3 , Xr pmc.core2 3 +.It Li PMC_CLASS_K7 Ta Xr pmc.k7 3 +.It Li PMC_CLASS_K8 Ta Xr pmc.k8 3 +.It Li PMC_CLASS_P4 Ta Xr pmc.p4 3 +.It Li PMC_CLASS_P5 Ta Xr pmc.p5 3 +.It Li PMC_CLASS_P6 Ta Xr pmc.p6 3 +.It Li PMC_CLASS_TSC Ta Xr pmc.tsc 3 +.El .Ss Event Name Aliases Event name aliases are PMC-independent names for commonly used events. The following aliases are known to this version of the @@ -472,21 +495,6 @@ Measure the number of cycles the processor is not in a halted or sleep state. .El -.Pp -.Ss PMC Architecture Dependent Events -PMC architecture dependent event specifiers are described in the -following manual pages: -.Bl -column " PMC_CLASS_TSC " "MANUAL PAGE " -.It Em "PMC Class" Ta Em "Manual Page" -.It Li PMC_CLASS_IAF Ta Xr pmc.iaf 3 -.It Li PMC_CLASS_IAP Ta Xr pmc.atom 3 , Xr pmc.core 3 , Xr pmc.core2 3 -.It Li PMC_CLASS_K7 Ta Xr pmc.k7 3 -.It Li PMC_CLASS_K8 Ta Xr pmc.k8 3 -.It Li PMC_CLASS_P4 Ta Xr pmc.p4 3 -.It Li PMC_CLASS_P5 Ta Xr pmc.p5 3 -.It Li PMC_CLASS_P6 Ta Xr pmc.p6 3 -.It Li PMC_CLASS_TSC Ta Xr pmc.tsc 3 -.El .Sh COMPATIBILITY The interface between the .Nm pmc ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc.atom.3#3 (text+ko) ==== @@ -21,7 +21,7 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libpmc/pmc.atom.3,v 1.4 2008/11/13 16:32:20 jkoshy Exp $ +.\" $FreeBSD: src/lib/libpmc/pmc.atom.3,v 1.5 2008/11/24 08:14:01 jkoshy Exp $ .\" .Dd November 12, 2008 .Os @@ -108,9 +108,6 @@ .It Li os Configure the PMC to count events happening at processor privilege level 0. -.It Li umask= Ns Ar value -This qualifier is used to further qualify the event selected (see -below). .It Li usr Configure the PMC to count events occurring at privilege levels 1, 2 or 3. ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc.core.3#3 (text+ko) ==== @@ -21,7 +21,7 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libpmc/pmc.core.3,v 1.4 2008/11/13 16:32:20 jkoshy Exp $ +.\" $FreeBSD: src/lib/libpmc/pmc.core.3,v 1.6 2008/11/26 03:48:20 jkoshy Exp $ .\" .Dd November 12, 2008 .Os @@ -100,9 +100,6 @@ .It Li os Configure the PMC to count events happening at processor privilege level 0. -.It Li umask= Ns Ar value -This qualifier is used to further qualify the event selected (see -below). .It Li usr Configure the PMC to count events occurring at privilege levels 1, 2 or 3. @@ -356,7 +353,7 @@ .It Li Cycles_Div_Busy .Pq Event 14H , Umask 00H The number of cycles the divider is busy. -The event is only only available for on PMC0. +The event is only available on PMC0. .It Li Cycles_Int_Masked .Pq Event C6H , Umask 00H The number of cycles while interrupts were disabled. @@ -658,7 +655,7 @@ .Pq Event B3H , Umask 08H The number of SIMD integer unpack instructions executed. .It Li SMC_Detected -.Pq Event C3H +.Pq Event C3H , Umask 00H The number of times self-modifying code was detected. .It Li SSE_NTStores_Miss .Pq Event 4BH , Umask 03H ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libpmc/pmc.core2.3#3 (text+ko) ==== @@ -21,7 +21,7 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libpmc/pmc.core2.3,v 1.4 2008/11/13 16:32:20 jkoshy Exp $ +.\" $FreeBSD: src/lib/libpmc/pmc.core2.3,v 1.5 2008/11/24 08:14:01 jkoshy Exp $ .\" .Dd November 12, 2008 .Os @@ -106,9 +106,6 @@ .It Li os Configure the PMC to count events happening at processor privilege level 0. -.It Li umask= Ns Ar value -This qualifier is used to further qualify the event selected (see -below). .It Li usr Configure the PMC to count events occurring at privilege levels 1, 2 or 3. ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libstand/nfs.c#2 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/lib/libstand/nfs.c,v 1.13 2008/04/05 15:03:29 dfr Exp $"); +__FBSDID("$FreeBSD: src/lib/libstand/nfs.c,v 1.14 2008/11/21 09:14:29 luigi Exp $"); #include #include @@ -405,7 +405,7 @@ #ifdef NFS_DEBUG if (debug) - printf("nfs_open: %s (rootpath=%s)\n", path, rootpath); + printf("nfs_open: %s (rootpath=%s)\n", upath, rootpath); #endif if (!rootpath[0]) { printf("no rootpath, no nfs\n"); ==== //depot/projects/soc2008/trasz_nfs4acl/lib/libusb20/libusb20.3#2 (text+ko) ==== @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/lib/libusb20/libusb20.3,v 1.1 2008/11/04 02:31:03 alfred Exp $ +.\" $FreeBSD: src/lib/libusb20/libusb20.3,v 1.2 2008/11/19 08:56:35 alfred Exp $ .\" .Dd Oct 23, 2008 .Dt LIBUSB20 3 @@ -60,9 +60,9 @@ . .Pp . -.Fn libusb20_tr_close +.Fn libusb20_tr_close pxfer This function will release all kernel resources associated with an USB -.Fa xfer . +.Fa pxfer . . This function returns zero upon success. . @@ -70,13 +70,13 @@ . .Pp . -.Fn libusb20_tr_open +.Fn libusb20_tr_open pxfer max_buf_size max_frame_count ep_no This function will allocate kernel resources like -.Fa MaxBufSize +.Fa max_buf_size and -.Fa MaxFrameCount +.Fa max_frame_count associated with an USB -.Fa xfer +.Fa pxfer and bind the transfer to the specified .Fa ep_no . . @@ -86,7 +86,7 @@ . .Pp . -.Fn libusb20_tr_get_pointer +.Fn libusb20_tr_get_pointer pdev tr_index This function will return a pointer to the allocated USB transfer according to the .Fa pdev and @@ -97,32 +97,32 @@ . .Pp . -.Fn libusb20_tr_get_time_complete +.Fn libusb20_tr_get_time_complete pxfer This function will return the completion time of an USB transfer in millisecond units. This function is most useful for isochronous USB transfers when doing echo cancelling. . .Pp . -.Fn libusb20_tr_get_actual_frames +.Fn libusb20_tr_get_actual_frames pxfer This function will return the actual number of USB frames after an USB transfer completed. A value of zero means that no data was transferred. . .Pp . -.Fn libusb20_tr_get_actual_length +.Fn libusb20_tr_get_actual_length pxfer This function will return the sum of the actual length for all transferred USB frames for the given USB transfer. . .Pp . -.Fn libusb20_tr_get_max_frames +.Fn libusb20_tr_get_max_frames pxfer This function will return the maximum number of USB frames that were allocated when an USB transfer was setup for the given USB transfer. >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Nov 26 10:27:01 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BB0D81065676; Wed, 26 Nov 2008 10:27:01 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7EC28106564A for ; Wed, 26 Nov 2008 10:27:01 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5C2C78FC19 for ; Wed, 26 Nov 2008 10:27:01 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAQAR1g1013734 for ; Wed, 26 Nov 2008 10:27:01 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAQAR0mR013720 for perforce@freebsd.org; Wed, 26 Nov 2008 10:27:00 GMT (envelope-from zec@tel.fer.hr) Date: Wed, 26 Nov 2008 10:27:00 GMT Message-Id: <200811261027.mAQAR0mR013720@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153592 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, 26 Nov 2008 10:27:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=153592 Change 153592 by zec@zec_tpx32 on 2008/11/26 10:26:09 Further reduce the diff between vimage and vimage_commit2 branches by merging over a few V_ / INIT_VNET / CURVNET_SET / SYSCTL_V / #ifdef VIMAGE_GLOBALS non-functional changes. Affected files ... .. //depot/projects/vimage-commit2/src/sys/kern/kern_poll.c#7 edit .. //depot/projects/vimage-commit2/src/sys/kern/kern_sysctl.c#2 edit .. //depot/projects/vimage-commit2/src/sys/net/bpf.c#7 edit .. //depot/projects/vimage-commit2/src/sys/net/if.c#24 edit .. //depot/projects/vimage-commit2/src/sys/net/if_loop.c#14 edit .. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#20 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#25 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#19 edit .. //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#13 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#17 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#14 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_proto.c#12 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_src.c#13 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#14 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/raw_ip6.c#17 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/key.c#19 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/kern/kern_poll.c#7 (text+ko) ==== @@ -521,6 +521,7 @@ static int poll_switch(SYSCTL_HANDLER_ARGS) { + INIT_VNET_INET(curvnet); struct ifnet *ifp; int error; int val = polling; ==== //depot/projects/vimage-commit2/src/sys/kern/kern_sysctl.c#2 (text+ko) ==== @@ -1413,6 +1413,7 @@ req.lock = REQ_LOCKED; SYSCTL_LOCK(); + CURVNET_SET(TD_TO_VNET(curthread)); do { req.oldidx = 0; @@ -1423,6 +1424,7 @@ if (req.lock == REQ_WIRED && req.validlen > 0) vsunlock(req.oldptr, req.validlen); + CURVNET_RESTORE(); SYSCTL_UNLOCK(); if (error && error != ENOMEM) ==== //depot/projects/vimage-commit2/src/sys/net/bpf.c#7 (text+ko) ==== @@ -566,7 +566,9 @@ */ if (d->bd_promisc) { d->bd_promisc = 0; + CURVNET_SET(ifp->if_vnet); error = ifpromisc(ifp, 0); + CURVNET_RESTORE(); if (error != 0 && error != ENXIO) { /* * ENXIO can happen if a pccard is unplugged @@ -872,7 +874,9 @@ #ifdef MAC BPFD_LOCK(d); + CURVNET_SET(ifp->if_vnet); mac_bpfdesc_create_mbuf(d, m); + CURVNET_RESTORE(); if (mc != NULL) mac_bpfdesc_create_mbuf(d, mc); BPFD_UNLOCK(d); @@ -993,6 +997,7 @@ return (EPERM); } } + CURVNET_SET(TD_TO_VNET(td)); switch (cmd) { default: @@ -1322,6 +1327,7 @@ case BIOCROTZBUF: return (bpf_ioctl_rotzbuf(td, d, (struct bpf_zbuf *)addr)); } + CURVNET_RESTORE(); return (error); } ==== //depot/projects/vimage-commit2/src/sys/net/if.c#24 (text+ko) ==== @@ -192,7 +192,6 @@ struct ifaddr * ifaddr_byindex(u_short idx) { - INIT_VNET_NET(curvnet); struct ifaddr *ifa; IFNET_RLOCK(); ==== //depot/projects/vimage-commit2/src/sys/net/if_loop.c#14 (text+ko) ==== @@ -105,6 +105,9 @@ static void lo_clone_destroy(struct ifnet *ifp) { +#ifdef INVARIANTS + INIT_VNET_NET(ifp->if_vnet); +#endif /* XXX: destroying lo0 will lead to panics. */ KASSERT(V_loif != ifp, ("%s: destroying lo0", __func__)); ==== //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#20 (text+ko) ==== @@ -89,8 +89,8 @@ static int arp_proxyall; #endif -SYSCTL_INT(_net_link_ether_inet, OID_AUTO, max_age, CTLFLAG_RW, - &arpt_keep, 0, "ARP entry lifetime in seconds"); +SYSCTL_V_INT(V_NET, vnet_inet, _net_link_ether_inet, OID_AUTO, max_age, + CTLFLAG_RW, arpt_keep, 0, "ARP entry lifetime in seconds"); #define rt_expire rt_rmx.rmx_expire ==== //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#25 (text+ko) ==== @@ -1475,7 +1475,7 @@ struct inpcb *inp; INP_INFO_RLOCK(&V_tcbinfo); - LIST_FOREACH(inp, tcbinfo.ipi_listhead, inp_list) { + LIST_FOREACH(inp, V_tcbinfo.ipi_listhead, inp_list) { INP_WLOCK(inp); func(inp, arg); INP_WUNLOCK(inp); ==== //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#19 (text+ko) ==== @@ -342,6 +342,7 @@ VNET_FOREACH(vnet_iter) { CURVNET_SET(vnet_iter); INIT_VNET_NET(vnet_iter); + for ( fibnum = 0; fibnum < rt_numfibs; fibnum++) { rnh = V_rt_tables[fibnum][AF_INET]; arg.found = arg.killed = 0; ==== //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#13 (text+ko) ==== @@ -210,7 +210,6 @@ #define V_arp_maxtries VNET_INET(arp_maxtries) #define V_arp_proxyall VNET_INET(arp_proxyall) #define V_arpt_keep VNET_INET(arpt_keep) -#define V_arpt_prune VNET_INET(arpt_prune) #define V_blackhole VNET_INET(blackhole) #define V_divcb VNET_INET(divcb) #define V_divcbinfo VNET_INET(divcbinfo) ==== //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#17 (text+ko) ==== @@ -108,12 +108,13 @@ #endif extern struct domain inet6domain; + +#ifdef VIMAGE_GLOBALS extern struct inpcbinfo ripcbinfo; extern struct inpcbhead ripcb; extern int icmp6errppslim; extern int icmp6_nodeinfo; -#ifdef VIMAGE_GLOBALS struct icmp6stat icmp6stat; static int icmp6errpps_count; static struct timeval icmp6errppslim_last; ==== //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#14 (text+ko) ==== @@ -65,10 +65,9 @@ unsigned long in6_maxmtu; int ip6_auto_linklocal; struct callout in6_tmpaddrtimer_ch; -#endif - extern struct inpcbinfo udbinfo; extern struct inpcbinfo ripcbinfo; +#endif static int get_rand_ifid(struct ifnet *, struct in6_addr *); static int generate_tmp_ifid(u_int8_t *, const u_int8_t *, u_int8_t *); ==== //depot/projects/vimage-commit2/src/sys/netinet6/in6_proto.c#12 (text+ko) ==== @@ -563,6 +563,6 @@ SYSCTL_V_INT(V_NET, vnet_inet6, _net_inet6_icmp6, ICMPV6CTL_ND6_DEBUG, nd6_debug, CTLFLAG_RW, nd6_debug, 0, ""); -SYSCTL_INT(_net_inet6_icmp6, ICMPV6CTL_ND6_ONLINKNSRFC4861, - nd6_onlink_ns_rfc4861, CTLFLAG_RW, &nd6_onlink_ns_rfc4861, 0, +SYSCTL_V_INT(V_NET, vnet_inet6, _net_inet6_icmp6, ICMPV6CTL_ND6_ONLINKNSRFC4861, + nd6_onlink_ns_rfc4861, CTLFLAG_RW, nd6_onlink_ns_rfc4861, 0, "Accept 'on-link' nd6 NS in compliance with RFC 4861."); ==== //depot/projects/vimage-commit2/src/sys/netinet6/in6_src.c#13 (text+ko) ==== @@ -462,7 +462,6 @@ struct ifnet **retifp, struct rtentry **retrt, int clone, int norouteok) { - INIT_VNET_NET(curvnet); INIT_VNET_INET6(curvnet); int error = 0; struct ifnet *ifp = NULL; ==== //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#14 (text+ko) ==== @@ -85,9 +85,9 @@ static int rt6_deleteroute(struct radix_node *, void *); +#ifdef VIMAGE_GLOBALS extern int nd6_recalc_reachtm_interval; -#ifdef VIMAGE_GLOBALS static struct ifnet *nd6_defifp; int nd6_defifindex; ==== //depot/projects/vimage-commit2/src/sys/netinet6/raw_ip6.c#17 (text+ko) ==== @@ -112,15 +112,15 @@ * Raw interface to IP6 protocol. */ +#ifdef VIMAGE_GLOBALS extern struct inpcbhead ripcb; extern struct inpcbinfo ripcbinfo; +struct rip6stat rip6stat; +#endif + extern u_long rip_sendspace; extern u_long rip_recvspace; -#ifdef VIMAGE_GLOBALS -struct rip6stat rip6stat; -#endif - /* * Hooks for multicast forwarding. */ ==== //depot/projects/vimage-commit2/src/sys/netipsec/key.c#19 (text+ko) ==== @@ -4336,6 +4336,7 @@ VNET_ITERATOR_DECL(vnet_iter); time_t now = time_second; + VNET_LIST_RLOCK(); VNET_FOREACH(vnet_iter) { CURVNET_SET(vnet_iter); key_flush_spd(now); @@ -4344,6 +4345,7 @@ key_flush_spacq(now); CURVNET_RESTORE(); } + VNET_LIST_RUNLOCK(); #ifndef IPSEC_DEBUG2 /* do exchange to tick time !! */ From owner-p4-projects@FreeBSD.ORG Wed Nov 26 10:49:24 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CCF94106567A; Wed, 26 Nov 2008 10:49:24 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9030D1065673 for ; Wed, 26 Nov 2008 10:49:24 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 76D6A8FC0A for ; Wed, 26 Nov 2008 10:49:24 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAQAnO64024757 for ; Wed, 26 Nov 2008 10:49:24 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAQAnOfn024754 for perforce@freebsd.org; Wed, 26 Nov 2008 10:49:24 GMT (envelope-from zec@tel.fer.hr) Date: Wed, 26 Nov 2008 10:49:24 GMT Message-Id: <200811261049.mAQAnOfn024754@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153594 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, 26 Nov 2008 10:49:25 -0000 http://perforce.freebsd.org/chv.cgi?CH=153594 Change 153594 by zec@zec_tpx32 on 2008/11/26 10:49:00 Unbreak kernel build. Affected files ... .. //depot/projects/vimage-commit2/src/sys/kern/kern_poll.c#8 edit .. //depot/projects/vimage-commit2/src/sys/kern/kern_sysctl.c#3 edit .. //depot/projects/vimage-commit2/src/sys/net/bpf.c#8 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/kern/kern_poll.c#8 (text+ko) ==== @@ -37,6 +37,7 @@ #include #include #include +#include #include /* for IFF_* flags */ #include /* for NETISR_POLL */ @@ -44,7 +45,6 @@ #include #include #include -#include static void netisr_poll(void); /* the two netisr handlers */ static void netisr_pollmore(void); @@ -521,7 +521,7 @@ static int poll_switch(SYSCTL_HANDLER_ARGS) { - INIT_VNET_INET(curvnet); + INIT_VNET_NET(curvnet); struct ifnet *ifp; int error; int val = polling; ==== //depot/projects/vimage-commit2/src/sys/kern/kern_sysctl.c#3 (text+ko) ==== @@ -52,6 +52,7 @@ #include #include #include +#include #include ==== //depot/projects/vimage-commit2/src/sys/net/bpf.c#8 (text+ko) ==== @@ -56,6 +56,7 @@ #include #include #include +#include #include #include From owner-p4-projects@FreeBSD.ORG Wed Nov 26 12:18:55 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 620F81065675; Wed, 26 Nov 2008 12:18:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 252341065672 for ; Wed, 26 Nov 2008 12:18:55 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 095E78FC14 for ; Wed, 26 Nov 2008 12:18:55 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAQCIsF8075441 for ; Wed, 26 Nov 2008 12:18:54 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAQCIsf3075439 for perforce@freebsd.org; Wed, 26 Nov 2008 12:18:54 GMT (envelope-from trasz@freebsd.org) Date: Wed, 26 Nov 2008 12:18:54 GMT Message-Id: <200811261218.mAQCIsf3075439@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 153597 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, 26 Nov 2008 12:18:55 -0000 http://perforce.freebsd.org/chv.cgi?CH=153597 Change 153597 by trasz@trasz_strashydlo on 2008/11/26 12:18:12 Remove spurious differences. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VOP_ACCESS.9#5 edit .. //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_inode.c#6 integrate .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/00.t#7 edit .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/run#5 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/share/man/man9/VOP_ACCESS.9#5 (text+ko) ==== @@ -76,12 +76,6 @@ int error; /* - * Our example does not implement granular access control. - */ - if (unixify_vaccess(&mode, &error)) - return (error); - - /* * Disallow write attempts on read-only file systems; * unless the file is a socket, fifo, or a block or * character device resident on the filesystem. ==== //depot/projects/soc2008/trasz_nfs4acl/sys/ufs/ffs/ffs_inode.c#6 (text+ko) ==== @@ -481,7 +481,7 @@ } } done: -#if 0 +#ifdef INVARIANTS for (level = SINGLE; level <= TRIPLE; level++) if (newblks[NDADDR + level] != DIP(ip, i_ib[level])) panic("ffs_truncate1"); ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/00.t#7 (text+ko) ==== @@ -10,6 +10,8 @@ # # Output should be obvious. # +# $FreeBSD: src/tools/regression/acltools/00.t,v 1.1 2008/11/25 18:29:33 trasz Exp $ +# echo "1..4" ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/acltools/run#5 (text+ko) ==== @@ -26,6 +26,9 @@ # 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. +# +# $FreeBSD: src/tools/regression/acltools/run,v 1.1 2008/11/25 18:29:33 trasz Exp $ +# # # Possible improvements: From owner-p4-projects@FreeBSD.ORG Wed Nov 26 13:44:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D87071065710; Wed, 26 Nov 2008 13:44:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9AB731065708 for ; Wed, 26 Nov 2008 13:44:22 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7DAF98FC0C for ; Wed, 26 Nov 2008 13:44:22 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAQDiM2O040843 for ; Wed, 26 Nov 2008 13:44:22 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAQDiMZF040841 for perforce@freebsd.org; Wed, 26 Nov 2008 13:44:22 GMT (envelope-from trasz@freebsd.org) Date: Wed, 26 Nov 2008 13:44:22 GMT Message-Id: <200811261344.mAQDiMZF040841@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 153605 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, 26 Nov 2008 13:44:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=153605 Change 153605 by trasz@trasz_victim7 on 2008/11/26 13:43:55 Make sure we really require WRITE_OWNER in order to change owner. Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/04.t#2 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/tools/regression/fstest/tests/granular/04.t#2 (text+ko) ==== @@ -5,7 +5,7 @@ dir=`dirname $0` . ${dir}/../misc.sh -echo "1..44" +echo "1..52" n0=`namegen` n1=`namegen` @@ -17,16 +17,24 @@ # ACL_WRITE_OWNER permits to set gid to our own only. expect 0 create ${n0} 0644 +expect 0,0 lstat ${n0} uid,gid +expect EPERM -u 65534 -g 65532,65531 chown ${n0} -1 65532 +expect 0,0 lstat ${n0} uid,gid expect 0 prependacl ${n0} user:65534:write_owner::allow -expect 0,0 lstat ${n0} uid,gid expect EPERM -u 65534 -g 65532,65531 chown ${n0} -1 65530 expect 0,0 lstat ${n0} uid,gid expect 0 -u 65534 -g 65532,65531 chown ${n0} -1 65532 expect 0,65532 lstat ${n0} uid,gid +expect 0 unlink ${n0} # ACL_WRITE_OWNER permits to set uid to our own only. +expect 0 create ${n0} 0644 +expect 0,0 lstat ${n0} uid,gid +expect EPERM -u 65534 -g 65532,65531 chown ${n0} 65534 65531 +expect 0,0 lstat ${n0} uid,gid +expect 0 prependacl ${n0} user:65534:write_owner::allow expect EPERM -u 65534 -g 65532,65531 chown ${n0} 65530 65531 -expect 0,65532 lstat ${n0} uid,gid +expect 0,0 lstat ${n0} uid,gid expect 0 -u 65534 -g 65532,65531 chown ${n0} 65534 65531 expect 65534,65531 lstat ${n0} uid,gid expect 0 unlink ${n0} From owner-p4-projects@FreeBSD.ORG Wed Nov 26 14:25:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 209951065674; Wed, 26 Nov 2008 14:25:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D1E521065670 for ; Wed, 26 Nov 2008 14:25:04 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B68718FC1B for ; Wed, 26 Nov 2008 14:25:04 +0000 (UTC) (envelope-from trasz@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAQEP4VC073000 for ; Wed, 26 Nov 2008 14:25:04 GMT (envelope-from trasz@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAQEP4IG072998 for perforce@freebsd.org; Wed, 26 Nov 2008 14:25:04 GMT (envelope-from trasz@freebsd.org) Date: Wed, 26 Nov 2008 14:25:04 GMT Message-Id: <200811261425.mAQEP4IG072998@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to trasz@freebsd.org using -f From: Edward Tomasz Napierala To: Perforce Change Reviews Cc: Subject: PERFORCE change 153610 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, 26 Nov 2008 14:25:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=153610 Change 153610 by trasz@trasz_victim7 on 2008/11/26 14:24:12 Remove bogus check that broke 02.t. Access is checked by zfs_setacl(). Affected files ... .. //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#13 edit Differences ... ==== //depot/projects/soc2008/trasz_nfs4acl/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#13 (text+ko) ==== @@ -4845,12 +4845,6 @@ if (ap->a_type != ACL_TYPE_NFS4) return (EOPNOTSUPP); - /* Mostly taken from common/syscall/acl.c. */ - - error = VOP_ACCESS(ap->a_vp, VWRITE_ACL, ap->a_cred, ap->a_td); - if (error != 0) - return (error); - if (ap->a_aclp->acl_cnt < 1 || ap->a_aclp->acl_cnt > MAX_ACL_ENTRIES) return (EINVAL); From owner-p4-projects@FreeBSD.ORG Wed Nov 26 15:09:51 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D4B1A1065677; Wed, 26 Nov 2008 15:09:50 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8FF761065672 for ; Wed, 26 Nov 2008 15:09:50 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 76B6A8FC1B for ; Wed, 26 Nov 2008 15:09:50 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAQF9oxh094182 for ; Wed, 26 Nov 2008 15:09:50 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAQF9oV4094180 for perforce@freebsd.org; Wed, 26 Nov 2008 15:09:50 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 26 Nov 2008 15:09:50 GMT Message-Id: <200811261509.mAQF9oV4094180@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 153611 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, 26 Nov 2008 15:09:51 -0000 http://perforce.freebsd.org/chv.cgi?CH=153611 Change 153611 by hselasky@hselasky_laptop001 on 2008/11/26 15:09:34 Add a new USB API function that can return the number of Isochronous frames transferred per second: "usb2_get_isoc_fps" Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.h#27 edit .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#35 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_core.h#27 (text+ko) ==== @@ -434,6 +434,7 @@ uint8_t usb2_get_interface_altindex(struct usb2_interface *iface); usb2_error_t usb2_set_alt_interface_index(struct usb2_device *udev, uint8_t iface_index, uint8_t alt_index); uint8_t usb2_get_speed(struct usb2_device *udev); +uint32_t usb2_get_isoc_fps(struct usb2_device *udev); usb2_error_t usb2_transfer_setup(struct usb2_device *udev, const uint8_t *ifaces, struct usb2_xfer **pxfer, const struct usb2_config *setup_start, uint16_t n_setup, void *priv_sc, struct mtx *priv_mtx); void usb2_set_frame_data(struct usb2_xfer *xfer, void *ptr, uint32_t frindex); void usb2_set_frame_offset(struct usb2_xfer *xfer, uint32_t offset, uint32_t frindex); ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_device.c#35 (text+ko) ==== @@ -1945,6 +1945,19 @@ return (udev->speed); } +uint32_t +usb2_get_isoc_fps(struct usb2_device *udev) +{ + ; /* indent fix */ + switch (udev->speed) { + case USB_SPEED_LOW: + case USB_SPEED_FULL: + return (1000); + default: + return (8000); + } +} + struct usb2_device_descriptor * usb2_get_device_descriptor(struct usb2_device *udev) { From owner-p4-projects@FreeBSD.ORG Wed Nov 26 16:05:47 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B69E71065676; Wed, 26 Nov 2008 16:05:47 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7A3EC1065673 for ; Wed, 26 Nov 2008 16:05:47 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 63CEB8FC16 for ; Wed, 26 Nov 2008 16:05:47 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAQG5l3t030360 for ; Wed, 26 Nov 2008 16:05:47 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAQG5lbb030358 for perforce@freebsd.org; Wed, 26 Nov 2008 16:05:47 GMT (envelope-from hselasky@FreeBSD.org) Date: Wed, 26 Nov 2008 16:05:47 GMT Message-Id: <200811261605.mAQG5lbb030358@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 153612 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, 26 Nov 2008 16:05:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=153612 Change 153612 by hselasky@hselasky_laptop001 on 2008/11/26 16:05:27 Make default sample rate, bits and channels tunable. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.c#20 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.c#20 (text+ko) ==== @@ -80,18 +80,24 @@ #include #include "feeder_if.h" +static int uaudio_default_rate = 96000; +static int uaudio_default_bits = 32; +static int uaudio_default_channels = 2; + #if USB_DEBUG static int uaudio_debug = 0; SYSCTL_NODE(_hw_usb2, OID_AUTO, uaudio, CTLFLAG_RW, 0, "USB uaudio"); SYSCTL_INT(_hw_usb2_uaudio, OID_AUTO, debug, CTLFLAG_RW, &uaudio_debug, 0, "uaudio debug level"); +SYSCTL_INT(_hw_usb2_uaudio, OID_AUTO, default_rate, CTLFLAG_RW, + &uaudio_default_rate, 0, "uaudio default sample rate"); +SYSCTL_INT(_hw_usb2_uaudio, OID_AUTO, default_bits, CTLFLAG_RW, + &uaudio_default_bits, 0, "uaudio default sample bits"); +SYSCTL_INT(_hw_usb2_uaudio, OID_AUTO, default_channels, CTLFLAG_RW, + &uaudio_default_channels, 0, "uaudio default sample channels"); #endif -static uint32_t uaudio_default_rate = 96000; -static uint8_t uaudio_default_bits = 32; -static uint8_t uaudio_default_channels = 2; - #define UAUDIO_MINFRAMES 16 /* must be factor of 8 due HS-USB */ #define UAUDIO_NCHANBUFS 2 /* number of outstanding request */ #define UAUDIO_RECURSE_LIMIT 24 /* rounds */ @@ -1043,15 +1049,26 @@ { uint32_t rate = uaudio_default_rate; uint32_t z; - uint16_t fps = (usb2_get_speed(udev) == USB_SPEED_HIGH) ? 8000 : 1000; + uint16_t fps = usb2_get_isoc_fps(udev); uint8_t bits = uaudio_default_bits; uint8_t y; uint8_t channels = uaudio_default_channels; uint8_t x; bits -= (bits % 8); + if ((bits == 0) || (bits > 32)) { + /* set a valid value */ + bits = 32; + } rate -= (rate % fps); - + if ((rate == 0) || (rate > 192000)) { + /* set a valid value */ + rate = 192000 - (192000 % fps); + } + if ((channels == 0) || (channels > 2)) { + /* set a valid value */ + channels = 2; + } if (sbuf_new(&sc->sc_sndstat, NULL, 4096, SBUF_AUTOEXTEND)) { sc->sc_sndstat_valid = 1; } From owner-p4-projects@FreeBSD.ORG Wed Nov 26 21:19:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B95D81065676; Wed, 26 Nov 2008 21:19:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7DDA01065674 for ; Wed, 26 Nov 2008 21:19:08 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 664CD8FC0A for ; Wed, 26 Nov 2008 21:19:08 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAQLJ85i096860 for ; Wed, 26 Nov 2008 21:19:08 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAQLJ74b096858 for perforce@freebsd.org; Wed, 26 Nov 2008 21:19:07 GMT (envelope-from zec@tel.fer.hr) Date: Wed, 26 Nov 2008 21:19:07 GMT Message-Id: <200811262119.mAQLJ74b096858@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153628 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, 26 Nov 2008 21:19:08 -0000 http://perforce.freebsd.org/chv.cgi?CH=153628 Change 153628 by zec@zec_tpx32 on 2008/11/26 21:18:10 Revert back a pointless change. Affected files ... .. //depot/projects/vimage-commit2/src/sys/kern/kern_poll.c#9 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/kern/kern_poll.c#9 (text+ko) ==== @@ -37,7 +37,6 @@ #include #include #include -#include #include /* for IFF_* flags */ #include /* for NETISR_POLL */ @@ -45,6 +44,7 @@ #include #include #include +#include static void netisr_poll(void); /* the two netisr handlers */ static void netisr_pollmore(void); From owner-p4-projects@FreeBSD.ORG Wed Nov 26 22:38:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D2433106567A; Wed, 26 Nov 2008 22:38:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 97048106564A for ; Wed, 26 Nov 2008 22:38:29 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 79CA28FC19 for ; Wed, 26 Nov 2008 22:38:29 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAQMcTfw004608 for ; Wed, 26 Nov 2008 22:38:29 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAQMcTS9004606 for perforce@freebsd.org; Wed, 26 Nov 2008 22:38:29 GMT (envelope-from zec@tel.fer.hr) Date: Wed, 26 Nov 2008 22:38:29 GMT Message-Id: <200811262238.mAQMcTS9004606@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153633 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, 26 Nov 2008 22:38:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=153633 Change 153633 by zec@zec_tca51 on 2008/11/26 22:38:01 IFC @ 153631 Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/amd64_mem.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/identcpu.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/initcpu.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/local_apic.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/mp_machdep.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/msi.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/cputypes.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/md_var.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/specialreg.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/boot0/boot0.S#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ipc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/coretemp/coretemp.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/fxp/if_fxp.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/fxp/if_fxpreg.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/fxp/if_fxpvar.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/hwpmc/hwpmc_intel.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/hwpmc/hwpmc_piv.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/hwpmc/hwpmc_ppro.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/hwpmc/hwpmc_x86.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/patm/if_patm_intr.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/u3g.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usbdevs#15 integrate .. //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_rrip.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nullfs/null_vnops.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/geom/part/g_part_bsd.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/i386/cpufreq/est.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/i386/cpufreq/p4tcc.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/cpufreq/powernow.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/i686_mem.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/identcpu.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/initcpu.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/k6_mem.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/local_apic.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/longrun.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/mp_machdep.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/msi.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/cputypes.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/md_var.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/specialreg.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_poll.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_sysctl.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/net/bpf.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/net/if.c#25 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_loop.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/net/route.c#20 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#21 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#26 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#20 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_divert.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw_pfil.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#27 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#30 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#29 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timewait.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_usrreq.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#25 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_pcb.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_pcb.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_proto.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#19 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_src.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_nbr.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/raw_ip6.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/udp6_usrreq.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/key.c#20 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/keysock.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/vipsec.h#11 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/amd64_mem.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.29 2008/03/12 22:09:19 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.30 2008/11/26 19:25:13 jkim Exp $"); #include #include @@ -35,6 +35,7 @@ #include #include +#include #include #include @@ -677,8 +678,8 @@ return; if ((cpu_id & 0xf00) != 0x600 && (cpu_id & 0xf00) != 0xf00) return; - if ((strcmp(cpu_vendor, "GenuineIntel") != 0) && - (strcmp(cpu_vendor, "AuthenticAMD") != 0)) + if (cpu_vendor_id != CPU_VENDOR_INTEL && + cpu_vendor_id != CPU_VENDOR_AMD) return; mem_range_softc.mr_op = &amd64_mrops; } ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/identcpu.c#4 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.164 2008/10/22 17:30:37 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.166 2008/11/26 19:29:33 jkim Exp $"); #include "opt_cpu.h" @@ -69,6 +69,7 @@ void earlysetcpuclass(void); void panicifcpuunsupported(void); +static u_int find_cpu_vendor_id(void); static void print_AMD_info(void); static void print_AMD_assoc(int i); @@ -95,6 +96,14 @@ { "Sledgehammer", CPUCLASS_K8 }, /* CPU_SLEDGEHAMMER */ }; +static struct { + char *vendor; + u_int vendor_id; +} cpu_vendors[] = { + { INTEL_VENDOR_ID, CPU_VENDOR_INTEL }, /* GenuineIntel */ + { AMD_VENDOR_ID, CPU_VENDOR_AMD }, /* AuthenticAMD */ +}; + int cpu_cores; int cpu_logical; @@ -122,10 +131,10 @@ } } - if (strcmp(cpu_vendor, "GenuineIntel") == 0) { + if (cpu_vendor_id == CPU_VENDOR_INTEL) { /* Please make up your mind folks! */ strcat(cpu_model, "EM64T"); - } else if (strcmp(cpu_vendor, "AuthenticAMD") == 0) { + } else if (cpu_vendor_id == CPU_VENDOR_AMD) { /* * Values taken from AMD Processor Recognition * http://www.amd.com/K6/k6docs/pdf/20734g.pdf @@ -165,13 +174,13 @@ printf("Unknown"); /* will panic below... */ } printf("-class CPU)\n"); - if(*cpu_vendor) - printf(" Origin = \"%s\"",cpu_vendor); - if(cpu_id) + if (*cpu_vendor) + printf(" Origin = \"%s\"", cpu_vendor); + if (cpu_id) printf(" Id = 0x%x", cpu_id); - if (strcmp(cpu_vendor, "GenuineIntel") == 0 || - strcmp(cpu_vendor, "AuthenticAMD") == 0) { + if (cpu_vendor_id == CPU_VENDOR_INTEL || + cpu_vendor_id == CPU_VENDOR_AMD) { printf(" Stepping = %u", cpu_id & 0xf); if (cpu_high > 0) { u_int cmp = 1, htt = 1; @@ -343,22 +352,28 @@ ); } - if (cpu_feature & CPUID_HTT && strcmp(cpu_vendor, - "AuthenticAMD") == 0) + if ((cpu_feature & CPUID_HTT) && + cpu_vendor_id == CPU_VENDOR_AMD) cpu_feature &= ~CPUID_HTT; /* * If this CPU supports P-state invariant TSC then * mention the capability. */ - if (!tsc_is_invariant && - (strcmp(cpu_vendor, "AuthenticAMD") == 0 && - ((amd_pminfo & AMDPM_TSC_INVARIANT) != 0 || - AMD64_CPU_FAMILY(cpu_id) >= 0x10 || - cpu_id == 0x60fb2))) { - tsc_is_invariant = 1; + switch (cpu_vendor_id) { + case CPU_VENDOR_AMD: + if ((amd_pminfo & AMDPM_TSC_INVARIANT) || + AMD64_CPU_FAMILY(cpu_id) >= 0x10 || + cpu_id == 0x60fb2) + tsc_is_invariant = 1; + break; + case CPU_VENDOR_INTEL: + if (amd_pminfo & AMDPM_TSC_INVARIANT) + tsc_is_invariant = 1; + break; + } + if (tsc_is_invariant) printf("\n TSC: P-state invariant"); - } /* * If this CPU supports HTT or CMP then mention the @@ -366,10 +381,10 @@ */ if (cpu_feature & CPUID_HTT) htt = (cpu_procinfo & CPUID_HTT_CORES) >> 16; - if (strcmp(cpu_vendor, "AuthenticAMD") == 0 && + if (cpu_vendor_id == CPU_VENDOR_AMD && (amd_feature2 & AMDID2_CMP)) cmp = (cpu_procinfo2 & AMDID_CMP_CORES) + 1; - else if (strcmp(cpu_vendor, "GenuineIntel") == 0 && + else if (cpu_vendor_id == CPU_VENDOR_INTEL && (cpu_high >= 4)) { cpuid_count(4, 0, regs); if ((regs[0] & 0x1f) != 0) @@ -391,7 +406,7 @@ if (!bootverbose) return; - if (strcmp(cpu_vendor, "AuthenticAMD") == 0) + if (cpu_vendor_id == CPU_VENDOR_AMD) print_AMD_info(); } @@ -450,6 +465,7 @@ ((u_int *)&cpu_vendor)[1] = regs[3]; ((u_int *)&cpu_vendor)[2] = regs[2]; cpu_vendor[12] = '\0'; + cpu_vendor_id = find_cpu_vendor_id(); do_cpuid(1, regs); cpu_id = regs[0]; @@ -457,8 +473,8 @@ cpu_feature = regs[3]; cpu_feature2 = regs[2]; - if (strcmp(cpu_vendor, "GenuineIntel") == 0 || - strcmp(cpu_vendor, "AuthenticAMD") == 0) { + if (cpu_vendor_id == CPU_VENDOR_INTEL || + cpu_vendor_id == CPU_VENDOR_AMD) { do_cpuid(0x80000000, regs); cpu_exthigh = regs[0]; } @@ -480,6 +496,17 @@ cpu = CPU_CLAWHAMMER; } +static u_int +find_cpu_vendor_id(void) +{ + int i; + + for (i = 0; i < sizeof(cpu_vendors) / sizeof(cpu_vendors[0]); i++) + if (strcmp(cpu_vendor, cpu_vendors[i].vendor) == 0) + return (cpu_vendors[i].vendor_id); + return (0); +} + static void print_AMD_assoc(int i) { ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/initcpu.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.51 2008/10/21 00:17:55 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.52 2008/11/26 19:25:13 jkim Exp $"); #include "opt_cpu.h" @@ -60,6 +60,7 @@ u_int cpu_procinfo; /* HyperThreading Info / Brand Index / CLFUSH */ u_int cpu_procinfo2; /* Multicore info */ char cpu_vendor[20]; /* CPU Origin code */ +u_int cpu_vendor_id; /* CPU vendor ID */ u_int cpu_fxsr; /* SSE enabled */ u_int cpu_mxcsr_mask; /* Valid bits in mxcsr */ ==== //depot/projects/vimage-commit2/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.48 2008/10/27 21:45:18 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.49 2008/11/26 19:25:13 jkim Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_kdtrace.h" @@ -323,7 +323,7 @@ /* XXX: Error and thermal LVTs */ - if (strcmp(cpu_vendor, "AuthenticAMD") == 0) { + if (cpu_vendor_id == CPU_VENDOR_AMD) { /* * Detect the presence of C1E capability mostly on latest * dual-cores (or future) k8 family. This feature renders ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/mp_machdep.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.294 2008/09/28 18:34:14 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.295 2008/11/26 19:25:13 jkim Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -57,6 +57,7 @@ #include #include +#include #include #include #include @@ -374,8 +375,7 @@ * First determine if this is an Intel processor which claims * to have hyperthreading support. */ - if ((cpu_feature & CPUID_HTT) && - (strcmp(cpu_vendor, "GenuineIntel") == 0)) { + if ((cpu_feature & CPUID_HTT) && cpu_vendor_id == CPU_VENDOR_INTEL) { /* * If the "deterministic cache parameters" cpuid calls * are available, use them. ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/msi.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.7 2007/10/24 21:16:22 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.8 2008/11/26 19:25:13 jkim Exp $"); #include #include @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -211,8 +212,8 @@ { /* Check if we have a supported CPU. */ - if (!(strcmp(cpu_vendor, "GenuineIntel") == 0 || - strcmp(cpu_vendor, "AuthenticAMD") == 0)) + if (!(cpu_vendor_id == CPU_VENDOR_INTEL || + cpu_vendor_id == CPU_VENDOR_AMD)) return; msi_enabled = 1; ==== //depot/projects/vimage-commit2/src/sys/amd64/include/cputypes.h#2 (text+ko) ==== @@ -24,7 +24,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/sys/amd64/include/cputypes.h,v 1.19 2005/01/05 20:17:20 imp Exp $ + * $FreeBSD: src/sys/amd64/include/cputypes.h,v 1.20 2008/11/26 19:25:13 jkim Exp $ */ #ifndef _MACHINE_CPUTYPES_H_ @@ -33,15 +33,21 @@ /* * Classes of processor. */ -#define CPUCLASS_X86 0 /* X86 */ -#define CPUCLASS_K8 1 /* K8 AMD64 class */ +#define CPUCLASS_X86 0 /* X86 */ +#define CPUCLASS_K8 1 /* K8 AMD64 class */ /* * Kinds of processor. */ -#define CPU_X86 0 /* Intel */ -#define CPU_CLAWHAMMER 1 /* AMD Clawhammer */ -#define CPU_SLEDGEHAMMER 2 /* AMD Sledgehammer */ +#define CPU_X86 0 /* Intel */ +#define CPU_CLAWHAMMER 1 /* AMD Clawhammer */ +#define CPU_SLEDGEHAMMER 2 /* AMD Sledgehammer */ + +/* + * Vendors of processor. + */ +#define CPU_VENDOR_AMD 0x1022 /* AMD */ +#define CPU_VENDOR_INTEL 0x8086 /* Intel */ #ifndef LOCORE extern int cpu; ==== //depot/projects/vimage-commit2/src/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.82 2008/10/21 00:17:55 jkim Exp $ + * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.83 2008/11/26 19:25:13 jkim Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -52,6 +52,7 @@ extern u_int cpu_procinfo; extern u_int cpu_procinfo2; extern char cpu_vendor[]; +extern u_int cpu_vendor_id; extern char kstack[]; extern char sigcode[]; extern int szsigcode; ==== //depot/projects/vimage-commit2/src/sys/amd64/include/specialreg.h#4 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.49 2008/10/22 17:36:52 jkim Exp $ + * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.50 2008/11/26 19:25:13 jkim Exp $ */ #ifndef _MACHINE_SPECIALREG_H_ @@ -196,8 +196,8 @@ /* * CPUID manufacturers identifiers */ -#define INTEL_VENDOR_ID "GenuineIntel" -#define AMD_VENDOR_ID "AuthenticAMD" +#define AMD_VENDOR_ID "AuthenticAMD" +#define INTEL_VENDOR_ID "GenuineIntel" /* * Model-specific registers for the i386 family ==== //depot/projects/vimage-commit2/src/sys/boot/i386/boot0/boot0.S#2 (text+ko) ==== @@ -13,7 +13,7 @@ * warranties of merchantability and fitness for a particular * purpose. * - * $FreeBSD: src/sys/boot/i386/boot0/boot0.S,v 1.16 2007/03/26 21:56:13 thomas Exp $ + * $FreeBSD: src/sys/boot/i386/boot0/boot0.S,v 1.18 2008/11/26 21:38:43 luigi Exp $ */ /* A 512-byte boot manager. */ @@ -319,8 +319,9 @@ jc main.10 # If error cmpw $MAGIC,0x1fe(%bx) # Bootable? jne main.10 # No - movw $crlf,%si # Leave some - callw puts # space + pushw %si # Save ptr to selected part. + callw putn # Leave some space + popw %si # Restore, next stage uses it jmp *%bx # Invoke bootstrap /* ==== //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ipc.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ipc.c,v 1.54 2007/01/14 16:34:43 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ipc.c,v 1.55 2008/11/26 16:38:43 rdivacky Exp $"); #include #include @@ -672,6 +672,14 @@ return (error); } +/* + * TODO: implement this + * case LINUX_MSG_STAT: + */ + case LINUX_IPC_STAT: + /* NOTHING */ + break; + case LINUX_IPC_SET: error = linux_msqid_pullup(args->cmd & LINUX_IPC_64, &linux_msqid, PTRIN(args->buf)); @@ -679,6 +687,14 @@ return (error); linux_to_bsd_msqid_ds(&linux_msqid, &bsd_msqid); break; + + case LINUX_IPC_RMID: + /* NOTHING */ + break; + + default: + return (EINVAL); + break; } error = kern_msgctl(td, args->msqid, bsd_cmd, &bsd_msqid); ==== //depot/projects/vimage-commit2/src/sys/dev/coretemp/coretemp.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/coretemp/coretemp.c,v 1.8 2008/05/14 10:02:25 rpaulo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/coretemp/coretemp.c,v 1.9 2008/11/26 19:25:13 jkim Exp $"); #include #include @@ -45,6 +45,7 @@ #include #include +#include #include struct coretemp_softc { @@ -94,7 +95,7 @@ return; /* Check that CPUID 0x06 is supported and the vendor is Intel.*/ - if (cpu_high < 6 || strcmp(cpu_vendor, "GenuineIntel")) + if (cpu_high < 6 || cpu_vendor_id != CPU_VENDOR_INTEL) return; /* * CPUID 0x06 returns 1 if the processor has on-die thermal ==== //depot/projects/vimage-commit2/src/sys/dev/fxp/if_fxp.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.274 2008/11/25 04:33:02 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.277 2008/11/26 07:36:17 yongari Exp $"); /* * Intel EtherExpress Pro/100B PCI Fast Ethernet driver @@ -59,15 +59,15 @@ #include #include -#include -#include - -#ifdef FXP_IP_CSUM_WAR #include #include #include +#include +#include + +#include #include -#endif +#include #include #include /* for PCIM_CMD_xxx */ @@ -213,6 +213,8 @@ static int fxp_resume(device_t dev); static void fxp_intr(void *xsc); +static void fxp_rxcsum(struct fxp_softc *sc, struct ifnet *ifp, + struct mbuf *m, uint16_t status, int pos); static void fxp_intr_body(struct fxp_softc *sc, struct ifnet *ifp, uint8_t statack, int count); static void fxp_init(void *xsc); @@ -227,8 +229,12 @@ static int fxp_ioctl(struct ifnet *ifp, u_long command, caddr_t data); static void fxp_watchdog(struct fxp_softc *sc); -static int fxp_add_rfabuf(struct fxp_softc *sc, - struct fxp_rx *rxp, struct mbuf *oldm); +static void fxp_add_rfabuf(struct fxp_softc *sc, + struct fxp_rx *rxp); +static void fxp_discard_rfabuf(struct fxp_softc *sc, + struct fxp_rx *rxp); +static int fxp_new_rfabuf(struct fxp_softc *sc, + struct fxp_rx *rxp); static int fxp_mc_addrs(struct fxp_softc *sc); static void fxp_mc_setup(struct fxp_softc *sc); static uint16_t fxp_eeprom_getword(struct fxp_softc *sc, int offset, @@ -587,6 +593,9 @@ sc->flags |= FXP_FLAG_SAVE_BAD; } + /* For 82559 or later chips, Rx checksum offload is supported. */ + if (sc->revision >= FXP_REV_82559_A0) + sc->flags |= FXP_FLAG_82559_RXCSUM; /* * Enable use of extended RFDs and TCBs for 82550 * and later chips. Note: we need extended TXCB support @@ -599,6 +608,8 @@ sc->rfa_size = sizeof (struct fxp_rfa); sc->tx_cmd = FXP_CB_COMMAND_IPCBXMIT; sc->flags |= FXP_FLAG_EXT_RFA; + /* Use extended RFA instead of 82559 checksum mode. */ + sc->flags &= ~FXP_FLAG_82559_RXCSUM; } else { sc->rfa_size = sizeof (struct fxp_rfa) - FXP_RFAX_LEN; sc->tx_cmd = FXP_CB_COMMAND_XMIT; @@ -608,11 +619,15 @@ * Allocate DMA tags and DMA safe memory. */ sc->maxtxseg = FXP_NTXSEG; - if (sc->flags & FXP_FLAG_EXT_RFA) + sc->maxsegsize = MCLBYTES; + if (sc->flags & FXP_FLAG_EXT_RFA) { sc->maxtxseg--; + sc->maxsegsize = FXP_TSO_SEGSIZE; + } error = bus_dma_tag_create(bus_get_dma_tag(dev), 2, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, - MCLBYTES * sc->maxtxseg, sc->maxtxseg, MCLBYTES, 0, + sc->maxsegsize * sc->maxtxseg + sizeof(struct ether_vlan_header), + sc->maxtxseg, sc->maxsegsize, 0, busdma_lock_mutex, &Giant, &sc->fxp_mtag); if (error) { device_printf(dev, "could not allocate dma tag\n"); @@ -712,10 +727,11 @@ device_printf(dev, "can't create DMA map for RX\n"); goto fail; } - if (fxp_add_rfabuf(sc, rxp, NULL) != 0) { + if (fxp_new_rfabuf(sc, rxp) != 0) { error = ENOMEM; goto fail; } + fxp_add_rfabuf(sc, rxp); } /* @@ -768,11 +784,16 @@ ifp->if_capabilities = ifp->if_capenable = 0; - /* Enable checksum offload for 82550 or better chips */ + /* Enable checksum offload/TSO for 82550 or better chips */ if (sc->flags & FXP_FLAG_EXT_RFA) { - ifp->if_hwassist = FXP_CSUM_FEATURES; - ifp->if_capabilities |= IFCAP_HWCSUM; - ifp->if_capenable |= IFCAP_HWCSUM; + ifp->if_hwassist = FXP_CSUM_FEATURES | CSUM_TSO; + ifp->if_capabilities |= IFCAP_HWCSUM | IFCAP_TSO4; + ifp->if_capenable |= IFCAP_HWCSUM | IFCAP_TSO4; + } + + if (sc->flags & FXP_FLAG_82559_RXCSUM) { + ifp->if_capabilities |= IFCAP_RXCSUM; + ifp->if_capenable |= IFCAP_RXCSUM; } #ifdef DEVICE_POLLING @@ -1258,12 +1279,15 @@ struct mbuf *m; struct fxp_tx *txp; struct fxp_cb_tx *cbp; + struct tcphdr *tcp; bus_dma_segment_t segs[FXP_NTXSEG]; - int error, i, nseg; + int error, i, nseg, tcp_payload; FXP_LOCK_ASSERT(sc, MA_OWNED); ifp = sc->ifp; + tcp_payload = 0; + tcp = NULL; /* * Get pointer to next available tx desc. */ @@ -1341,6 +1365,75 @@ #endif } + if (m->m_pkthdr.csum_flags & CSUM_TSO) { + /* + * 82550/82551 requires ethernet/IP/TCP headers must be + * contained in the first active transmit buffer. + */ + struct ether_header *eh; + struct ip *ip; + uint32_t ip_off, poff; + + if (M_WRITABLE(*m_head) == 0) { + /* Get a writable copy. */ + m = m_dup(*m_head, M_DONTWAIT); + m_freem(*m_head); + if (m == NULL) { + *m_head = NULL; + return (ENOBUFS); + } + *m_head = m; + } + ip_off = sizeof(struct ether_header); + m = m_pullup(*m_head, ip_off); + if (m == NULL) { + *m_head = NULL; + return (ENOBUFS); + } + eh = mtod(m, struct ether_header *); + /* Check the existence of VLAN tag. */ + if (eh->ether_type == htons(ETHERTYPE_VLAN)) { + ip_off = sizeof(struct ether_vlan_header); + m = m_pullup(m, ip_off); + if (m == NULL) { + *m_head = NULL; + return (ENOBUFS); + } + } + m = m_pullup(m, ip_off + sizeof(struct ip)); + if (m == NULL) { + *m_head = NULL; + return (ENOBUFS); + } + ip = (struct ip *)(mtod(m, char *) + ip_off); + poff = ip_off + (ip->ip_hl << 2); + m = m_pullup(m, poff + sizeof(struct tcphdr)); + if (m == NULL) { + *m_head = NULL; + return (ENOBUFS); + } + tcp = (struct tcphdr *)(mtod(m, char *) + poff); + m = m_pullup(m, poff + sizeof(struct tcphdr) + tcp->th_off); + if (m == NULL) { + *m_head = NULL; + return (ENOBUFS); + } + + /* + * Since 82550/82551 doesn't modify IP length and pseudo + * checksum in the first frame driver should compute it. + */ + ip->ip_sum = 0; + ip->ip_len = htons(ifp->if_mtu); + tcp->th_sum = in_pseudo(ip->ip_src.s_addr, ip->ip_dst.s_addr, + htons(IPPROTO_TCP + (tcp->th_off << 2) + + m->m_pkthdr.tso_segsz)); + /* Compute total TCP payload. */ + tcp_payload = m->m_pkthdr.len - ip_off - (ip->ip_hl << 2); + tcp_payload -= tcp->th_off << 2; + *m_head = m; + } + error = bus_dmamap_load_mbuf_sg(sc->fxp_mtag, txp->tx_map, *m_head, segs, &nseg, 0); if (error == EFBIG) { @@ -1371,7 +1464,6 @@ cbp = txp->tx_cb; for (i = 0; i < nseg; i++) { - KASSERT(segs[i].ds_len <= MCLBYTES, ("segment size too large")); /* * If this is an 82550/82551, then we're using extended * TxCBs _and_ we're using checksum offload. This means @@ -1386,14 +1478,28 @@ * the chip is an 82550/82551 or not. */ if (sc->flags & FXP_FLAG_EXT_RFA) { - cbp->tbd[i + 1].tb_addr = htole32(segs[i].ds_addr); - cbp->tbd[i + 1].tb_size = htole32(segs[i].ds_len); + cbp->tbd[i + 2].tb_addr = htole32(segs[i].ds_addr); + cbp->tbd[i + 2].tb_size = htole32(segs[i].ds_len); } else { cbp->tbd[i].tb_addr = htole32(segs[i].ds_addr); cbp->tbd[i].tb_size = htole32(segs[i].ds_len); } } - cbp->tbd_number = nseg; + if (sc->flags & FXP_FLAG_EXT_RFA) { + /* Configure dynamic TBD for 82550/82551. */ + cbp->tbd_number = 0xFF; + cbp->tbd[nseg + 1].tb_size |= htole32(0x8000); + } else + cbp->tbd_number = nseg; + /* Configure TSO. */ + if (m->m_pkthdr.csum_flags & CSUM_TSO) { + cbp->tbd[-1].tb_size = htole32(m->m_pkthdr.tso_segsz << 16); + cbp->tbd[1].tb_size = htole32(tcp_payload << 16); + cbp->ipcb_ip_schedule |= FXP_IPCB_LARGESEND_ENABLE | + FXP_IPCB_IP_CHECKSUM_ENABLE | + FXP_IPCB_TCP_PACKET | + FXP_IPCB_TCPUDP_CHECKSUM_ENABLE; + } txp->tx_mbuf = m; txp->tx_cb->cb_status = 0; @@ -1406,7 +1512,8 @@ txp->tx_cb->cb_command = htole16(sc->tx_cmd | FXP_CB_COMMAND_SF | FXP_CB_COMMAND_S | FXP_CB_COMMAND_I); - txp->tx_cb->tx_threshold = tx_threshold; + if ((m->m_pkthdr.csum_flags & CSUM_TSO) == 0) + txp->tx_cb->tx_threshold = tx_threshold; /* * Advance the end of list forward. @@ -1553,6 +1660,84 @@ } static void +fxp_rxcsum(struct fxp_softc *sc, struct ifnet *ifp, struct mbuf *m, + uint16_t status, int pos) +{ + struct ether_header *eh; + struct ip *ip; + struct udphdr *uh; + int32_t hlen, len, pktlen, temp32; + uint16_t csum, *opts; + + if ((sc->flags & FXP_FLAG_82559_RXCSUM) == 0) { + if ((status & FXP_RFA_STATUS_PARSE) != 0) { + if (status & FXP_RFDX_CS_IP_CSUM_BIT_VALID) + m->m_pkthdr.csum_flags |= CSUM_IP_CHECKED; + if (status & FXP_RFDX_CS_IP_CSUM_VALID) + m->m_pkthdr.csum_flags |= CSUM_IP_VALID; + if ((status & FXP_RFDX_CS_TCPUDP_CSUM_BIT_VALID) && + (status & FXP_RFDX_CS_TCPUDP_CSUM_VALID)) { + m->m_pkthdr.csum_flags |= CSUM_DATA_VALID | + CSUM_PSEUDO_HDR; + m->m_pkthdr.csum_data = 0xffff; + } + } + return; + } + + pktlen = m->m_pkthdr.len; + if (pktlen < sizeof(struct ether_header) + sizeof(struct ip)) + return; + eh = mtod(m, struct ether_header *); + if (eh->ether_type != htons(ETHERTYPE_IP)) + return; + ip = (struct ip *)(eh + 1); + if (ip->ip_v != IPVERSION) + return; + + hlen = ip->ip_hl << 2; + pktlen -= sizeof(struct ether_header); + if (hlen < sizeof(struct ip)) + return; + if (ntohs(ip->ip_len) < hlen) + return; + if (ntohs(ip->ip_len) != pktlen) + return; + if (ip->ip_off & htons(IP_MF | IP_OFFMASK)) + return; /* can't handle fragmented packet */ + + switch (ip->ip_p) { + case IPPROTO_TCP: + if (pktlen < (hlen + sizeof(struct tcphdr))) + return; + break; + case IPPROTO_UDP: + if (pktlen < (hlen + sizeof(struct udphdr))) + return; + uh = (struct udphdr *)((caddr_t)ip + hlen); + if (uh->uh_sum == 0) + return; /* no checksum */ + break; + default: + return; + } + /* Extract computed checksum. */ + csum = be16dec(mtod(m, char *) + pos); + /* checksum fixup for IP options */ + len = hlen - sizeof(struct ip); + if (len > 0) { + opts = (uint16_t *)(ip + 1); + for (; len > 0; len -= sizeof(uint16_t), opts++) { + temp32 = csum - *opts; + temp32 = (temp32 >> 16) + (temp32 & 65535); + csum = temp32 & 65535; + } + } + m->m_pkthdr.csum_flags |= CSUM_DATA_VALID; + m->m_pkthdr.csum_data = csum; +} + +static void fxp_intr_body(struct fxp_softc *sc, struct ifnet *ifp, uint8_t statack, int count) { @@ -1560,7 +1745,6 @@ struct fxp_rx *rxp; struct fxp_rfa *rfa; int rnr = (statack & FXP_SCB_STATACK_RNR) ? 1 : 0; - int fxp_rc = 0; uint16_t status; FXP_LOCK_ASSERT(sc, MA_OWNED); @@ -1647,8 +1831,7 @@ * If this fails, the old buffer is recycled * instead. */ - fxp_rc = fxp_add_rfabuf(sc, rxp, m); - if (fxp_rc == 0) { + if (fxp_new_rfabuf(sc, rxp) == 0) { int total_len; /* @@ -1658,6 +1841,11 @@ * of bogus length or CRC errors. */ total_len = le16toh(rfa->actual_size) & 0x3fff; + if ((sc->flags & FXP_FLAG_82559_RXCSUM) != 0 && + (ifp->if_capenable & IFCAP_RXCSUM) != 0) { + /* Adjust for appended checksum bytes. */ + total_len -= 2; + } if (total_len < sizeof(struct ether_header) || total_len > MCLBYTES - RFA_ALIGNMENT_FUDGE - sc->rfa_size || status & FXP_RFA_STATUS_CRC) { @@ -1665,30 +1853,12 @@ continue; } - /* Do IP checksum checking. */ - if ((ifp->if_capenable & IFCAP_RXCSUM) != 0 && - (status & FXP_RFA_STATUS_PARSE)) { - if (rfa->rfax_csum_sts & - FXP_RFDX_CS_IP_CSUM_BIT_VALID) - m->m_pkthdr.csum_flags |= - CSUM_IP_CHECKED; - if (rfa->rfax_csum_sts & - FXP_RFDX_CS_IP_CSUM_VALID) - m->m_pkthdr.csum_flags |= - CSUM_IP_VALID; - if ((rfa->rfax_csum_sts & - FXP_RFDX_CS_TCPUDP_CSUM_BIT_VALID) && - (rfa->rfax_csum_sts & - FXP_RFDX_CS_TCPUDP_CSUM_VALID)) { - m->m_pkthdr.csum_flags |= - CSUM_DATA_VALID|CSUM_PSEUDO_HDR; - m->m_pkthdr.csum_data = 0xffff; - } - } - m->m_pkthdr.len = m->m_len = total_len; m->m_pkthdr.rcvif = ifp; + /* Do IP checksum checking. */ + if ((ifp->if_capenable & IFCAP_RXCSUM) != 0) + fxp_rxcsum(sc, ifp, m, status, total_len); /* * Drop locks before calling if_input() since it * may re-enter fxp_start() in the netisr case. @@ -1700,10 +1870,12 @@ FXP_UNLOCK(sc); (*ifp->if_input)(ifp, m); FXP_LOCK(sc); - } else if (fxp_rc == ENOBUFS) { - rnr = 0; - break; + } else { + /* Reuse RFA and loaded DMA map. */ + ifp->if_iqdrops++; + fxp_discard_rfabuf(sc, rxp); } + fxp_add_rfabuf(sc, rxp); } if (rnr) { fxp_scb_wait(sc); @@ -2015,11 +2187,12 @@ cbp->disc_short_rx = !prm; /* discard short packets */ cbp->underrun_retry = 1; /* retry mode (once) on DMA underrun */ cbp->two_frames = 0; /* do not limit FIFO to 2 frames */ - cbp->dyn_tbd = 0; /* (no) dynamic TBD mode */ + cbp->dyn_tbd = sc->flags & FXP_FLAG_EXT_RFA ? 1 : 0; cbp->ext_rfa = sc->flags & FXP_FLAG_EXT_RFA ? 1 : 0; cbp->mediatype = sc->flags & FXP_FLAG_SERIAL_MEDIA ? 0 : 1; cbp->csma_dis = 0; /* (don't) disable link */ - cbp->tcp_udp_cksum = 0; /* (don't) enable checksum */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Nov 26 22:49:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DCD801065673; Wed, 26 Nov 2008 22:49:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 69C871065670 for ; Wed, 26 Nov 2008 22:49:47 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4BB748FC0C for ; Wed, 26 Nov 2008 22:49:47 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAQMnlpR005427 for ; Wed, 26 Nov 2008 22:49:47 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAQMnl07005425 for perforce@freebsd.org; Wed, 26 Nov 2008 22:49:47 GMT (envelope-from zec@tel.fer.hr) Date: Wed, 26 Nov 2008 22:49:47 GMT Message-Id: <200811262249.mAQMnl07005425@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153636 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, 26 Nov 2008 22:49:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=153636 Change 153636 by zec@zec_tca51 on 2008/11/26 22:49:41 IFC @ 153631 Affected files ... .. //depot/projects/vimage/src/sys/amd64/amd64/amd64_mem.c#3 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/identcpu.c#11 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/initcpu.c#3 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/local_apic.c#13 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/mp_machdep.c#12 integrate .. //depot/projects/vimage/src/sys/amd64/amd64/msi.c#6 integrate .. //depot/projects/vimage/src/sys/amd64/include/cputypes.h#2 integrate .. //depot/projects/vimage/src/sys/amd64/include/md_var.h#5 integrate .. //depot/projects/vimage/src/sys/amd64/include/specialreg.h#11 integrate .. //depot/projects/vimage/src/sys/boot/i386/boot0/boot0.S#3 integrate .. //depot/projects/vimage/src/sys/compat/linux/linux_ipc.c#4 integrate .. //depot/projects/vimage/src/sys/dev/coretemp/coretemp.c#5 integrate .. //depot/projects/vimage/src/sys/dev/fxp/if_fxp.c#7 integrate .. //depot/projects/vimage/src/sys/dev/fxp/if_fxpreg.h#3 integrate .. //depot/projects/vimage/src/sys/dev/fxp/if_fxpvar.h#3 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_intel.c#2 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_piv.c#7 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_ppro.c#7 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_x86.c#7 integrate .. //depot/projects/vimage/src/sys/dev/patm/if_patm_intr.c#2 integrate .. //depot/projects/vimage/src/sys/dev/usb/u3g.c#6 integrate .. //depot/projects/vimage/src/sys/dev/usb/usbdevs#36 integrate .. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_rrip.c#10 integrate .. //depot/projects/vimage/src/sys/fs/nullfs/null_vnops.c#9 integrate .. //depot/projects/vimage/src/sys/geom/part/g_part_bsd.c#7 integrate .. //depot/projects/vimage/src/sys/i386/cpufreq/est.c#8 integrate .. //depot/projects/vimage/src/sys/i386/cpufreq/p4tcc.c#4 integrate .. //depot/projects/vimage/src/sys/i386/cpufreq/powernow.c#6 integrate .. //depot/projects/vimage/src/sys/i386/i386/i686_mem.c#3 integrate .. //depot/projects/vimage/src/sys/i386/i386/identcpu.c#13 integrate .. //depot/projects/vimage/src/sys/i386/i386/initcpu.c#5 integrate .. //depot/projects/vimage/src/sys/i386/i386/k6_mem.c#3 integrate .. //depot/projects/vimage/src/sys/i386/i386/local_apic.c#13 integrate .. //depot/projects/vimage/src/sys/i386/i386/longrun.c#2 integrate .. //depot/projects/vimage/src/sys/i386/i386/mp_machdep.c#13 integrate .. //depot/projects/vimage/src/sys/i386/i386/msi.c#6 integrate .. //depot/projects/vimage/src/sys/i386/include/cputypes.h#2 integrate .. //depot/projects/vimage/src/sys/i386/include/md_var.h#3 integrate .. //depot/projects/vimage/src/sys/i386/include/specialreg.h#11 integrate .. //depot/projects/vimage/src/sys/kern/kern_poll.c#12 integrate .. //depot/projects/vimage/src/sys/kern/kern_sysctl.c#14 integrate .. //depot/projects/vimage/src/sys/net/bpf.c#29 integrate .. //depot/projects/vimage/src/sys/net/if.c#52 integrate .. //depot/projects/vimage/src/sys/net/if_loop.c#32 integrate .. //depot/projects/vimage/src/sys/net/route.c#35 integrate .. //depot/projects/vimage/src/sys/netinet/if_ether.c#29 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#41 integrate .. //depot/projects/vimage/src/sys/netinet/in_rmx.c#24 integrate .. //depot/projects/vimage/src/sys/netinet/ip_divert.c#22 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw_pfil.c#14 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_input.c#46 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#62 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#48 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_timewait.c#22 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_usrreq.c#26 integrate .. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#41 integrate .. //depot/projects/vimage/src/sys/netinet/vinet.h#36 integrate .. //depot/projects/vimage/src/sys/netinet6/icmp6.c#35 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#28 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_pcb.c#26 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_pcb.h#5 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_proto.c#35 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_rmx.c#24 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_src.c#29 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6_nbr.c#28 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#24 integrate .. //depot/projects/vimage/src/sys/netinet6/raw_ip6.c#30 integrate .. //depot/projects/vimage/src/sys/netinet6/udp6_usrreq.c#34 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec.c#32 integrate .. //depot/projects/vimage/src/sys/netipsec/key.c#32 integrate .. //depot/projects/vimage/src/sys/netipsec/keysock.c#21 integrate .. //depot/projects/vimage/src/sys/netipsec/vipsec.h#19 integrate Differences ... ==== //depot/projects/vimage/src/sys/amd64/amd64/amd64_mem.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.29 2008/03/12 22:09:19 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.30 2008/11/26 19:25:13 jkim Exp $"); #include #include @@ -35,6 +35,7 @@ #include #include +#include #include #include @@ -677,8 +678,8 @@ return; if ((cpu_id & 0xf00) != 0x600 && (cpu_id & 0xf00) != 0xf00) return; - if ((strcmp(cpu_vendor, "GenuineIntel") != 0) && - (strcmp(cpu_vendor, "AuthenticAMD") != 0)) + if (cpu_vendor_id != CPU_VENDOR_INTEL && + cpu_vendor_id != CPU_VENDOR_AMD) return; mem_range_softc.mr_op = &amd64_mrops; } ==== //depot/projects/vimage/src/sys/amd64/amd64/identcpu.c#11 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.164 2008/10/22 17:30:37 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.166 2008/11/26 19:29:33 jkim Exp $"); #include "opt_cpu.h" @@ -69,6 +69,7 @@ void earlysetcpuclass(void); void panicifcpuunsupported(void); +static u_int find_cpu_vendor_id(void); static void print_AMD_info(void); static void print_AMD_assoc(int i); @@ -95,6 +96,14 @@ { "Sledgehammer", CPUCLASS_K8 }, /* CPU_SLEDGEHAMMER */ }; +static struct { + char *vendor; + u_int vendor_id; +} cpu_vendors[] = { + { INTEL_VENDOR_ID, CPU_VENDOR_INTEL }, /* GenuineIntel */ + { AMD_VENDOR_ID, CPU_VENDOR_AMD }, /* AuthenticAMD */ +}; + int cpu_cores; int cpu_logical; @@ -122,10 +131,10 @@ } } - if (strcmp(cpu_vendor, "GenuineIntel") == 0) { + if (cpu_vendor_id == CPU_VENDOR_INTEL) { /* Please make up your mind folks! */ strcat(cpu_model, "EM64T"); - } else if (strcmp(cpu_vendor, "AuthenticAMD") == 0) { + } else if (cpu_vendor_id == CPU_VENDOR_AMD) { /* * Values taken from AMD Processor Recognition * http://www.amd.com/K6/k6docs/pdf/20734g.pdf @@ -165,13 +174,13 @@ printf("Unknown"); /* will panic below... */ } printf("-class CPU)\n"); - if(*cpu_vendor) - printf(" Origin = \"%s\"",cpu_vendor); - if(cpu_id) + if (*cpu_vendor) + printf(" Origin = \"%s\"", cpu_vendor); + if (cpu_id) printf(" Id = 0x%x", cpu_id); - if (strcmp(cpu_vendor, "GenuineIntel") == 0 || - strcmp(cpu_vendor, "AuthenticAMD") == 0) { + if (cpu_vendor_id == CPU_VENDOR_INTEL || + cpu_vendor_id == CPU_VENDOR_AMD) { printf(" Stepping = %u", cpu_id & 0xf); if (cpu_high > 0) { u_int cmp = 1, htt = 1; @@ -343,22 +352,28 @@ ); } - if (cpu_feature & CPUID_HTT && strcmp(cpu_vendor, - "AuthenticAMD") == 0) + if ((cpu_feature & CPUID_HTT) && + cpu_vendor_id == CPU_VENDOR_AMD) cpu_feature &= ~CPUID_HTT; /* * If this CPU supports P-state invariant TSC then * mention the capability. */ - if (!tsc_is_invariant && - (strcmp(cpu_vendor, "AuthenticAMD") == 0 && - ((amd_pminfo & AMDPM_TSC_INVARIANT) != 0 || - AMD64_CPU_FAMILY(cpu_id) >= 0x10 || - cpu_id == 0x60fb2))) { - tsc_is_invariant = 1; + switch (cpu_vendor_id) { + case CPU_VENDOR_AMD: + if ((amd_pminfo & AMDPM_TSC_INVARIANT) || + AMD64_CPU_FAMILY(cpu_id) >= 0x10 || + cpu_id == 0x60fb2) + tsc_is_invariant = 1; + break; + case CPU_VENDOR_INTEL: + if (amd_pminfo & AMDPM_TSC_INVARIANT) + tsc_is_invariant = 1; + break; + } + if (tsc_is_invariant) printf("\n TSC: P-state invariant"); - } /* * If this CPU supports HTT or CMP then mention the @@ -366,10 +381,10 @@ */ if (cpu_feature & CPUID_HTT) htt = (cpu_procinfo & CPUID_HTT_CORES) >> 16; - if (strcmp(cpu_vendor, "AuthenticAMD") == 0 && + if (cpu_vendor_id == CPU_VENDOR_AMD && (amd_feature2 & AMDID2_CMP)) cmp = (cpu_procinfo2 & AMDID_CMP_CORES) + 1; - else if (strcmp(cpu_vendor, "GenuineIntel") == 0 && + else if (cpu_vendor_id == CPU_VENDOR_INTEL && (cpu_high >= 4)) { cpuid_count(4, 0, regs); if ((regs[0] & 0x1f) != 0) @@ -391,7 +406,7 @@ if (!bootverbose) return; - if (strcmp(cpu_vendor, "AuthenticAMD") == 0) + if (cpu_vendor_id == CPU_VENDOR_AMD) print_AMD_info(); } @@ -450,6 +465,7 @@ ((u_int *)&cpu_vendor)[1] = regs[3]; ((u_int *)&cpu_vendor)[2] = regs[2]; cpu_vendor[12] = '\0'; + cpu_vendor_id = find_cpu_vendor_id(); do_cpuid(1, regs); cpu_id = regs[0]; @@ -457,8 +473,8 @@ cpu_feature = regs[3]; cpu_feature2 = regs[2]; - if (strcmp(cpu_vendor, "GenuineIntel") == 0 || - strcmp(cpu_vendor, "AuthenticAMD") == 0) { + if (cpu_vendor_id == CPU_VENDOR_INTEL || + cpu_vendor_id == CPU_VENDOR_AMD) { do_cpuid(0x80000000, regs); cpu_exthigh = regs[0]; } @@ -480,6 +496,17 @@ cpu = CPU_CLAWHAMMER; } +static u_int +find_cpu_vendor_id(void) +{ + int i; + + for (i = 0; i < sizeof(cpu_vendors) / sizeof(cpu_vendors[0]); i++) + if (strcmp(cpu_vendor, cpu_vendors[i].vendor) == 0) + return (cpu_vendors[i].vendor_id); + return (0); +} + static void print_AMD_assoc(int i) { ==== //depot/projects/vimage/src/sys/amd64/amd64/initcpu.c#3 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.51 2008/10/21 00:17:55 jkim Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/initcpu.c,v 1.52 2008/11/26 19:25:13 jkim Exp $"); #include "opt_cpu.h" @@ -60,6 +60,7 @@ u_int cpu_procinfo; /* HyperThreading Info / Brand Index / CLFUSH */ u_int cpu_procinfo2; /* Multicore info */ char cpu_vendor[20]; /* CPU Origin code */ +u_int cpu_vendor_id; /* CPU vendor ID */ u_int cpu_fxsr; /* SSE enabled */ u_int cpu_mxcsr_mask; /* Valid bits in mxcsr */ ==== //depot/projects/vimage/src/sys/amd64/amd64/local_apic.c#13 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.48 2008/10/27 21:45:18 sobomax Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.49 2008/11/26 19:25:13 jkim Exp $"); #include "opt_hwpmc_hooks.h" #include "opt_kdtrace.h" @@ -323,7 +323,7 @@ /* XXX: Error and thermal LVTs */ - if (strcmp(cpu_vendor, "AuthenticAMD") == 0) { + if (cpu_vendor_id == CPU_VENDOR_AMD) { /* * Detect the presence of C1E capability mostly on latest * dual-cores (or future) k8 family. This feature renders ==== //depot/projects/vimage/src/sys/amd64/amd64/mp_machdep.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.294 2008/09/28 18:34:14 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.295 2008/11/26 19:25:13 jkim Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -57,6 +57,7 @@ #include #include +#include #include #include #include @@ -374,8 +375,7 @@ * First determine if this is an Intel processor which claims * to have hyperthreading support. */ - if ((cpu_feature & CPUID_HTT) && - (strcmp(cpu_vendor, "GenuineIntel") == 0)) { + if ((cpu_feature & CPUID_HTT) && cpu_vendor_id == CPU_VENDOR_INTEL) { /* * If the "deterministic cache parameters" cpuid calls * are available, use them. ==== //depot/projects/vimage/src/sys/amd64/amd64/msi.c#6 (text+ko) ==== @@ -35,7 +35,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.7 2007/10/24 21:16:22 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.8 2008/11/26 19:25:13 jkim Exp $"); #include #include @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -211,8 +212,8 @@ { /* Check if we have a supported CPU. */ - if (!(strcmp(cpu_vendor, "GenuineIntel") == 0 || - strcmp(cpu_vendor, "AuthenticAMD") == 0)) + if (!(cpu_vendor_id == CPU_VENDOR_INTEL || + cpu_vendor_id == CPU_VENDOR_AMD)) return; msi_enabled = 1; ==== //depot/projects/vimage/src/sys/amd64/include/cputypes.h#2 (text+ko) ==== @@ -24,7 +24,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/sys/amd64/include/cputypes.h,v 1.19 2005/01/05 20:17:20 imp Exp $ + * $FreeBSD: src/sys/amd64/include/cputypes.h,v 1.20 2008/11/26 19:25:13 jkim Exp $ */ #ifndef _MACHINE_CPUTYPES_H_ @@ -33,15 +33,21 @@ /* * Classes of processor. */ -#define CPUCLASS_X86 0 /* X86 */ -#define CPUCLASS_K8 1 /* K8 AMD64 class */ +#define CPUCLASS_X86 0 /* X86 */ +#define CPUCLASS_K8 1 /* K8 AMD64 class */ /* * Kinds of processor. */ -#define CPU_X86 0 /* Intel */ -#define CPU_CLAWHAMMER 1 /* AMD Clawhammer */ -#define CPU_SLEDGEHAMMER 2 /* AMD Sledgehammer */ +#define CPU_X86 0 /* Intel */ +#define CPU_CLAWHAMMER 1 /* AMD Clawhammer */ +#define CPU_SLEDGEHAMMER 2 /* AMD Sledgehammer */ + +/* + * Vendors of processor. + */ +#define CPU_VENDOR_AMD 0x1022 /* AMD */ +#define CPU_VENDOR_INTEL 0x8086 /* Intel */ #ifndef LOCORE extern int cpu; ==== //depot/projects/vimage/src/sys/amd64/include/md_var.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/amd64/include/md_var.h,v 1.82 2008/10/21 00:17:55 jkim Exp $ + * $FreeBSD: src/sys/amd64/include/md_var.h,v 1.83 2008/11/26 19:25:13 jkim Exp $ */ #ifndef _MACHINE_MD_VAR_H_ @@ -52,6 +52,7 @@ extern u_int cpu_procinfo; extern u_int cpu_procinfo2; extern char cpu_vendor[]; +extern u_int cpu_vendor_id; extern char kstack[]; extern char sigcode[]; extern int szsigcode; ==== //depot/projects/vimage/src/sys/amd64/include/specialreg.h#11 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.49 2008/10/22 17:36:52 jkim Exp $ + * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.50 2008/11/26 19:25:13 jkim Exp $ */ #ifndef _MACHINE_SPECIALREG_H_ @@ -196,8 +196,8 @@ /* * CPUID manufacturers identifiers */ -#define INTEL_VENDOR_ID "GenuineIntel" -#define AMD_VENDOR_ID "AuthenticAMD" +#define AMD_VENDOR_ID "AuthenticAMD" +#define INTEL_VENDOR_ID "GenuineIntel" /* * Model-specific registers for the i386 family ==== //depot/projects/vimage/src/sys/boot/i386/boot0/boot0.S#3 (text+ko) ==== @@ -13,7 +13,7 @@ * warranties of merchantability and fitness for a particular * purpose. * - * $FreeBSD: src/sys/boot/i386/boot0/boot0.S,v 1.16 2007/03/26 21:56:13 thomas Exp $ + * $FreeBSD: src/sys/boot/i386/boot0/boot0.S,v 1.18 2008/11/26 21:38:43 luigi Exp $ */ /* A 512-byte boot manager. */ @@ -319,8 +319,9 @@ jc main.10 # If error cmpw $MAGIC,0x1fe(%bx) # Bootable? jne main.10 # No - movw $crlf,%si # Leave some - callw puts # space + pushw %si # Save ptr to selected part. + callw putn # Leave some space + popw %si # Restore, next stage uses it jmp *%bx # Invoke bootstrap /* ==== //depot/projects/vimage/src/sys/compat/linux/linux_ipc.c#4 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ipc.c,v 1.54 2007/01/14 16:34:43 netchild Exp $"); +__FBSDID("$FreeBSD: src/sys/compat/linux/linux_ipc.c,v 1.55 2008/11/26 16:38:43 rdivacky Exp $"); #include #include @@ -672,6 +672,14 @@ return (error); } +/* + * TODO: implement this + * case LINUX_MSG_STAT: + */ + case LINUX_IPC_STAT: + /* NOTHING */ + break; + case LINUX_IPC_SET: error = linux_msqid_pullup(args->cmd & LINUX_IPC_64, &linux_msqid, PTRIN(args->buf)); @@ -679,6 +687,14 @@ return (error); linux_to_bsd_msqid_ds(&linux_msqid, &bsd_msqid); break; + + case LINUX_IPC_RMID: + /* NOTHING */ + break; + + default: + return (EINVAL); + break; } error = kern_msgctl(td, args->msqid, bsd_cmd, &bsd_msqid); ==== //depot/projects/vimage/src/sys/dev/coretemp/coretemp.c#5 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/coretemp/coretemp.c,v 1.8 2008/05/14 10:02:25 rpaulo Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/coretemp/coretemp.c,v 1.9 2008/11/26 19:25:13 jkim Exp $"); #include #include @@ -45,6 +45,7 @@ #include #include +#include #include struct coretemp_softc { @@ -94,7 +95,7 @@ return; /* Check that CPUID 0x06 is supported and the vendor is Intel.*/ - if (cpu_high < 6 || strcmp(cpu_vendor, "GenuineIntel")) + if (cpu_high < 6 || cpu_vendor_id != CPU_VENDOR_INTEL) return; /* * CPUID 0x06 returns 1 if the processor has on-die thermal ==== //depot/projects/vimage/src/sys/dev/fxp/if_fxp.c#7 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.274 2008/11/25 04:33:02 yongari Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fxp/if_fxp.c,v 1.277 2008/11/26 07:36:17 yongari Exp $"); /* * Intel EtherExpress Pro/100B PCI Fast Ethernet driver @@ -59,15 +59,15 @@ #include #include -#include -#include - -#ifdef FXP_IP_CSUM_WAR #include #include #include +#include +#include + +#include #include -#endif +#include #include #include /* for PCIM_CMD_xxx */ @@ -213,6 +213,8 @@ static int fxp_resume(device_t dev); static void fxp_intr(void *xsc); +static void fxp_rxcsum(struct fxp_softc *sc, struct ifnet *ifp, + struct mbuf *m, uint16_t status, int pos); static void fxp_intr_body(struct fxp_softc *sc, struct ifnet *ifp, uint8_t statack, int count); static void fxp_init(void *xsc); @@ -227,8 +229,12 @@ static int fxp_ioctl(struct ifnet *ifp, u_long command, caddr_t data); static void fxp_watchdog(struct fxp_softc *sc); -static int fxp_add_rfabuf(struct fxp_softc *sc, - struct fxp_rx *rxp, struct mbuf *oldm); +static void fxp_add_rfabuf(struct fxp_softc *sc, + struct fxp_rx *rxp); +static void fxp_discard_rfabuf(struct fxp_softc *sc, + struct fxp_rx *rxp); +static int fxp_new_rfabuf(struct fxp_softc *sc, + struct fxp_rx *rxp); static int fxp_mc_addrs(struct fxp_softc *sc); static void fxp_mc_setup(struct fxp_softc *sc); static uint16_t fxp_eeprom_getword(struct fxp_softc *sc, int offset, @@ -587,6 +593,9 @@ sc->flags |= FXP_FLAG_SAVE_BAD; } + /* For 82559 or later chips, Rx checksum offload is supported. */ + if (sc->revision >= FXP_REV_82559_A0) + sc->flags |= FXP_FLAG_82559_RXCSUM; /* * Enable use of extended RFDs and TCBs for 82550 * and later chips. Note: we need extended TXCB support @@ -599,6 +608,8 @@ sc->rfa_size = sizeof (struct fxp_rfa); sc->tx_cmd = FXP_CB_COMMAND_IPCBXMIT; sc->flags |= FXP_FLAG_EXT_RFA; + /* Use extended RFA instead of 82559 checksum mode. */ + sc->flags &= ~FXP_FLAG_82559_RXCSUM; } else { sc->rfa_size = sizeof (struct fxp_rfa) - FXP_RFAX_LEN; sc->tx_cmd = FXP_CB_COMMAND_XMIT; @@ -608,11 +619,15 @@ * Allocate DMA tags and DMA safe memory. */ sc->maxtxseg = FXP_NTXSEG; - if (sc->flags & FXP_FLAG_EXT_RFA) + sc->maxsegsize = MCLBYTES; + if (sc->flags & FXP_FLAG_EXT_RFA) { sc->maxtxseg--; + sc->maxsegsize = FXP_TSO_SEGSIZE; + } error = bus_dma_tag_create(bus_get_dma_tag(dev), 2, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, - MCLBYTES * sc->maxtxseg, sc->maxtxseg, MCLBYTES, 0, + sc->maxsegsize * sc->maxtxseg + sizeof(struct ether_vlan_header), + sc->maxtxseg, sc->maxsegsize, 0, busdma_lock_mutex, &Giant, &sc->fxp_mtag); if (error) { device_printf(dev, "could not allocate dma tag\n"); @@ -712,10 +727,11 @@ device_printf(dev, "can't create DMA map for RX\n"); goto fail; } - if (fxp_add_rfabuf(sc, rxp, NULL) != 0) { + if (fxp_new_rfabuf(sc, rxp) != 0) { error = ENOMEM; goto fail; } + fxp_add_rfabuf(sc, rxp); } /* @@ -768,11 +784,16 @@ ifp->if_capabilities = ifp->if_capenable = 0; - /* Enable checksum offload for 82550 or better chips */ + /* Enable checksum offload/TSO for 82550 or better chips */ if (sc->flags & FXP_FLAG_EXT_RFA) { - ifp->if_hwassist = FXP_CSUM_FEATURES; - ifp->if_capabilities |= IFCAP_HWCSUM; - ifp->if_capenable |= IFCAP_HWCSUM; + ifp->if_hwassist = FXP_CSUM_FEATURES | CSUM_TSO; + ifp->if_capabilities |= IFCAP_HWCSUM | IFCAP_TSO4; + ifp->if_capenable |= IFCAP_HWCSUM | IFCAP_TSO4; + } + + if (sc->flags & FXP_FLAG_82559_RXCSUM) { + ifp->if_capabilities |= IFCAP_RXCSUM; + ifp->if_capenable |= IFCAP_RXCSUM; } #ifdef DEVICE_POLLING @@ -1258,12 +1279,15 @@ struct mbuf *m; struct fxp_tx *txp; struct fxp_cb_tx *cbp; + struct tcphdr *tcp; bus_dma_segment_t segs[FXP_NTXSEG]; - int error, i, nseg; + int error, i, nseg, tcp_payload; FXP_LOCK_ASSERT(sc, MA_OWNED); ifp = sc->ifp; + tcp_payload = 0; + tcp = NULL; /* * Get pointer to next available tx desc. */ @@ -1341,6 +1365,75 @@ #endif } + if (m->m_pkthdr.csum_flags & CSUM_TSO) { + /* + * 82550/82551 requires ethernet/IP/TCP headers must be + * contained in the first active transmit buffer. + */ + struct ether_header *eh; + struct ip *ip; + uint32_t ip_off, poff; + + if (M_WRITABLE(*m_head) == 0) { + /* Get a writable copy. */ + m = m_dup(*m_head, M_DONTWAIT); + m_freem(*m_head); + if (m == NULL) { + *m_head = NULL; + return (ENOBUFS); + } + *m_head = m; + } + ip_off = sizeof(struct ether_header); + m = m_pullup(*m_head, ip_off); + if (m == NULL) { + *m_head = NULL; + return (ENOBUFS); + } + eh = mtod(m, struct ether_header *); + /* Check the existence of VLAN tag. */ + if (eh->ether_type == htons(ETHERTYPE_VLAN)) { + ip_off = sizeof(struct ether_vlan_header); + m = m_pullup(m, ip_off); + if (m == NULL) { + *m_head = NULL; + return (ENOBUFS); + } + } + m = m_pullup(m, ip_off + sizeof(struct ip)); + if (m == NULL) { + *m_head = NULL; + return (ENOBUFS); + } + ip = (struct ip *)(mtod(m, char *) + ip_off); + poff = ip_off + (ip->ip_hl << 2); + m = m_pullup(m, poff + sizeof(struct tcphdr)); + if (m == NULL) { + *m_head = NULL; + return (ENOBUFS); + } + tcp = (struct tcphdr *)(mtod(m, char *) + poff); + m = m_pullup(m, poff + sizeof(struct tcphdr) + tcp->th_off); + if (m == NULL) { + *m_head = NULL; + return (ENOBUFS); + } + + /* + * Since 82550/82551 doesn't modify IP length and pseudo + * checksum in the first frame driver should compute it. + */ + ip->ip_sum = 0; + ip->ip_len = htons(ifp->if_mtu); + tcp->th_sum = in_pseudo(ip->ip_src.s_addr, ip->ip_dst.s_addr, + htons(IPPROTO_TCP + (tcp->th_off << 2) + + m->m_pkthdr.tso_segsz)); + /* Compute total TCP payload. */ + tcp_payload = m->m_pkthdr.len - ip_off - (ip->ip_hl << 2); + tcp_payload -= tcp->th_off << 2; + *m_head = m; + } + error = bus_dmamap_load_mbuf_sg(sc->fxp_mtag, txp->tx_map, *m_head, segs, &nseg, 0); if (error == EFBIG) { @@ -1371,7 +1464,6 @@ cbp = txp->tx_cb; for (i = 0; i < nseg; i++) { - KASSERT(segs[i].ds_len <= MCLBYTES, ("segment size too large")); /* * If this is an 82550/82551, then we're using extended * TxCBs _and_ we're using checksum offload. This means @@ -1386,14 +1478,28 @@ * the chip is an 82550/82551 or not. */ if (sc->flags & FXP_FLAG_EXT_RFA) { - cbp->tbd[i + 1].tb_addr = htole32(segs[i].ds_addr); - cbp->tbd[i + 1].tb_size = htole32(segs[i].ds_len); + cbp->tbd[i + 2].tb_addr = htole32(segs[i].ds_addr); + cbp->tbd[i + 2].tb_size = htole32(segs[i].ds_len); } else { cbp->tbd[i].tb_addr = htole32(segs[i].ds_addr); cbp->tbd[i].tb_size = htole32(segs[i].ds_len); } } - cbp->tbd_number = nseg; + if (sc->flags & FXP_FLAG_EXT_RFA) { + /* Configure dynamic TBD for 82550/82551. */ + cbp->tbd_number = 0xFF; + cbp->tbd[nseg + 1].tb_size |= htole32(0x8000); + } else + cbp->tbd_number = nseg; + /* Configure TSO. */ + if (m->m_pkthdr.csum_flags & CSUM_TSO) { + cbp->tbd[-1].tb_size = htole32(m->m_pkthdr.tso_segsz << 16); + cbp->tbd[1].tb_size = htole32(tcp_payload << 16); + cbp->ipcb_ip_schedule |= FXP_IPCB_LARGESEND_ENABLE | + FXP_IPCB_IP_CHECKSUM_ENABLE | + FXP_IPCB_TCP_PACKET | + FXP_IPCB_TCPUDP_CHECKSUM_ENABLE; + } txp->tx_mbuf = m; txp->tx_cb->cb_status = 0; @@ -1406,7 +1512,8 @@ txp->tx_cb->cb_command = htole16(sc->tx_cmd | FXP_CB_COMMAND_SF | FXP_CB_COMMAND_S | FXP_CB_COMMAND_I); - txp->tx_cb->tx_threshold = tx_threshold; + if ((m->m_pkthdr.csum_flags & CSUM_TSO) == 0) + txp->tx_cb->tx_threshold = tx_threshold; /* * Advance the end of list forward. @@ -1553,6 +1660,84 @@ } static void +fxp_rxcsum(struct fxp_softc *sc, struct ifnet *ifp, struct mbuf *m, + uint16_t status, int pos) +{ + struct ether_header *eh; + struct ip *ip; + struct udphdr *uh; + int32_t hlen, len, pktlen, temp32; + uint16_t csum, *opts; + + if ((sc->flags & FXP_FLAG_82559_RXCSUM) == 0) { + if ((status & FXP_RFA_STATUS_PARSE) != 0) { + if (status & FXP_RFDX_CS_IP_CSUM_BIT_VALID) + m->m_pkthdr.csum_flags |= CSUM_IP_CHECKED; + if (status & FXP_RFDX_CS_IP_CSUM_VALID) + m->m_pkthdr.csum_flags |= CSUM_IP_VALID; + if ((status & FXP_RFDX_CS_TCPUDP_CSUM_BIT_VALID) && + (status & FXP_RFDX_CS_TCPUDP_CSUM_VALID)) { + m->m_pkthdr.csum_flags |= CSUM_DATA_VALID | + CSUM_PSEUDO_HDR; + m->m_pkthdr.csum_data = 0xffff; + } + } + return; + } + + pktlen = m->m_pkthdr.len; + if (pktlen < sizeof(struct ether_header) + sizeof(struct ip)) + return; + eh = mtod(m, struct ether_header *); + if (eh->ether_type != htons(ETHERTYPE_IP)) + return; + ip = (struct ip *)(eh + 1); + if (ip->ip_v != IPVERSION) + return; + + hlen = ip->ip_hl << 2; + pktlen -= sizeof(struct ether_header); + if (hlen < sizeof(struct ip)) + return; + if (ntohs(ip->ip_len) < hlen) + return; + if (ntohs(ip->ip_len) != pktlen) + return; + if (ip->ip_off & htons(IP_MF | IP_OFFMASK)) + return; /* can't handle fragmented packet */ + + switch (ip->ip_p) { + case IPPROTO_TCP: + if (pktlen < (hlen + sizeof(struct tcphdr))) + return; + break; + case IPPROTO_UDP: + if (pktlen < (hlen + sizeof(struct udphdr))) + return; + uh = (struct udphdr *)((caddr_t)ip + hlen); + if (uh->uh_sum == 0) + return; /* no checksum */ + break; + default: + return; + } + /* Extract computed checksum. */ + csum = be16dec(mtod(m, char *) + pos); + /* checksum fixup for IP options */ + len = hlen - sizeof(struct ip); + if (len > 0) { + opts = (uint16_t *)(ip + 1); + for (; len > 0; len -= sizeof(uint16_t), opts++) { + temp32 = csum - *opts; + temp32 = (temp32 >> 16) + (temp32 & 65535); + csum = temp32 & 65535; + } + } + m->m_pkthdr.csum_flags |= CSUM_DATA_VALID; + m->m_pkthdr.csum_data = csum; +} + +static void fxp_intr_body(struct fxp_softc *sc, struct ifnet *ifp, uint8_t statack, int count) { @@ -1560,7 +1745,6 @@ struct fxp_rx *rxp; struct fxp_rfa *rfa; int rnr = (statack & FXP_SCB_STATACK_RNR) ? 1 : 0; - int fxp_rc = 0; uint16_t status; FXP_LOCK_ASSERT(sc, MA_OWNED); @@ -1647,8 +1831,7 @@ * If this fails, the old buffer is recycled * instead. */ - fxp_rc = fxp_add_rfabuf(sc, rxp, m); - if (fxp_rc == 0) { + if (fxp_new_rfabuf(sc, rxp) == 0) { int total_len; /* @@ -1658,6 +1841,11 @@ * of bogus length or CRC errors. */ total_len = le16toh(rfa->actual_size) & 0x3fff; + if ((sc->flags & FXP_FLAG_82559_RXCSUM) != 0 && + (ifp->if_capenable & IFCAP_RXCSUM) != 0) { + /* Adjust for appended checksum bytes. */ + total_len -= 2; + } if (total_len < sizeof(struct ether_header) || total_len > MCLBYTES - RFA_ALIGNMENT_FUDGE - sc->rfa_size || status & FXP_RFA_STATUS_CRC) { @@ -1665,30 +1853,12 @@ continue; } - /* Do IP checksum checking. */ - if ((ifp->if_capenable & IFCAP_RXCSUM) != 0 && - (status & FXP_RFA_STATUS_PARSE)) { - if (rfa->rfax_csum_sts & - FXP_RFDX_CS_IP_CSUM_BIT_VALID) - m->m_pkthdr.csum_flags |= - CSUM_IP_CHECKED; - if (rfa->rfax_csum_sts & - FXP_RFDX_CS_IP_CSUM_VALID) - m->m_pkthdr.csum_flags |= - CSUM_IP_VALID; - if ((rfa->rfax_csum_sts & - FXP_RFDX_CS_TCPUDP_CSUM_BIT_VALID) && - (rfa->rfax_csum_sts & - FXP_RFDX_CS_TCPUDP_CSUM_VALID)) { - m->m_pkthdr.csum_flags |= - CSUM_DATA_VALID|CSUM_PSEUDO_HDR; - m->m_pkthdr.csum_data = 0xffff; - } - } - m->m_pkthdr.len = m->m_len = total_len; m->m_pkthdr.rcvif = ifp; + /* Do IP checksum checking. */ + if ((ifp->if_capenable & IFCAP_RXCSUM) != 0) + fxp_rxcsum(sc, ifp, m, status, total_len); /* * Drop locks before calling if_input() since it * may re-enter fxp_start() in the netisr case. @@ -1700,10 +1870,12 @@ FXP_UNLOCK(sc); (*ifp->if_input)(ifp, m); FXP_LOCK(sc); - } else if (fxp_rc == ENOBUFS) { - rnr = 0; - break; + } else { + /* Reuse RFA and loaded DMA map. */ + ifp->if_iqdrops++; + fxp_discard_rfabuf(sc, rxp); } + fxp_add_rfabuf(sc, rxp); } if (rnr) { fxp_scb_wait(sc); @@ -2015,11 +2187,12 @@ cbp->disc_short_rx = !prm; /* discard short packets */ cbp->underrun_retry = 1; /* retry mode (once) on DMA underrun */ cbp->two_frames = 0; /* do not limit FIFO to 2 frames */ - cbp->dyn_tbd = 0; /* (no) dynamic TBD mode */ + cbp->dyn_tbd = sc->flags & FXP_FLAG_EXT_RFA ? 1 : 0; cbp->ext_rfa = sc->flags & FXP_FLAG_EXT_RFA ? 1 : 0; cbp->mediatype = sc->flags & FXP_FLAG_SERIAL_MEDIA ? 0 : 1; cbp->csma_dis = 0; /* (don't) disable link */ - cbp->tcp_udp_cksum = 0; /* (don't) enable checksum */ >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Wed Nov 26 22:54:53 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 428CF1065675; Wed, 26 Nov 2008 22:54:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 06809106564A for ; Wed, 26 Nov 2008 22:54:53 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C50CC8FC19 for ; Wed, 26 Nov 2008 22:54:52 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAQMsqS2005792 for ; Wed, 26 Nov 2008 22:54:52 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAQMsqYe005790 for perforce@freebsd.org; Wed, 26 Nov 2008 22:54:52 GMT (envelope-from zec@tel.fer.hr) Date: Wed, 26 Nov 2008 22:54:52 GMT Message-Id: <200811262254.mAQMsqYe005790@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153637 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, 26 Nov 2008 22:54:53 -0000 http://perforce.freebsd.org/chv.cgi?CH=153637 Change 153637 by zec@zec_tca51 on 2008/11/26 22:54:41 Attempt to get rid of persistent misintegration artifacts per Bjoern's receipe... Affected files ... .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#5 delete .. //depot/projects/vimage/src/sys/netinet/ip_output.c#21 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed Nov 26 23:08:06 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 83FEF1065675; Wed, 26 Nov 2008 23:08:06 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 47E0D1065670 for ; Wed, 26 Nov 2008 23:08:06 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1151F8FC18 for ; Wed, 26 Nov 2008 23:08:06 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAQN85EL007788 for ; Wed, 26 Nov 2008 23:08:05 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAQN85uc007786 for perforce@freebsd.org; Wed, 26 Nov 2008 23:08:05 GMT (envelope-from zec@tel.fer.hr) Date: Wed, 26 Nov 2008 23:08:05 GMT Message-Id: <200811262308.mAQN85uc007786@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153638 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, 26 Nov 2008 23:08:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=153638 Change 153638 by zec@zec_tca51 on 2008/11/26 23:07:39 Restore deleted files Affected files ... .. //depot/projects/vimage/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#6 add .. //depot/projects/vimage/src/sys/netinet/ip_output.c#22 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Nov 26 23:09:07 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AB4141065674; Wed, 26 Nov 2008 23:09:07 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6FB331065672 for ; Wed, 26 Nov 2008 23:09:07 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 398B48FC1B for ; Wed, 26 Nov 2008 23:09:07 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAQN973q007857 for ; Wed, 26 Nov 2008 23:09:07 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAQN97AI007855 for perforce@freebsd.org; Wed, 26 Nov 2008 23:09:07 GMT (envelope-from zec@tel.fer.hr) Date: Wed, 26 Nov 2008 23:09:07 GMT Message-Id: <200811262309.mAQN97AI007855@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153639 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, 26 Nov 2008 23:09:07 -0000 http://perforce.freebsd.org/chv.cgi?CH=153639 Change 153639 by zec@zec_tca51 on 2008/11/26 23:08:46 fix misintegrations, part 1. Affected files ... .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#4 delete .. //depot/projects/vimage-commit2/src/sys/netinet/ip_output.c#11 delete Differences ... From owner-p4-projects@FreeBSD.ORG Wed Nov 26 23:10:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D40571065678; Wed, 26 Nov 2008 23:10:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 98EDF1065676 for ; Wed, 26 Nov 2008 23:10:08 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 62CC98FC14 for ; Wed, 26 Nov 2008 23:10:08 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAQNA8kf008028 for ; Wed, 26 Nov 2008 23:10:08 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAQNA8FU008026 for perforce@freebsd.org; Wed, 26 Nov 2008 23:10:08 GMT (envelope-from zec@tel.fer.hr) Date: Wed, 26 Nov 2008 23:10:08 GMT Message-Id: <200811262310.mAQNA8FU008026@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153640 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, 26 Nov 2008 23:10:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=153640 Change 153640 by zec@zec_tca51 on 2008/11/26 23:10:06 fix misintegrations part 2 Affected files ... .. //depot/projects/vimage-commit2/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#5 add .. //depot/projects/vimage-commit2/src/sys/netinet/ip_output.c#12 add Differences ... From owner-p4-projects@FreeBSD.ORG Wed Nov 26 23:38:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C230B1065673; Wed, 26 Nov 2008 23:38:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 879CC1065670 for ; Wed, 26 Nov 2008 23:38:37 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 693BF8FC13 for ; Wed, 26 Nov 2008 23:38:37 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAQNcbdx010193 for ; Wed, 26 Nov 2008 23:38:37 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAQNcbcN010191 for perforce@freebsd.org; Wed, 26 Nov 2008 23:38:37 GMT (envelope-from zec@tel.fer.hr) Date: Wed, 26 Nov 2008 23:38:37 GMT Message-Id: <200811262338.mAQNcbcN010191@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153642 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, 26 Nov 2008 23:38:38 -0000 http://perforce.freebsd.org/chv.cgi?CH=153642 Change 153642 by zec@zec_tca51 on 2008/11/26 23:38:21 Cleanup in an attempt to get a clean copy of -CURRENT Affected files ... .. //depot/projects/vimage-commit/src/sys/amd64/conf/GENERIC_NODEBUG#2 delete .. //depot/projects/vimage-commit/src/sys/i386/conf/GENERIC_NODEBUG#2 delete .. //depot/projects/vimage-commit/src/sys/i386/conf/VLINT#2 delete .. //depot/projects/vimage-commit/src/sys/kern/kern_vimage.c#3 delete .. //depot/projects/vimage-commit/src/sys/modules/netgraph/pipe/Makefile#2 delete .. //depot/projects/vimage-commit/src/sys/modules/netgraph/wormhole/Makefile#2 delete .. //depot/projects/vimage-commit/src/sys/netgraph/ng_wormhole.c#3 delete .. //depot/projects/vimage-commit/src/sys/netgraph/vnetgraph.h#2 delete .. //depot/projects/vimage-commit/src/sys/netinet/tcp_hostcache.h#2 delete .. //depot/projects/vimage-commit/src/usr.sbin/vimage/Makefile#2 delete .. //depot/projects/vimage-commit/src/usr.sbin/vimage/vimage.8#2 delete .. //depot/projects/vimage-commit/src/usr.sbin/vimage/vimage.c#2 delete Differences ... From owner-p4-projects@FreeBSD.ORG Thu Nov 27 00:05:30 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 524D01065677; Thu, 27 Nov 2008 00:05:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EFCB41065675 for ; Thu, 27 Nov 2008 00:05:29 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id CE4518FC19 for ; Thu, 27 Nov 2008 00:05:29 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAR05Tkc013508 for ; Thu, 27 Nov 2008 00:05:29 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAR05C9V013457 for perforce@freebsd.org; Thu, 27 Nov 2008 00:05:12 GMT (envelope-from zec@tel.fer.hr) Date: Thu, 27 Nov 2008 00:05:12 GMT Message-Id: <200811270005.mAR05C9V013457@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153647 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, 27 Nov 2008 00:05:30 -0000 http://perforce.freebsd.org/chv.cgi?CH=153647 Change 153647 by zec@zec_tca51 on 2008/11/27 00:04:26 IFC @ 153641 Affected files ... .. //depot/projects/vimage-commit/src/sys/amd64/amd64/amd64_mem.c#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/cpu_switch.S#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/dump_machdep.c#9 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/elf_machdep.c#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/genassym.c#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/identcpu.c#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/initcpu.c#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/local_apic.c#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/machdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/mem.c#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/minidump_machdep.c#11 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/mp_machdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/msi.c#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/prof_machdep.c#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/trap.c#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/tsc.c#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/vm_machdep.c#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/conf/GENERIC#8 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/atomic.h#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/clock.h#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/cputypes.h#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/md_var.h#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/param.h#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/pcb.h#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/pcpu.h#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/pmc_mdep.h#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/segments.h#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/smp.h#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/specialreg.h#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux.h#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux32_genassym.c#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux32_locore.s#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux32_machdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux32_proto.h#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux32_syscall.h#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux32_sysent.c#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux32_sysvec.c#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/syscalls.master#3 integrate .. //depot/projects/vimage-commit/src/sys/amd64/pci/pci_cfgreg.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/busdma_machdep.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/cpufunc.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/cpufunc_asm_feroceon.S#1 branch .. //depot/projects/vimage-commit/src/sys/arm/arm/dump_machdep.c#9 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/elf_machdep.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/elf_trampoline.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/genassym.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/identcpu.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/intr.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/locore.S#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/mem.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/minidump_machdep.c#1 branch .. //depot/projects/vimage-commit/src/sys/arm/arm/nexus.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/pmap.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/swtch.S#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/undefined.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_machdep.c#1 branch .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_mci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_mcireg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_pdcreg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_pio.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_pioreg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_piovar.h#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_pmc.c#5 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_pmcreg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_pmcvar.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_rtc.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_rtcreg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_spi.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_spireg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_ssc.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_sscreg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_st.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_streg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_twi.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_twiio.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_twireg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_usartreg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91board.h#1 branch .. //depot/projects/vimage-commit/src/sys/arm/at91/at91rm92reg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91var.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/board_bwct.c#1 branch .. //depot/projects/vimage-commit/src/sys/arm/at91/board_hl200.c#1 branch .. //depot/projects/vimage-commit/src/sys/arm/at91/board_kb920x.c#1 branch .. //depot/projects/vimage-commit/src/sys/arm/at91/board_tsc4370.c#1 branch .. //depot/projects/vimage-commit/src/sys/arm/at91/files.at91#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/files.kb920x#3 delete .. //depot/projects/vimage-commit/src/sys/arm/at91/if_ate.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/if_atereg.h#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/kb920x_machdep.c#3 delete .. //depot/projects/vimage-commit/src/sys/arm/at91/ohci_atmelarm.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/std.at91#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/std.bwct#1 branch .. //depot/projects/vimage-commit/src/sys/arm/at91/std.hl200#1 branch .. //depot/projects/vimage-commit/src/sys/arm/at91/std.kb920x#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/std.tsc4370#1 branch .. //depot/projects/vimage-commit/src/sys/arm/at91/uart_bus_at91usart.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/uart_dev_at91usart.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/AVILA#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/BWCT#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/CRB#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/DB-78XXX#1 branch .. //depot/projects/vimage-commit/src/sys/arm/conf/DB-88F5XXX#1 branch .. //depot/projects/vimage-commit/src/sys/arm/conf/DB-88F6XXX#1 branch .. //depot/projects/vimage-commit/src/sys/arm/conf/DEFAULTS#1 branch .. //depot/projects/vimage-commit/src/sys/arm/conf/EP80219#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/GUMSTIX#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/HL200#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/IQ31244#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/KB920X#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/NSLU#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/SIMICS#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/conf/SKYEYE#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/armreg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/atomic.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/bootinfo.h#1 branch .. //depot/projects/vimage-commit/src/sys/arm/include/cpufunc.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/intr.h#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/md_var.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/metadata.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/minidump.h#1 branch .. //depot/projects/vimage-commit/src/sys/arm/include/pcpu.h#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/pmap.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/include/resource.h#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/mv/bus_space.c#1 branch .. //depot/projects/vimage-commit/src/sys/arm/mv/common.c#1 branch .. //depot/projects/vimage-commit/src/sys/arm/mv/discovery/db78xxx.c#1 branch .. //depot/projects/vimage-commit/src/sys/arm/mv/discovery/discovery.c#1 branch .. //depot/projects/vimage-commit/src/sys/arm/mv/discovery/files.db78xxx#1 branch .. //depot/projects/vimage-commit/src/sys/arm/mv/discovery/std.db78xxx#1 branch .. //depot/projects/vimage-commit/src/sys/arm/mv/files.mv#1 branch .. //depot/projects/vimage-commit/src/sys/arm/mv/gpio.c#1 branch .. //depot/projects/vimage-commit/src/sys/arm/mv/ic.c#1 branch .. //depot/projects/vimage-commit/src/sys/arm/mv/kirkwood/db88f6xxx.c#1 branch .. //depot/projects/vimage-commit/src/sys/arm/mv/kirkwood/files.db88f6xxx#1 branch .. //depot/projects/vimage-commit/src/sys/arm/mv/kirkwood/kirkwood.c#1 branch .. //depot/projects/vimage-commit/src/sys/arm/mv/kirkwood/std.db88f6xxx#1 branch .. //depot/projects/vimage-commit/src/sys/arm/mv/mv_machdep.c#1 branch .. //depot/projects/vimage-commit/src/sys/arm/mv/mv_pci.c#1 branch .. //depot/projects/vimage-commit/src/sys/arm/mv/mvreg.h#1 branch .. //depot/projects/vimage-commit/src/sys/arm/mv/mvvar.h#1 branch .. //depot/projects/vimage-commit/src/sys/arm/mv/obio.c#1 branch .. //depot/projects/vimage-commit/src/sys/arm/mv/orion/db88f5xxx.c#1 branch .. //depot/projects/vimage-commit/src/sys/arm/mv/orion/files.db88f5xxx#1 branch .. //depot/projects/vimage-commit/src/sys/arm/mv/orion/orion.c#1 branch .. //depot/projects/vimage-commit/src/sys/arm/mv/orion/std.db88f5xxx#1 branch .. //depot/projects/vimage-commit/src/sys/arm/mv/rtc.c#1 branch .. //depot/projects/vimage-commit/src/sys/arm/mv/std.mv#1 branch .. //depot/projects/vimage-commit/src/sys/arm/mv/timer.c#1 branch .. //depot/projects/vimage-commit/src/sys/arm/mv/twsi.c#1 branch .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/avila_machdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/if_npe.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425.c#3 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/ixp425_qmgr.c#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/Makefile#4 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/Makefile#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/boot2/boot2.c#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/boot2/centipad_board.c#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/at91/boot2/kb920x_board.c#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/ixp425/Makefile.inc#1 branch .. //depot/projects/vimage-commit/src/sys/boot/arm/ixp425/boot2/Makefile#1 branch .. //depot/projects/vimage-commit/src/sys/boot/arm/ixp425/boot2/arm_init.S#1 branch .. //depot/projects/vimage-commit/src/sys/boot/arm/ixp425/boot2/boot2.c#1 branch .. //depot/projects/vimage-commit/src/sys/boot/arm/ixp425/boot2/cf_ata.h#1 branch .. //depot/projects/vimage-commit/src/sys/boot/arm/ixp425/boot2/ixp425_board.c#1 branch .. //depot/projects/vimage-commit/src/sys/boot/arm/ixp425/boot2/lib.h#1 branch .. //depot/projects/vimage-commit/src/sys/boot/arm/uboot/Makefile#1 branch .. //depot/projects/vimage-commit/src/sys/boot/arm/uboot/conf.c#1 branch .. //depot/projects/vimage-commit/src/sys/boot/arm/uboot/help.uboot#1 branch .. //depot/projects/vimage-commit/src/sys/boot/arm/uboot/ldscript.arm#1 branch .. //depot/projects/vimage-commit/src/sys/boot/arm/uboot/start.S#1 branch .. //depot/projects/vimage-commit/src/sys/boot/arm/uboot/version#1 branch .. //depot/projects/vimage-commit/src/sys/boot/common/Makefile.inc#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/bootstrap.h#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/dev_net.c#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/interp.c#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/common/load_elf.c#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/ficl/Makefile#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/forth/loader.conf#6 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/Makefile#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/boot0/boot0.S#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/gptzfsboot/Makefile#1 branch .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/biosdisk.c#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/bootinfo32.c#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/bootinfo64.c#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/libi386/devicename.c#4 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/loader/Makefile#4 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/loader/conf.c#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/loader/main.c#4 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/zfsboot/Makefile#1 branch .. //depot/projects/vimage-commit/src/sys/boot/i386/zfsboot/zfsboot.c#1 branch .. //depot/projects/vimage-commit/src/sys/boot/i386/zfsboot/zfsldr.S#1 branch .. //depot/projects/vimage-commit/src/sys/boot/ofw/libofw/Makefile#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/ofw/libofw/ofw_console.c#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/ofw/libofw/ofw_disk.c#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/powerpc/Makefile#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/powerpc/boot1.chrp/Makefile#1 branch .. //depot/projects/vimage-commit/src/sys/boot/powerpc/boot1.chrp/Makefile.hfs#1 branch .. //depot/projects/vimage-commit/src/sys/boot/powerpc/boot1.chrp/boot1.c#1 branch .. //depot/projects/vimage-commit/src/sys/boot/powerpc/boot1.chrp/bootinfo.txt#1 branch .. //depot/projects/vimage-commit/src/sys/boot/powerpc/boot1.chrp/generate-hfs.sh#1 branch .. //depot/projects/vimage-commit/src/sys/boot/powerpc/boot1.chrp/hfs.tmpl.bz2.uu#1 branch .. //depot/projects/vimage-commit/src/sys/boot/sparc64/loader/main.c#5 integrate .. //depot/projects/vimage-commit/src/sys/boot/uboot/lib/api_public.h#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/uboot/lib/devicename.c#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/uboot/lib/disk.c#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/uboot/lib/glue.c#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/uboot/lib/glue.h#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/uboot/lib/libuboot.h#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/uboot/lib/net.c#3 integrate .. //depot/projects/vimage-commit/src/sys/boot/zfs/Makefile#1 branch .. //depot/projects/vimage-commit/src/sys/boot/zfs/zfs.c#1 branch .. //depot/projects/vimage-commit/src/sys/boot/zfs/zfsimpl.c#1 branch .. //depot/projects/vimage-commit/src/sys/bsm/audit_internal.h#4 integrate .. //depot/projects/vimage-commit/src/sys/bsm/audit_record.h#4 integrate .. //depot/projects/vimage-commit/src/sys/cam/cam.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_pass.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_sa.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_ses.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_sg.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_target.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/boot/zfs/README#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/boot/zfs/fletcher.c#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/boot/zfs/lzjb.c#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/boot/zfs/sha256.c#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/boot/zfs/zfsimpl.h#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/boot/zfs/zfssubr.c#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#4 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/acl.h#3 delete .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/atomic.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/callb.h#3 delete .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/cred.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/dnlc.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/file.h#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/kidmap.h#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/kmem.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/misc.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/mntent.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/param.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/pathname.h#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/policy.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/proc.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/refstr.h#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/sid.h#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/sig.h#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/sunddi.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/time.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/types.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/uio.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/vfs.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/vnode.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/zone.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/common/avl/avl.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/common/unicode/u8_textprep.c#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.c#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.h#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.c#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.h#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/common/zfs/zprop_common.c#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/Makefile.files#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#5 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#4 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deleg.h#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/rrwlock.h#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_boot.h#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_fuid.h#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/unique.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#4 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/os/callb.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/os/list.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/cred.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/extdirent.h#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/protocol.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/fm/util.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/idmap.h#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#4 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/list.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/synch.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/eventdefs.h#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/u8_textprep.h#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/u8_textprep_data.h#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#1 branch .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/dev/cyclic/cyclic.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/dev/dtrace/dtrace_clone.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/dev/dtrace/dtrace_ioctl.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/dev/dtrace/dtrace_load.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/dev/dtrace/dtrace_unload.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/dev/systrace/systrace.c#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_ioctl.c#1 branch .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_ioctl.h#1 branch .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_misc.c#4 integrate .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_proto.h#5 integrate .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_syscall.h#5 integrate .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_syscalls.c#5 integrate .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_sysent.c#5 integrate .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/freebsd32_util.h#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/freebsd32/syscalls.master#5 integrate .. //depot/projects/vimage-commit/src/sys/compat/ia32/ia32_sysvec.c#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/linprocfs/linprocfs.c#9 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_emul.c#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_file.c#4 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_futex.c#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_futex.h#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_getcwd.c#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_ioctl.c#9 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_ipc.c#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_misc.c#11 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_signal.c#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_signal.h#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_socket.c#6 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_util.c#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/ndis/ntoskrnl_var.h#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_sockio.c#9 integrate .. //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_stream.c#3 integrate .. //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_sysvec.c#3 integrate .. //depot/projects/vimage-commit/src/sys/conf/Makefile.arm#4 integrate .. //depot/projects/vimage-commit/src/sys/conf/NOTES#10 integrate .. //depot/projects/vimage-commit/src/sys/conf/files#14 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.amd64#4 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.arm#3 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.i386#8 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.ia64#3 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.mips#3 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.pc98#5 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.powerpc#4 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.sparc64#4 integrate .. //depot/projects/vimage-commit/src/sys/conf/kern.pre.mk#5 integrate .. //depot/projects/vimage-commit/src/sys/conf/kmod.mk#3 integrate .. //depot/projects/vimage-commit/src/sys/conf/ldscript.mips#3 integrate .. //depot/projects/vimage-commit/src/sys/conf/ldscript.mips.cfe#3 integrate .. //depot/projects/vimage-commit/src/sys/conf/newvers.sh#5 integrate .. //depot/projects/vimage-commit/src/sys/conf/options#9 integrate .. //depot/projects/vimage-commit/src/sys/conf/options.arm#4 integrate .. //depot/projects/vimage-commit/src/sys/conf/options.mips#3 integrate .. //depot/projects/vimage-commit/src/sys/conf/options.sparc64#4 integrate .. //depot/projects/vimage-commit/src/sys/contrib/altq/altq/altq_cbq.c#3 integrate .. //depot/projects/vimage-commit/src/sys/contrib/altq/altq/altq_cdnr.c#3 integrate .. //depot/projects/vimage-commit/src/sys/contrib/altq/altq/altq_hfsc.c#3 integrate .. //depot/projects/vimage-commit/src/sys/contrib/altq/altq/altq_priq.c#3 integrate .. //depot/projects/vimage-commit/src/sys/contrib/altq/altq/altq_red.c#3 integrate .. //depot/projects/vimage-commit/src/sys/contrib/altq/altq/altq_rio.c#3 integrate .. //depot/projects/vimage-commit/src/sys/contrib/altq/altq/altq_rmclass.c#3 integrate .. //depot/projects/vimage-commit/src/sys/contrib/altq/altq/altq_subr.c#7 integrate .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/mipsisa32-be-elf.hal.o.uu#3 integrate .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/wisoc.hal.o.uu#1 branch .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/wisoc.inc#1 branch .. //depot/projects/vimage-commit/src/sys/contrib/dev/ath/public/wisoc.opt_ah.h#1 branch .. //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_auth.c#5 integrate .. //depot/projects/vimage-commit/src/sys/contrib/ipfilter/netinet/ip_compat.h#4 integrate .. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf.c#6 integrate .. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf_if.c#5 integrate .. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf_ioctl.c#7 integrate .. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pf_subr.c#4 integrate .. //depot/projects/vimage-commit/src/sys/contrib/pf/net/pfvar.h#6 integrate .. //depot/projects/vimage-commit/src/sys/contrib/rdma/rdma_cma.c#4 integrate .. //depot/projects/vimage-commit/src/sys/crypto/via/padlock.c#5 integrate .. //depot/projects/vimage-commit/src/sys/ddb/db_command.c#4 integrate .. //depot/projects/vimage-commit/src/sys/ddb/db_command.h#3 integrate .. //depot/projects/vimage-commit/src/sys/ddb/db_main.c#3 integrate .. //depot/projects/vimage-commit/src/sys/ddb/db_textdump.c#7 integrate .. //depot/projects/vimage-commit/src/sys/ddb/ddb.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/aac/aac_pci.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/acpi_support/acpi_asus.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/acpi_support/acpi_fujitsu.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/acpica/Osd/OsdSchedule.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/acpica/acpi.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/acpica/acpi_hpet.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/acpica/acpi_pcib.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/acpica/acpi_quirk.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/adb/adb.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/adb/adb_bus.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/adb/adb_hb_if.m#1 branch .. //depot/projects/vimage-commit/src/sys/dev/adb/adb_if.m#1 branch .. //depot/projects/vimage-commit/src/sys/dev/adb/adb_kbd.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/adb/adb_mouse.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/adb/adbvar.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ae/if_ae.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ae/if_aereg.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ae/if_aevar.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/age/if_age.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/age/if_agevar.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/agp/agp.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/agp/agp_i810.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/agp/agpreg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/aha/aha_isa.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/aha/aha_mca.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/aic7xxx/aic79xx_osm.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ale/if_ale.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ale/if_alereg.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ale/if_alevar.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/amr/amr.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/amr/amr_cam.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/amr/amrvar.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/an/if_an.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ar/if_ar.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/arcmsr/arcmsr.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/asmc/asmc.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/asmc/asmcvar.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/asr/asr.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-all.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-all.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-chipset.c#6 delete .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-dma.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-pci.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-queue.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-sata.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ata/atapi-tape.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-acard.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-acerlabs.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-adaptec.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-ahci.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-amd.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-ati.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-cenatek.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-cypress.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-cyrix.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-highpoint.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-intel.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-ite.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-jmicron.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-marvell.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-micron.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-national.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-netcell.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-nvidia.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-promise.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-serverworks.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-siliconimage.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-sis.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-via.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/ath/ah_osdep.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_rate/amrr/amrr.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_rate/onoe/onoe.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_rate/sample/sample.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/if_ath.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/if_athrate.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/if_athvar.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/atkbdc/psm.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/bce/if_bce.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/bce/if_bcereg.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/bge/if_bge.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/bge/if_bgereg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/bktr/bktr_os.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/bm/if_bm.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/cardbus/cardbus.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cardbus/cardbus_cis.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cardbus/cardbus_device.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cardbus/cardbusreg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cardbus/cardbusvar.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ce/if_ce.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/cfe/cfe_api.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/cfe/cfe_api.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/cfe/cfe_api_int.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/cfe/cfe_console.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/cfe/cfe_error.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/cfe/cfe_ioctl.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/cfe/cfe_resource.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/cfi/cfi_bus_lbc.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/cfi/cfi_core.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/cfi/cfi_dev.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/cfi/cfi_reg.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/cfi/cfi_var.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/coretemp/coretemp.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cp/if_cp.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/cpuctl/cpuctl.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ctau/if_ct.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/common/cxgb_ael1002.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/common/cxgb_common.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/common/cxgb_ctl_defs.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/common/cxgb_mc5.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/common/cxgb_t3_hw.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/common/cxgb_tn1010.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/common/cxgb_vsc7323.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/common/cxgb_vsc8211.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/common/cxgb_xgmac.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/cxgb_adapter.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/cxgb_config.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/cxgb_include.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/cxgb_main.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/cxgb_multiq.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/cxgb_offload.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/cxgb_offload.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/cxgb_osdep.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/cxgb_sge.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/cxgb_t3fw.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/sys/cxgb_support.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/sys/mbufq.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/sys/mvec.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/sys/uipc_mvec.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cm.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_cq.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_dbg.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_ev.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_hal.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_mem.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_provider.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_qp.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/toecore/toedev.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#9 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/tom/cxgb_defs.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/tom/cxgb_listen.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/tom/cxgb_tom.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/tom/cxgb_tom.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/tom/cxgb_vm.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/ulp/tom/cxgb_vm.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/dc/dcphy.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/dc/pnphy.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/dcons/dcons_crom.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/dcons/dcons_os.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/ati_pcigart.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drmP.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_agpsupport.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_atomic.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_auth.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_bufs.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_context.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_dma.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_drawable.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_drv.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_fops.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_ioctl.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_irq.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_linux_list.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_lock.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_memory.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_pci.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_pciids.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_scatter.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_sysctl.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/drm_vm.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/i915_dma.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/i915_drm.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/i915_drv.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/i915_drv.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/i915_irq.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/i915_suspend.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/mach64_dma.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/mach64_drv.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/mga_drv.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/r128_drv.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/radeon_cp.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/radeon_drv.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/radeon_drv.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/savage_drv.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/sis_drv.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/drm/tdfx_drv.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/if_em.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/if_igb.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/en/midway.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/esp/esp_sbus.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/esp/ncr53c9x.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/esp/ncr53c9xreg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/esp/ncr53c9xvar.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/fatm/if_fatm.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/fb/fb.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/fb/vgareg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/fdc/fdc.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/fdc/fdc_pccard.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/firewire/firewire.c#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/firewire/firewire.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/firewire/fwdev.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/fxp/if_fxp.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/fxp/if_fxpreg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/fxp/if_fxpvar.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/glxsb/glxsb.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/hptiop/hptiop.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/hptiop/hptiop.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/hwpmc/hwpmc_amd.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/hwpmc/hwpmc_amd.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/hwpmc/hwpmc_arm.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/hwpmc/hwpmc_ia64.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/hwpmc/hwpmc_intel.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/hwpmc/hwpmc_logging.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/hwpmc/hwpmc_mod.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/hwpmc/hwpmc_pentium.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/hwpmc/hwpmc_pentium.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/hwpmc/hwpmc_piv.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/hwpmc/hwpmc_piv.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/hwpmc/hwpmc_powerpc.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/hwpmc/hwpmc_ppro.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/hwpmc/hwpmc_ppro.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/hwpmc/hwpmc_sparc64.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/hwpmc/hwpmc_tsc.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/hwpmc/hwpmc_tsc.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/hwpmc/hwpmc_x86.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/hwpmc/pmc_events.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ic/i8251.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ic/i8255.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/if_ndis/if_ndis.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/if_ndis/if_ndisvar.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/iicbus/ds133x.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/iicbus/ds1672.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/iir/iir_ctrl.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ipmi/ipmi.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/iscsi/initiator/isc_cam.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/iscsi/initiator/isc_sm.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/iscsi/initiator/isc_soc.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/iscsi/initiator/isc_subr.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/iscsi/initiator/iscsi.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/iscsi/initiator/iscsi.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/iscsi/initiator/iscsi_subr.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/iscsi/initiator/iscsivar.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/isp/isp_freebsd.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ispfw/ispfw.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/iwn/if_iwn.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/jme/if_jme.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/jme/if_jmereg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/joy/joy.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/kbd/kbd.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/kbdmux/kbdmux.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/le/if_le_cbus.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/le/if_le_isa.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/le/if_le_lebuffer.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/le/if_le_ledma.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/le/if_le_pci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/le/lebuffer_sbus.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/led/led.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/lmc/if_lmc.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/mfi/mfi.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/mfi/mfi_disk.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/mfi/mfi_ioctl.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/mfi/mfi_pci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/mfi/mfireg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/mfi/mfivar.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/mge/if_mge.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/mge/if_mgevar.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/mii/atphy.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/mii/ciphy.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/mii/e1000phy.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/mii/miidevs#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/mlx/mlx.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/mly/mly.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/mmc/bridge.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/mmc/mmc.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/mmc/mmcbrvar.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/mmc/mmcreg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/mmc/mmcsd.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/mmc/mmcvar.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/mn/if_mn.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/mse/mse.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/msk/if_msk.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/msk/if_mskreg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/mxge/eth_z8e.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/mxge/ethp_z8e.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/mxge/if_mxge.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/mxge/if_mxge_var.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/mxge/mxge_mcp.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/mxge/rss_eth_z8e.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/mxge/rss_ethp_z8e.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/nfe/if_nfe.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/nfe/if_nfereg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/nfe/if_nfevar.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/nmdm/nmdm.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/nxge/xge-osdep.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ofw/ofw_console.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/patm/if_patm_intr.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/pbio/pbio.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/pccbb/pccbb_pci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/pci/pci.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/pci/pcireg.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/pci/vga_pci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/powermac_nvram/powermac_nvram.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppbus/if_plip.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppbus/immio.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppbus/lpbb.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppbus/lpt.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppbus/lpt.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppbus/pcfclock.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppbus/ppb_1284.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppbus/ppb_base.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppbus/ppb_msq.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppbus/ppbconf.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppbus/ppbconf.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppbus/ppi.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppbus/ppi.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppbus/pps.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppbus/vpo.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppbus/vpoio.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppbus/vpoio.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppc/ppc.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppc/ppc_acpi.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppc/ppc_isa.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppc/ppc_pci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppc/ppc_puc.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppc/ppcreg.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ppc/ppcvar.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/puc/pucdata.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ral/rt2560.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ral/rt2661.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/random/randomdev.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/random/randomdev_soft.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ray/if_ray.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ray/if_rayvar.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/re/if_re.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/rp/rpvar.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/sdhci/sdhci.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/sdhci/sdhci.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/si/si.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/siba/siba.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/siba/siba_ids.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/siba/siba_pcib.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/siba/siba_pcibvar.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/siba/sibareg.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/siba/sibavar.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/sio/sio.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/sio/sio_pci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/sio/sio_puc.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/snp/snp.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/midi/sequencer.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/pci/emu10kx.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/pci/hda/hda_reg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/pci/hda/hdac.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/pci/hda/hdac_private.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/pcm/channel.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/pcm/channel.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/pcm/dsp.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/pcm/mixer.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/pcm/mixer.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/speaker/spkr.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/sr/if_sr.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/streams/streams.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/sym/sym_hipd.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/syscons/syscons.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/syscons/sysmouse.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/tdfx/tdfx_pci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/twa/tw_osl_freebsd.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/twe/twe_freebsd.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/tx/if_tx.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/uart/uart_bus_mbus.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/uart/uart_cpu_mv.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/uart/uart_cpu_pc98.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/uart/uart_dev_quicc.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/uart/uart_tty.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/ehci.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/ehci_mbus.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/ehci_pci.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/ehcivar.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/if_aue.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/if_zyd.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/if_zydreg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/ohci_pci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/rio500_usb.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/slhci_pccard.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/u3g.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/uark.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/ubsa.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/ucom.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/ucomvar.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/udbp.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/ufm.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/ufoma.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/ugen.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/uhci_pci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/uhid.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/ukbd.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/ulpt.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/umass.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/umct.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/ums.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/urio.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_quirks.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_subr.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usbdevs#10 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usbdi.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usbdi.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/uscanner.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb2/bluetooth/TODO.TXT#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/bluetooth/ng_ubt2.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/bluetooth/ng_ubt2_var.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/bluetooth/ubtbcmfw2.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/bluetooth/usb2_bluetooth.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/bluetooth/usb2_bluetooth.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/controller/at91dci.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/controller/at91dci.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/controller/at91dci_atmelarm.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/controller/ehci2.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/controller/ehci2.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/controller/ehci2_pci.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/controller/musb2_otg.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/controller/musb2_otg.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/controller/musb2_otg_atmelarm.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/controller/ohci2.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/controller/ohci2.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/controller/ohci2_atmelarm.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/controller/ohci2_pci.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/controller/uhci2.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/controller/uhci2.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/controller/uhci2_pci.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/controller/usb2_bus.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/controller/usb2_controller.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/controller/usb2_controller.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/controller/usb2_pci.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/controller/uss820dci.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/controller/uss820dci.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/controller/uss820dci_atmelarm.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/README.TXT#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/usb2_busdma.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/usb2_busdma.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/usb2_compat_linux.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/usb2_compat_linux.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/usb2_config_td.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/usb2_config_td.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/usb2_core.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/usb2_core.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/usb2_debug.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/usb2_debug.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/usb2_dev.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/usb2_dev.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/usb2_device.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/usb2_device.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/usb2_dynamic.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/usb2_dynamic.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/usb2_error.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/usb2_generic.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/usb2_generic.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/usb2_handle_request.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/usb2_handle_request.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/usb2_hid.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/usb2_hid.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/usb2_hub.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/usb2_hub.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/usb2_if.m#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/usb2_lookup.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/usb2_lookup.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/usb2_mbuf.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/usb2_mbuf.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/usb2_msctest.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/usb2_msctest.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/usb2_parse.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/usb2_parse.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/usb2_process.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/usb2_process.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/usb2_request.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/usb2_request.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb2/core/usb2_sw_transfer.c#1 branch >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Nov 27 00:16:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ABBCF1065675; Thu, 27 Nov 2008 00:16:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6F6BC1065673 for ; Thu, 27 Nov 2008 00:16:41 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 50B378FC14 for ; Thu, 27 Nov 2008 00:16:41 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAR0GfNp014498 for ; Thu, 27 Nov 2008 00:16:41 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAR0Gf4O014496 for perforce@freebsd.org; Thu, 27 Nov 2008 00:16:41 GMT (envelope-from zec@tel.fer.hr) Date: Thu, 27 Nov 2008 00:16:41 GMT Message-Id: <200811270016.mAR0Gf4O014496@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153648 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, 27 Nov 2008 00:16:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=153648 Change 153648 by zec@zec_tca51 on 2008/11/27 00:15:46 Fix misintegrations. Affected files ... .. //depot/projects/vimage-commit/src/sys/dev/sbni/if_sbni.c#3 add .. //depot/projects/vimage-commit/src/sys/dev/sbni/if_sbni_isa.c#3 add .. //depot/projects/vimage-commit/src/sys/dev/sbni/if_sbni_pci.c#3 add .. //depot/projects/vimage-commit/src/sys/dev/sbni/if_sbnireg.h#3 add .. //depot/projects/vimage-commit/src/sys/dev/sbni/if_sbnivar.h#3 add .. //depot/projects/vimage-commit/src/sys/modules/sbni/Makefile#3 add .. //depot/projects/vimage-commit/src/sys/net/vnet.h#3 edit .. //depot/projects/vimage-commit/src/sys/netinet/vinet.h#4 edit .. //depot/projects/vimage-commit/src/sys/netinet6/vinet6.h#3 edit .. //depot/projects/vimage-commit/src/sys/netipsec/vipsec.h#3 edit Differences ... ==== //depot/projects/vimage-commit/src/sys/net/vnet.h#3 (text+ko) ==== @@ -26,12 +26,13 @@ * 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. + * + * $FreeBSD: src/sys/net/vnet.h,v 1.1 2008/10/02 15:37:58 zec Exp $ */ #ifndef _NET_VNET_H_ #define _NET_VNET_H_ - #ifdef VIMAGE #include "opt_route.h" @@ -44,14 +45,6 @@ #include #include - -/* calculate this the same as in route.c */ -#ifndef ROUTETABLES - #define RT_MAXFIBS 1 -#else - #define RT_MAXFIBS 16 -#endif - struct vnet_net { int _if_index; struct ifindex_entry *_ifindex_table; @@ -78,23 +71,23 @@ /* * Symbol translation macros */ -#define INIT_VNET_NET(vnet) \ +#define INIT_VNET_NET(vnet) \ INIT_FROM_VNET(vnet, VNET_MOD_NET, struct vnet_net, vnet_net) -#define VNET_NET(sym) VSYM(vnet_net, sym) +#define VNET_NET(sym) VSYM(vnet_net, sym) -#define V_if_index VNET_NET(if_index) -#define V_ifindex_table VNET_NET(ifindex_table) -#define V_ifnet VNET_NET(ifnet) -#define V_ifg_head VNET_NET(ifg_head) -#define V_if_indexlim VNET_NET(if_indexlim) -#define V_ifklist VNET_NET(ifklist) -#define V_rtstat VNET_NET(rtstat) -#define V_rt_tables VNET_NET(rt_tables) -#define V_rttrash VNET_NET(rttrash) -#define V_loif VNET_NET(loif) -#define V_lo_list VNET_NET(lo_list) -#define V_rawcb_list VNET_NET(rawcb_list) -#define V_ether_ipfw VNET_NET(ether_ipfw) +#define V_ether_ipfw VNET_NET(ether_ipfw) +#define V_if_index VNET_NET(if_index) +#define V_if_indexlim VNET_NET(if_indexlim) +#define V_ifg_head VNET_NET(ifg_head) +#define V_ifindex_table VNET_NET(ifindex_table) +#define V_ifklist VNET_NET(ifklist) +#define V_ifnet VNET_NET(ifnet) +#define V_lo_list VNET_NET(lo_list) +#define V_loif VNET_NET(loif) +#define V_rawcb_list VNET_NET(rawcb_list) +#define V_rt_tables VNET_NET(rt_tables) +#define V_rtstat VNET_NET(rtstat) +#define V_rttrash VNET_NET(rttrash) #endif /* !_NET_VNET_H_ */ ==== //depot/projects/vimage-commit/src/sys/netinet/vinet.h#4 (text+ko) ==== @@ -26,6 +26,7 @@ * 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. + * * $FreeBSD: src/sys/netinet/vinet.h,v 1.3 2008/11/26 22:32:07 zec Exp $ */ @@ -67,6 +68,7 @@ int _sameprefixcarponly; int _ipforwarding; + int _ipstealth; int _ipfastforward_active; int _ipsendredirects; int _ip_defttl; @@ -146,6 +148,7 @@ struct inpcbhead _udb; struct inpcbinfo _udbinfo; struct udpstat _udpstat; + int _udp_blackhole; struct inpcbhead _ripcb; struct inpcbinfo _ripcbinfo; @@ -181,6 +184,17 @@ int _ipport_stoprandom; int _ipport_tcpallocs; int _ipport_tcplastcount; + + int _icmpmaskrepl; + u_int _icmpmaskfake; + int _drop_redirect; + int _log_redirect; + int _icmplim; + int _icmplim_output; + char _reply_src[IFNAMSIZ]; + int _icmp_rfi; + int _icmp_quotelen; + int _icmpbmcastecho; }; #endif @@ -188,120 +202,11 @@ /* * Symbol translation macros */ -#define INIT_VNET_INET(vnet) \ +#define INIT_VNET_INET(vnet) \ INIT_FROM_VNET(vnet, VNET_MOD_INET, struct vnet_inet, vnet_inet) -#define VNET_INET(sym) VSYM(vnet_inet, sym) - -#define V_in_ifaddrhead VNET_INET(in_ifaddrhead) -#define V_in_ifaddrhashtbl VNET_INET(in_ifaddrhashtbl) -#define V_in_ifaddrhmask VNET_INET(in_ifaddrhmask) -#define V_in_multihead VNET_INET(in_multihead) - -#define V_llinfo_arp VNET_INET(llinfo_arp) -#define V_arpt_prune VNET_INET(arpt_prune) -#define V_arpt_keep VNET_INET(arpt_keep) -#define V_arp_maxtries VNET_INET(arp_maxtries) -#define V_useloopback VNET_INET(useloopback) -#define V_arp_proxyall VNET_INET(arp_proxyall) -#define V_subnetsarelocal VNET_INET(subnetsarelocal) -#define V_sameprefixcarponly VNET_INET(sameprefixcarponly) +#define VNET_INET(sym) VSYM(vnet_inet, sym) -#define V_ipforwarding VNET_INET(ipforwarding) -#define V_ipfastforward_active VNET_INET(ipfastforward_active) -#define V_ipsendredirects VNET_INET(ipsendredirects) -#define V_ip_defttl VNET_INET(ip_defttl) -#define V_ip_keepfaith VNET_INET(ip_keepfaith) -#define V_ip_sendsourcequench VNET_INET(ip_sendsourcequench) -#define V_ip_id VNET_INET(ip_id) -#define V_ip_do_randomid VNET_INET(ip_do_randomid) -#define V_ip_checkinterface VNET_INET(ip_checkinterface) - -#define V_ipq VNET_INET(ipq) -#define V_ipq_zone VNET_INET(ipq_zone) -#define V_nipq VNET_INET(nipq) -#define V_maxnipq VNET_INET(maxnipq) -#define V_maxfragsperpacket VNET_INET(maxfragsperpacket) - -#define V_tcb VNET_INET(tcb) -#define V_tcbinfo VNET_INET(tcbinfo) -#define V_tcpstat VNET_INET(tcpstat) -#define V_twq_2msl VNET_INET(twq_2msl) -#define V_tcp_hostcache VNET_INET(tcp_hostcache) -#define V_tcp_hc_callout VNET_INET(tcp_hc_callout) -#define V_tcp_syncache VNET_INET(tcp_syncache) -#define V_tcp_sc_rst_sock_fail VNET_INET(tcp_sc_rst_sock_fail) - -#define V_tcp_mssdflt VNET_INET(tcp_mssdflt) -#define V_tcp_v6mssdflt VNET_INET(tcp_v6mssdflt) -#define V_tcp_minmss VNET_INET(tcp_minmss) -#define V_tcp_do_rfc1323 VNET_INET(tcp_do_rfc1323) -#define V_icmp_may_rst VNET_INET(icmp_may_rst) -#define V_tcp_isn_reseed_interval VNET_INET(tcp_isn_reseed_interval) -#define V_tcp_inflight_enable VNET_INET(tcp_inflight_enable) -#define V_tcp_inflight_rttthresh VNET_INET(tcp_inflight_rttthresh) -#define V_tcp_inflight_min VNET_INET(tcp_inflight_min) -#define V_tcp_inflight_max VNET_INET(tcp_inflight_max) -#define V_tcp_inflight_stab VNET_INET(tcp_inflight_stab) -#define V_nolocaltimewait VNET_INET(nolocaltimewait) -#define V_path_mtu_discovery VNET_INET(path_mtu_discovery) -#define V_ss_fltsz VNET_INET(ss_fltsz) -#define V_ss_fltsz_local VNET_INET(ss_fltsz_local) -#define V_tcp_do_newreno VNET_INET(tcp_do_newreno) -#define V_tcp_do_tso VNET_INET(tcp_do_tso) -#define V_tcp_do_autosndbuf VNET_INET(tcp_do_autosndbuf) -#define V_tcp_autosndbuf_inc VNET_INET(tcp_autosndbuf_inc) -#define V_tcp_autosndbuf_max VNET_INET(tcp_autosndbuf_max) -#define V_tcp_do_sack VNET_INET(tcp_do_sack) -#define V_tcp_sack_maxholes VNET_INET(tcp_sack_maxholes) -#define V_tcp_sack_globalmaxholes VNET_INET(tcp_sack_globalmaxholes) -#define V_tcp_sack_globalholes VNET_INET(tcp_sack_globalholes) -#define V_blackhole VNET_INET(blackhole) -#define V_tcp_delack_enabled VNET_INET(tcp_delack_enabled) -#define V_drop_synfin VNET_INET(drop_synfin) -#define V_tcp_do_rfc3042 VNET_INET(tcp_do_rfc3042) -#define V_tcp_do_rfc3390 VNET_INET(tcp_do_rfc3390) -#define V_tcp_do_ecn VNET_INET(tcp_do_ecn) -#define V_tcp_ecn_maxretries VNET_INET(tcp_ecn_maxretries) -#define V_tcp_insecure_rst VNET_INET(tcp_insecure_rst) -#define V_tcp_do_autorcvbuf VNET_INET(tcp_do_autorcvbuf) -#define V_tcp_autorcvbuf_inc VNET_INET(tcp_autorcvbuf_inc) -#define V_tcp_autorcvbuf_max VNET_INET(tcp_autorcvbuf_max) -#define V_tcp_reass_maxseg VNET_INET(tcp_reass_maxseg) -#define V_tcp_reass_qsize VNET_INET(tcp_reass_qsize) -#define V_tcp_reass_maxqlen VNET_INET(tcp_reass_maxqlen) -#define V_tcp_reass_overflows VNET_INET(tcp_reass_overflows) - -#define V_isn_secret VNET_INET(isn_secret) -#define V_isn_last_reseed VNET_INET(isn_last_reseed) -#define V_isn_offset VNET_INET(isn_offset) -#define V_isn_offset_old VNET_INET(isn_offset_old) -#define V_isn_ctx VNET_INET(isn_ctx) - -#define V_udb VNET_INET(udb) -#define V_udbinfo VNET_INET(udbinfo) -#define V_udpstat VNET_INET(udpstat) - -#define V_ripcb VNET_INET(ripcb) -#define V_ripcbinfo VNET_INET(ripcbinfo) -#define V_ip_mrouter VNET_INET(ip_mrouter) - -#define V_rsvp_on VNET_INET(rsvp_on) -#define V_ip_rsvp_on VNET_INET(ip_rsvp_on) -#define V_ip_rsvpd VNET_INET(ip_rsvpd) - -#define V_icmpstat VNET_INET(icmpstat) -#define V_ipstat VNET_INET(ipstat) -#define V_igmpstat VNET_INET(igmpstat) - -#define V_router_info_head VNET_INET(router_info_head) - -#define V_rtq_timeout VNET_INET(rtq_timeout) -#define V_rtq_reallyold VNET_INET(rtq_reallyold) -#define V_rtq_minreallyold VNET_INET(rtq_minreallyold) -#define V_rtq_toomany VNET_INET(rtq_toomany) -#define V_rtq_timer VNET_INET(rtq_timer) - #define V_arp_maxtries VNET_INET(arp_maxtries) #define V_arp_proxyall VNET_INET(arp_proxyall) #define V_arpt_keep VNET_INET(arpt_keep) @@ -428,6 +333,4 @@ #define V_udpstat VNET_INET(udpstat) #define V_useloopback VNET_INET(useloopback) -#define V_divcb VNET_INET(divcb) -#define V_divcbinfo VNET_INET(divcbinfo) #endif /* !_NETINET_VINET_H_ */ ==== //depot/projects/vimage-commit/src/sys/netinet6/vinet6.h#3 (text+ko) ==== @@ -26,31 +26,26 @@ * 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. + * * $FreeBSD: src/sys/netinet6/vinet6.h,v 1.2 2008/11/19 09:39:34 zec Exp $ */ #ifndef _NETINET6_VINET6_H_ #define _NETINET6_VINET6_H_ +#ifdef VIMAGE +#include #include -#include -#include +#include #include #include -#include #include #include #include +#include #include - -#define INIT_VNET_INET6(vnet) \ - INIT_FROM_VNET(vnet, VNET_MOD_INET6, \ - struct vnet_inet6, vnet_inet6) - -#define VNET_INET6(sym) VSYM(vnet_inet6, sym) - +#include -#ifdef VIMAGE struct vnet_inet6 { struct in6_ifaddr * _in6_ifaddr; @@ -64,6 +59,9 @@ TAILQ_HEAD(, addrsel_policyent) _addrsel_policytab; u_int _in6_maxmtu; int _ip6_auto_linklocal; + int _rtq_minreallyold6; + int _rtq_reallyold6; + int _rtq_toomany6; struct ip6stat _ip6stat; struct rip6stat _rip6stat; @@ -90,8 +88,7 @@ int _dad_init; int _icmp6errpps_count; - //int _icmp6errppslim_last; - //int _icmp6_nodeinfo; + int _icmp6errppslim_last; int _ip6_forwarding; int _ip6_sendredirects; @@ -160,110 +157,11 @@ #endif -/* - * Symbol translation macros - */ -#define V_in6_ifaddr VNET_INET6(in6_ifaddr) +#define INIT_VNET_INET6(vnet) \ + INIT_FROM_VNET(vnet, VNET_MOD_INET6, struct vnet_inet6, vnet_inet6) -#define V_frag6_nfragpackets VNET_INET6(frag6_nfragpackets) -#define V_frag6_nfrags VNET_INET6(frag6_nfrags) -#define V_ip6q VNET_INET6(ip6q) - -#define V_ip6_forward_rt VNET_INET6(ip6_forward_rt) - -#define V_defaultaddrpolicy VNET_INET6(defaultaddrpolicy) -#define V_addrsel_policytab VNET_INET6(addrsel_policytab) -#define V_in6_maxmtu VNET_INET6(in6_maxmtu) -#define V_ip6_auto_linklocal VNET_INET6(ip6_auto_linklocal) - -#define V_ip6stat VNET_INET6(ip6stat) -#define V_rip6stat VNET_INET6(rip6stat) -#define V_icmp6stat VNET_INET6(icmp6stat) - -#define V_rtq_timeout6 VNET_INET6(rtq_timeout6) -#define V_rtq_timer6 VNET_INET6(rtq_timer6) -#define V_rtq_mtutimer VNET_INET6(rtq_mtutimer) -#define V_nd6_slowtimo_ch VNET_INET6(nd6_slowtimo_ch) -#define V_nd6_timer_ch VNET_INET6(nd6_timer_ch) -#define V_in6_tmpaddrtimer_ch VNET_INET6(in6_tmpaddrtimer_ch) - -#define V_nd6_inuse VNET_INET6(nd6_inuse) -#define V_nd6_allocated VNET_INET6(nd6_allocated) -#define V_llinfo_nd6 VNET_INET6(llinfo_nd6) -#define V_nd_defrouter VNET_INET6(nd_defrouter) -#define V_nd_prefix VNET_INET6(nd_prefix) -#define V_nd6_defifp VNET_INET6(nd6_defifp) -#define V_nd6_defifindex VNET_INET6(nd6_defifindex) - -#define V_sid_default VNET_INET6(sid_default) - -#define V_dadq VNET_INET6(dadq) -#define V_dad_init VNET_INET6(dad_init) +#define VNET_INET6(sym) VSYM(vnet_inet6, sym) -//#define V_icmp6errppslim VNET_INET6(icmp6errppslim) -#define V_icmp6errpps_count VNET_INET6(icmp6errpps_count) -//#define V_icmp6_nodeinfo VNET_INET6(icmp6_nodeinfo) - -#define V_ip6_forwarding VNET_INET6(ip6_forwarding) -#define V_ip6_sendredirects VNET_INET6(ip6_sendredirects) -#define V_ip6_defhlim VNET_INET6(ip6_defhlim) -#define V_ip6_defmcasthlim VNET_INET6(ip6_defmcasthlim) -#define V_ip6_accept_rtadv VNET_INET6(ip6_accept_rtadv) -#define V_ip6_maxfragpackets VNET_INET6(ip6_maxfragpackets) -#define V_ip6_maxfrags VNET_INET6(ip6_maxfrags) -#define V_ip6_log_interval VNET_INET6(ip6_log_interval) -#define V_ip6_hdrnestlimit VNET_INET6(ip6_hdrnestlimit) -#define V_ip6_dad_count VNET_INET6(ip6_dad_count) -#define V_ip6_auto_flowlabel VNET_INET6(ip6_auto_flowlabel) -#define V_ip6_use_deprecated VNET_INET6(ip6_use_deprecated) -#define V_ip6_rr_prune VNET_INET6(ip6_rr_prune) -#define V_ip6_mcast_pmtu VNET_INET6(ip6_mcast_pmtu) -#define V_ip6_v6only VNET_INET6(ip6_v6only) -#define V_ip6_keepfaith VNET_INET6(ip6_keepfaith) -#define V_ip6stealth VNET_INET6(ip6stealth) -#define V_ip6_log_time VNET_INET6(ip6_log_time) - -#define V_pmtu_expire VNET_INET6(pmtu_expire) -#define V_pmtu_probe VNET_INET6(pmtu_probe) -#define V_rip6_sendspace VNET_INET6(rip6_sendspace) -#define V_rip6_recvspace VNET_INET6(rip6_recvspace) -#define V_icmp6_rediraccept VNET_INET6(icmp6_rediraccept) -#define V_icmp6_redirtimeout VNET_INET6(icmp6_redirtimeout) -#define V_icmp6errppslim VNET_INET6(icmp6errppslim) -#define V_icmp6_nodeinfo VNET_INET6(icmp6_nodeinfo) -#define V_udp6_sendspace VNET_INET6(udp6_sendspace) -#define V_udp6_recvspace VNET_INET6(udp6_recvspace) -//#define V_icmp6errppslim_last VNET_INET6(icmp6errppslim_last) -#define V_ip6_prefer_tempaddr VNET_INET6(ip6_prefer_tempaddr) -#define V_ip6qmaxlen VNET_INET6(ip6qmaxlen) -#define V_ip6_forward_srcrt VNET_INET6(ip6_forward_srcrt) -#define V_ip6_sourcecheck VNET_INET6(ip6_sourcecheck) -#define V_ip6_sourcecheck_interval VNET_INET6(ip6_sourcecheck_interval) -#define V_ip6_ours_check_algorithm VNET_INET6(ip6_ours_check_algorithm) -#define V_nd6_prune VNET_INET6(nd6_prune) -#define V_nd6_delay VNET_INET6(nd6_delay) -#define V_nd6_umaxtries VNET_INET6(nd6_umaxtries) -#define V_nd6_mmaxtries VNET_INET6(nd6_mmaxtries) -#define V_nd6_useloopback VNET_INET6(nd6_useloopback) -#define V_nd6_gctimer VNET_INET6(nd6_gctimer) -#define V_nd6_maxndopt VNET_INET6(nd6_maxndopt) -#define V_nd6_maxnudhint VNET_INET6(nd6_maxnudhint) -#define V_nd6_maxqueuelen VNET_INET6(nd6_maxqueuelen) -#define V_nd6_debug VNET_INET6(nd6_debug) -#define V_nd6_recalc_reachtm_interval VNET_INET6(nd6_recalc_reachtm_interval) -#define V_dad_ignore_ns VNET_INET6(dad_ignore_ns) -#define V_dad_maxtry VNET_INET6(dad_maxtry) -#define V_ip6_use_tempaddr VNET_INET6(ip6_use_tempaddr) -#define V_ip6_desync_factor VNET_INET6(ip6_desync_factor) -#define V_ip6_temp_preferred_lifetime VNET_INET6(ip6_temp_preferred_lifetime) -#define V_ip6_temp_valid_lifetime VNET_INET6(ip6_temp_valid_lifetime) - -#define V_ip6_mrouter_ver VNET_INET6(ip6_mrouter_ver) -#define V_pim6 VNET_INET6(pim6) -#define V_mrt6debug VNET_INET6(mrt6debug) -#define V_ip6_temp_regen_advance VNET_INET6(ip6_temp_regen_advance) - -#define V_ip6_use_defzone VNET_INET6(ip6_use_defzone) /* * Symbol translation macros ==== //depot/projects/vimage-commit/src/sys/netipsec/vipsec.h#3 (text+ko) ==== @@ -26,13 +26,13 @@ * 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. + * * $FreeBSD: src/sys/netipsec/vipsec.h,v 1.2 2008/11/26 22:32:07 zec Exp $ */ #ifndef _NETIPSEC_VIPSEC_H_ #define _NETIPSEC_VIPSEC_H_ - #ifdef VIMAGE #include #include @@ -52,34 +52,34 @@ #include struct vnet_ipsec { - int _ipsec_debug; + int _ipsec_debug; struct ipsecstat _ipsec4stat; struct secpolicy _ip4_def_policy; - int _ip4_esp_trans_deflev; - int _ip4_esp_net_deflev; - int _ip4_ah_trans_deflev; - int _ip4_ah_net_deflev; - int _ip4_ah_offsetmask; - int _ip4_ipsec_dfbit; - int _ip4_ipsec_ecn; - int _ip4_esp_randpad; + int _ip4_esp_trans_deflev; + int _ip4_esp_net_deflev; + int _ip4_ah_trans_deflev; + int _ip4_ah_net_deflev; + int _ip4_ah_offsetmask; + int _ip4_ipsec_dfbit; + int _ip4_ipsec_ecn; + int _ip4_esp_randpad; - int _ipsec_replay; - int _ipsec_integrity; - int _crypto_support; + int _ipsec_replay; + int _ipsec_integrity; + int _crypto_support; - u_int32_t _key_debug_level; - u_int _key_spi_trycnt; - u_int32_t _key_spi_minval; - u_int32_t _key_spi_maxval; - u_int32_t _policy_id; - u_int _key_int_random; - u_int _key_larval_lifetime; - int _key_blockacq_count; - int _key_blockacq_lifetime; - int _key_preferred_oldsa; - u_int32_t _acq_seq; + u_int32_t _key_debug_level; + u_int _key_spi_trycnt; + u_int32_t _key_spi_minval; + u_int32_t _key_spi_maxval; + u_int32_t _policy_id; + u_int _key_int_random; + u_int _key_larval_lifetime; + int _key_blockacq_count; + int _key_blockacq_lifetime; + int _key_preferred_oldsa; + u_int32_t _acq_seq; int _esp_enable; struct espstat _espstat; @@ -117,50 +117,29 @@ /* * Symbol translation macros */ -#define INIT_VNET_IPSEC(vnet) \ +#define INIT_VNET_IPSEC(vnet) \ INIT_FROM_VNET(vnet, VNET_MOD_IPSEC, struct vnet_ipsec, vnet_ipsec) -#define VNET_IPSEC(sym) VSYM(vnet_ipsec, sym) +#define VNET_IPSEC(sym) VSYM(vnet_ipsec, sym) -#define V_ipsec_debug VNET_IPSEC(ipsec_debug) -#define V_ipsec4stat VNET_IPSEC(ipsec4stat) -#define V_ip4_def_policy VNET_IPSEC(ip4_def_policy) -#define V_ip4_ah_offsetmask VNET_IPSEC(ip4_ah_offsetmask) -#define V_ip4_ipsec_dfbit VNET_IPSEC(ip4_ipsec_dfbit) -#define V_ip4_esp_trans_deflev VNET_IPSEC(ip4_esp_trans_deflev) -#define V_ip4_esp_net_deflev VNET_IPSEC(ip4_esp_net_deflev) -#define V_ip4_ah_trans_deflev VNET_IPSEC(ip4_ah_trans_deflev) -#define V_ip4_ah_net_deflev VNET_IPSEC(ip4_ah_net_deflev) -#define V_ip4_ipsec_ecn VNET_IPSEC(ip4_ipsec_ecn) -#define V_ip4_esp_randpad VNET_IPSEC(ip4_esp_randpad) -#define V_ipsec_replay VNET_IPSEC(ipsec_replay) -#define V_ipsec_integrity VNET_IPSEC(ipsec_integrity) -#define V_crypto_support VNET_IPSEC(crypto_support) -#define V_key_debug_level VNET_IPSEC(key_debug_level) -#define V_key_spi_trycnt VNET_IPSEC(key_spi_trycnt) -#define V_key_spi_minval VNET_IPSEC(key_spi_minval) -#define V_key_spi_maxval VNET_IPSEC(key_spi_maxval) -#define V_policy_id VNET_IPSEC(policy_id) -#define V_key_int_random VNET_IPSEC(key_int_random) -#define V_key_larval_lifetime VNET_IPSEC(key_larval_lifetime) -#define V_key_blockacq_count VNET_IPSEC(key_blockacq_count) -#define V_key_blockacq_lifetime VNET_IPSEC(key_blockacq_lifetime) -#define V_key_preferred_oldsa VNET_IPSEC(key_preferred_oldsa) -#define V_acq_seq VNET_IPSEC(acq_seq) -#define V_saorder_state_alive VNET_IPSEC(saorder_state_alive) -#define V_saorder_state_any VNET_IPSEC(saorder_state_any) -#define V_esp_enable VNET_IPSEC(esp_enable) -#define V_espstat VNET_IPSEC(espstat) -#define V_esp_max_ivlen VNET_IPSEC(esp_max_ivlen) -#define V_ipsec_esp_keymin VNET_IPSEC(ipsec_esp_keymin) -#define V_ipsec_esp_auth VNET_IPSEC(ipsec_esp_auth) -#define V_ipsec_ah_keymin VNET_IPSEC(ipsec_ah_keymin) -#define V_ipip_allow VNET_IPSEC(ipip_allow) -#define V_ipipstat VNET_IPSEC(ipipstat) -#define V_ipsec6stat VNET_IPSEC(ipsec6stat) -#define V_ip6_esp_trans_deflev VNET_IPSEC(ip6_esp_trans_deflev) -#define V_ip6_esp_net_deflev VNET_IPSEC(ip6_esp_net_deflev) -#define V_ip6_ah_trans_deflev VNET_IPSEC(ip6_ah_trans_deflev) +#define V_acq_seq VNET_IPSEC(acq_seq) +#define V_acqtree VNET_IPSEC(acqtree) +#define V_ah_cleartos VNET_IPSEC(ah_cleartos) +#define V_ah_enable VNET_IPSEC(ah_enable) +#define V_ahstat VNET_IPSEC(ahstat) +#define V_crypto_support VNET_IPSEC(crypto_support) +#define V_esp_enable VNET_IPSEC(esp_enable) +#define V_esp_max_ivlen VNET_IPSEC(esp_max_ivlen) +#define V_espstat VNET_IPSEC(espstat) +#define V_ip4_ah_net_deflev VNET_IPSEC(ip4_ah_net_deflev) +#define V_ip4_ah_offsetmask VNET_IPSEC(ip4_ah_offsetmask) +#define V_ip4_ah_trans_deflev VNET_IPSEC(ip4_ah_trans_deflev) +#define V_ip4_def_policy VNET_IPSEC(ip4_def_policy) +#define V_ip4_esp_net_deflev VNET_IPSEC(ip4_esp_net_deflev) +#define V_ip4_esp_randpad VNET_IPSEC(ip4_esp_randpad) +#define V_ip4_esp_trans_deflev VNET_IPSEC(ip4_esp_trans_deflev) +#define V_ip4_ipsec_dfbit VNET_IPSEC(ip4_ipsec_dfbit) +#define V_ip4_ipsec_ecn VNET_IPSEC(ip4_ipsec_ecn) #define V_ip6_ah_net_deflev VNET_IPSEC(ip6_ah_net_deflev) #define V_ip6_ah_trans_deflev VNET_IPSEC(ip6_ah_trans_deflev) #define V_ip6_esp_net_deflev VNET_IPSEC(ip6_esp_net_deflev) From owner-p4-projects@FreeBSD.ORG Thu Nov 27 03:34:19 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id CAACD106567A; Thu, 27 Nov 2008 03:34:18 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 6919F1065670 for ; Thu, 27 Nov 2008 03:34:18 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 61D9D8FC0A for ; Thu, 27 Nov 2008 03:34:18 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAR3YIYS042697 for ; Thu, 27 Nov 2008 03:34:18 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAR3XBr1042613 for perforce@freebsd.org; Thu, 27 Nov 2008 03:33:11 GMT (envelope-from weongyo@FreeBSD.org) Date: Thu, 27 Nov 2008 03:33:11 GMT Message-Id: <200811270333.mAR3XBr1042613@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 153651 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, 27 Nov 2008 03:34:19 -0000 http://perforce.freebsd.org/chv.cgi?CH=153651 Change 153651 by weongyo@weongyo_ws on 2008/11/27 03:33:05 IFC Affected files ... .. //depot/projects/ndisusb/Makefile#3 integrate .. //depot/projects/ndisusb/Makefile.inc1#3 integrate .. //depot/projects/ndisusb/ObsoleteFiles.inc#4 integrate .. //depot/projects/ndisusb/UPDATING#4 integrate .. //depot/projects/ndisusb/bin/Makefile#2 integrate .. //depot/projects/ndisusb/bin/cat/cat.c#2 integrate .. //depot/projects/ndisusb/bin/chio/chio.c#2 integrate .. //depot/projects/ndisusb/bin/cp/utils.c#2 integrate .. //depot/projects/ndisusb/bin/df/df.1#2 integrate .. //depot/projects/ndisusb/bin/df/df.c#2 integrate .. //depot/projects/ndisusb/bin/echo/echo.c#2 integrate .. //depot/projects/ndisusb/bin/pkill/Makefile#1 branch .. //depot/projects/ndisusb/bin/pkill/pkill.1#1 branch .. //depot/projects/ndisusb/bin/pkill/pkill.c#1 branch .. //depot/projects/ndisusb/bin/ps/print.c#2 integrate .. //depot/projects/ndisusb/bin/rcp/rcp.c#2 integrate .. //depot/projects/ndisusb/bin/setfacl/setfacl.c#2 integrate .. //depot/projects/ndisusb/bin/sh/eval.c#2 integrate .. //depot/projects/ndisusb/bin/sh/miscbltin.c#2 integrate .. //depot/projects/ndisusb/bin/sh/mknodes.c#2 integrate .. //depot/projects/ndisusb/bin/sh/options.c#2 integrate .. //depot/projects/ndisusb/bin/sh/sh.1#2 integrate .. //depot/projects/ndisusb/bin/stty/gfmt.c#2 integrate .. //depot/projects/ndisusb/bin/stty/modes.c#2 integrate .. //depot/projects/ndisusb/bin/stty/print.c#3 integrate .. //depot/projects/ndisusb/bin/stty/stty.1#2 integrate .. //depot/projects/ndisusb/cddl/Makefile.inc#2 integrate .. //depot/projects/ndisusb/cddl/compat/opensolaris/include/libshare.h#1 branch .. //depot/projects/ndisusb/cddl/compat/opensolaris/include/mnttab.h#2 integrate .. //depot/projects/ndisusb/cddl/compat/opensolaris/misc/deviceid.c#2 integrate .. //depot/projects/ndisusb/cddl/compat/opensolaris/misc/mnttab.c#2 integrate .. //depot/projects/ndisusb/cddl/compat/opensolaris/misc/zmount.c#2 integrate .. //depot/projects/ndisusb/cddl/compat/opensolaris/misc/zone.c#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/cmd/zdb/zdb.8#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/cmd/zdb/zdb.c#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/cmd/zfs/zfs.8#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/cmd/zinject/translate.c#1 branch .. //depot/projects/ndisusb/cddl/contrib/opensolaris/cmd/zinject/zinject.c#1 branch .. //depot/projects/ndisusb/cddl/contrib/opensolaris/cmd/zinject/zinject.h#1 branch .. //depot/projects/ndisusb/cddl/contrib/opensolaris/cmd/zpool/zpool.8#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/cmd/zpool/zpool_iter.c#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/cmd/zpool/zpool_util.c#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/cmd/ztest/ztest.c#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/head/assert.h#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/head/libintl.h#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/head/synch.h#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/head/thread.h#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.h#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.h#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/lib/libuutil/common/libuutil.h#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/lib/libuutil/common/uu_avl.c#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/lib/libuutil/common/uu_list.c#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#1 branch .. //depot/projects/ndisusb/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#2 integrate .. //depot/projects/ndisusb/cddl/contrib/opensolaris/lib/libzpool/common/util.c#2 integrate .. //depot/projects/ndisusb/cddl/lib/libzfs/Makefile#2 integrate .. //depot/projects/ndisusb/cddl/lib/libzpool/Makefile#2 integrate .. //depot/projects/ndisusb/cddl/sbin/zpool/Makefile#2 integrate .. //depot/projects/ndisusb/cddl/usr.bin/Makefile#2 integrate .. //depot/projects/ndisusb/cddl/usr.bin/zinject/Makefile#1 branch .. //depot/projects/ndisusb/cddl/usr.bin/ztest/Makefile#2 integrate .. //depot/projects/ndisusb/cddl/usr.sbin/zdb/Makefile#2 integrate .. //depot/projects/ndisusb/contrib/bind9/CHANGES#3 integrate .. //depot/projects/ndisusb/contrib/bind9/COPYRIGHT#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/dig/dighost.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/client.c#3 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/config.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/controlconf.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/interfacemgr.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/lwresd.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/named.conf.docbook#2 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/named/server.c#3 integrate .. //depot/projects/ndisusb/contrib/bind9/bin/rndc/rndc.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/configure.in#2 integrate .. //depot/projects/ndisusb/contrib/bind9/doc/arm/Bv9ARM-book.xml#3 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind/configure.in#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/bind9/check.c#3 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/api#3 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/dispatch.c#3 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/include/dns/dispatch.h#3 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/request.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/resolver.c#3 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/dns/xfrin.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/api#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/include/isc/resource.h#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/include/isc/socket.h#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/include/isc/timer.h#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/timer.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/unix/app.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/unix/resource.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/unix/socket.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isc/unix/socket_p.h#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isccfg/api#2 integrate .. //depot/projects/ndisusb/contrib/bind9/lib/isccfg/namedconf.c#2 integrate .. //depot/projects/ndisusb/contrib/bind9/version#3 integrate .. //depot/projects/ndisusb/contrib/cvs/doc/HACKING.DOCS#2 integrate .. //depot/projects/ndisusb/contrib/gcc/common.opt#2 integrate .. //depot/projects/ndisusb/contrib/gcc/config/arm/arm.h#2 integrate .. //depot/projects/ndisusb/contrib/gcc/config/freebsd-spec.h#2 integrate .. //depot/projects/ndisusb/contrib/gcc/config/freebsd.h#2 integrate .. //depot/projects/ndisusb/contrib/gcc/config/i386/freebsd.h#3 integrate .. //depot/projects/ndisusb/contrib/gcc/config/i386/freebsd64.h#2 integrate .. //depot/projects/ndisusb/contrib/gcc/config/mips/freebsd.h#1 branch .. //depot/projects/ndisusb/contrib/gcc/doc/invoke.texi#2 integrate .. //depot/projects/ndisusb/contrib/gdb/gdb/arm-tdep.c#2 integrate .. //depot/projects/ndisusb/contrib/gdtoa/README#2 integrate .. //depot/projects/ndisusb/contrib/gdtoa/dtoa.c#2 integrate .. //depot/projects/ndisusb/contrib/gdtoa/gdtoa.h#2 integrate .. //depot/projects/ndisusb/contrib/gdtoa/gdtoaimp.h#2 integrate .. //depot/projects/ndisusb/contrib/gdtoa/gethex.c#3 integrate .. //depot/projects/ndisusb/contrib/gdtoa/strtoIg.c#2 integrate .. //depot/projects/ndisusb/contrib/gdtoa/strtod.c#2 integrate .. //depot/projects/ndisusb/contrib/gdtoa/strtodg.c#2 integrate .. //depot/projects/ndisusb/contrib/gdtoa/strtof.c#2 integrate .. //depot/projects/ndisusb/contrib/gdtoa/test/README#2 integrate .. //depot/projects/ndisusb/contrib/gdtoa/test/f.out#2 integrate .. //depot/projects/ndisusb/contrib/gdtoa/test/getround.c#2 integrate .. //depot/projects/ndisusb/contrib/gdtoa/test/xsum0.out#2 integrate .. //depot/projects/ndisusb/contrib/gdtoa/xsum0.out#2 integrate .. //depot/projects/ndisusb/contrib/ipfilter/ip_fil.c#2 integrate .. //depot/projects/ndisusb/contrib/ipfilter/ipsend/iptests.c#2 integrate .. //depot/projects/ndisusb/contrib/ipfilter/ipsend/sock.c#3 integrate .. //depot/projects/ndisusb/contrib/ipfilter/lib/printnat.c#2 integrate .. //depot/projects/ndisusb/contrib/ipfilter/test/regress/n12#2 integrate .. //depot/projects/ndisusb/contrib/ipfilter/test/regress/n2#2 integrate .. //depot/projects/ndisusb/contrib/ipfilter/test/regress/n5#2 integrate .. //depot/projects/ndisusb/contrib/ipfilter/test/regress/ni1.nat#2 integrate .. //depot/projects/ndisusb/contrib/ipfilter/test/regress/ni2.nat#2 integrate .. //depot/projects/ndisusb/contrib/ipfilter/test/regress/ni4.nat#2 integrate .. //depot/projects/ndisusb/contrib/ipfilter/tools/ipnat_y.y#2 integrate .. //depot/projects/ndisusb/contrib/libpcap/pcap-bpf.c#2 integrate .. //depot/projects/ndisusb/contrib/libpcap/pcap-int.h#2 integrate .. //depot/projects/ndisusb/contrib/libpcap/pcap.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ANNOUNCE#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/FREEBSD-upgrade#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/FREEBSD-vendor#3 delete .. //depot/projects/ndisusb/contrib/ncurses/INSTALL#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/MANIFEST#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/NEWS#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/TO-DO#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/aclocal.m4#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/announce.html.in#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/config.guess#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/config.sub#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/configure#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/configure.in#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/dist.mk#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/doc/html/announce.html#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/form/form.priv.h#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/form/frm_def.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/form/frm_driver.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/form/frm_req_name.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/include/MKterm.h.awk.in#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/include/capdefaults.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/include/curses.h.in#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/include/curses.tail#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/include/nc_alloc.h#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/include/nc_panel.h#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/include/ncurses_defs#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/include/term_entry.h#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/man/curs_getcchar.3x#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/man/curs_memleaks.3x#1 branch .. //depot/projects/ndisusb/contrib/ncurses/man/curs_terminfo.3x#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/man/curs_util.3x#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/man/form.3x#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/man/form_driver.3x#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/man/form_field_buffer.3x#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/man/man_db.renames#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/man/menu_attributes.3x#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/man/menu_driver.3x#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/man/menu_pattern.3x#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/man/ncurses.3x#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/menu/m_driver.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/menu/m_req_name.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/misc/ncu-indent#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/misc/ncurses.supp#1 branch .. //depot/projects/ndisusb/contrib/ncurses/misc/terminfo.src#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/base/MKkeyname.awk#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/base/MKlib_gen.sh#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/base/MKunctrl.awk#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/base/lib_addch.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/base/lib_delwin.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/base/lib_freeall.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/base/lib_getch.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/base/lib_getstr.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/base/lib_initscr.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/base/lib_mouse.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/base/lib_newterm.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/base/lib_newwin.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/base/lib_overlay.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/base/lib_restart.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/base/lib_screen.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/base/lib_set_term.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/base/lib_slk.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/base/lib_slkrefr.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/base/lib_ungetch.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/base/lib_window.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/base/resizeterm.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/base/tries.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/base/use_window.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/base/wresize.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/curses.priv.h#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/fifo_defs.h#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/llib-lncurses#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/llib-lncursest#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/llib-lncursesw#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/tinfo/MKcodes.awk#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/tinfo/MKnames.awk#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/tinfo/alloc_entry.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/tinfo/alloc_ttype.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/tinfo/captoinfo.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/tinfo/comp_expand.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/tinfo/comp_hash.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/tinfo/comp_parse.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/tinfo/comp_scan.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/tinfo/entries.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/tinfo/home_terminfo.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/tinfo/init_keytry.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/tinfo/lib_acs.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/tinfo/lib_baudrate.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/tinfo/lib_cur_term.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/tinfo/lib_data.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/tinfo/lib_options.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/tinfo/lib_raw.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/tinfo/lib_setup.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/tinfo/lib_termcap.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/tinfo/lib_tgoto.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/tinfo/lib_tparm.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/tinfo/lib_tputs.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/tinfo/make_keys.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/tinfo/name_match.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/tinfo/parse_entry.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/tinfo/read_entry.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/tinfo/use_screen.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/tinfo/write_entry.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/trace/lib_trace.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/trace/lib_traceatr.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/trace/lib_tracebits.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/trace/lib_tracechr.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/trace/lib_tracedmp.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/trace/lib_tracemse.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/trace/trace_buf.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/trace/trace_tries.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/trace/varargs.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/trace/visbuf.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/tty/hardscroll.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/tty/lib_mvcur.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/tty/lib_twait.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/tty/tty_update.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/widechar/charable.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/widechar/lib_get_wch.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/widechar/lib_get_wstr.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/widechar/lib_key_name.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/ncurses/widechar/lib_unget_wch.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/panel/p_new.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/panel/panel.priv.h#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/progs/MKtermsort.sh#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/progs/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/progs/dump_entry.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/progs/dump_entry.h#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/progs/infocmp.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/progs/progs.priv.h#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/progs/tic.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/progs/toe.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/progs/tput.c#2 integrate .. //depot/projects/ndisusb/contrib/ncurses/progs/tset.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/COPYRIGHT#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ChangeLog#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ChangeLog-4.1.0#2 delete .. //depot/projects/ndisusb/contrib/ntp/CommitLog#1 branch .. //depot/projects/ndisusb/contrib/ntp/CommitLog-4.1.0#1 branch .. //depot/projects/ndisusb/contrib/ntp/FREEBSD-Xlist#2 delete .. //depot/projects/ndisusb/contrib/ntp/FREEBSD-upgrade#2 delete .. //depot/projects/ndisusb/contrib/ntp/INSTALL#2 integrate .. //depot/projects/ndisusb/contrib/ntp/Makefile.am#2 integrate .. //depot/projects/ndisusb/contrib/ntp/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/ntp/NEWS#2 integrate .. //depot/projects/ndisusb/contrib/ntp/README#2 integrate .. //depot/projects/ndisusb/contrib/ntp/README.bk#2 integrate .. //depot/projects/ndisusb/contrib/ntp/README.patches#2 integrate .. //depot/projects/ndisusb/contrib/ntp/README.refclocks#2 integrate .. //depot/projects/ndisusb/contrib/ntp/README.versions#2 integrate .. //depot/projects/ndisusb/contrib/ntp/TODO#2 integrate .. //depot/projects/ndisusb/contrib/ntp/WHERE-TO-START#2 integrate .. //depot/projects/ndisusb/contrib/ntp/acinclude.m4#2 delete .. //depot/projects/ndisusb/contrib/ntp/aclocal.m4#2 integrate .. //depot/projects/ndisusb/contrib/ntp/adjtimed/Makefile.am#2 integrate .. //depot/projects/ndisusb/contrib/ntp/adjtimed/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/ntp/arlib/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/ntp/arlib/aclocal.m4#2 integrate .. //depot/projects/ndisusb/contrib/ntp/arlib/configure#2 integrate .. //depot/projects/ndisusb/contrib/ntp/arlib/depcomp#2 integrate .. //depot/projects/ndisusb/contrib/ntp/arlib/install-sh#2 integrate .. //depot/projects/ndisusb/contrib/ntp/arlib/missing#2 integrate .. //depot/projects/ndisusb/contrib/ntp/arlib/mkinstalldirs#2 delete .. //depot/projects/ndisusb/contrib/ntp/bincheck.mf#1 branch .. //depot/projects/ndisusb/contrib/ntp/bootstrap#1 branch .. //depot/projects/ndisusb/contrib/ntp/build#2 integrate .. //depot/projects/ndisusb/contrib/ntp/clockstuff/Makefile.am#2 integrate .. //depot/projects/ndisusb/contrib/ntp/clockstuff/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/ntp/clockstuff/clktest.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/clockstuff/propdelay.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/compile#2 integrate .. //depot/projects/ndisusb/contrib/ntp/config.guess#2 integrate .. //depot/projects/ndisusb/contrib/ntp/config.h.in#2 integrate .. //depot/projects/ndisusb/contrib/ntp/config.sub#2 integrate .. //depot/projects/ndisusb/contrib/ntp/configure#2 integrate .. //depot/projects/ndisusb/contrib/ntp/configure.ac#1 branch .. //depot/projects/ndisusb/contrib/ntp/configure.in#2 delete .. //depot/projects/ndisusb/contrib/ntp/depcomp#2 integrate .. //depot/projects/ndisusb/contrib/ntp/flock-build#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/accopt.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/assoc.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/audio.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/authopt.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/build.html#2 delete .. //depot/projects/ndisusb/contrib/ntp/html/build/build.html#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/config.html#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/hints.html#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/hints/a-ux#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/hints/aix#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/hints/bsdi#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/hints/changes#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/hints/decosf1#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/hints/decosf2#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/hints/freebsd#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/hints/hpux#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/hints/linux#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/hints/mpeix#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/hints/netbsd#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/hints/notes-xntp-v3#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/hints/parse#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/hints/refclocks#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/hints/rs6000#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/hints/sco.html#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/hints/sgi#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/hints/solaris-dosynctodr.html#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/hints/solaris.html#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/hints/solaris.xtra.4023118#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/hints/solaris.xtra.S99ntpd#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/hints/solaris.xtra.patchfreq#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/hints/sun4#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/hints/svr4-dell#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/hints/svr4_package#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/hints/todo#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/hints/vxworks.html#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/hints/winnt.html#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/patches.html#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/porting.html#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/quick.html#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/scripts/footer.txt#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/scripts/links10.txt#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/scripts/links11.txt#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/scripts/links12.txt#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/scripts/links7.txt#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/scripts/links8.txt#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/scripts/links9.txt#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/build/scripts/style.css#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/clockopt.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/config.html#2 delete .. //depot/projects/ndisusb/contrib/ntp/html/confopt.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/copyright.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/debug.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/drivers/driver1.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/drivers/driver10.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/drivers/driver11.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/drivers/driver12.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/drivers/driver16.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/drivers/driver18.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/drivers/driver19.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/drivers/driver2.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/drivers/driver20.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/drivers/driver22.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/drivers/driver23.html#2 delete .. //depot/projects/ndisusb/contrib/ntp/html/drivers/driver24.html#2 delete .. //depot/projects/ndisusb/contrib/ntp/html/drivers/driver26.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/drivers/driver27.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/drivers/driver28.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/drivers/driver29.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/drivers/driver3.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/drivers/driver30.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/drivers/driver31.html#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/drivers/driver32.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/drivers/driver33.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/drivers/driver34.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/drivers/driver35.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/drivers/driver36.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/drivers/driver37.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/drivers/driver38.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/drivers/driver39.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/drivers/driver4.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/drivers/driver40.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/drivers/driver42.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/drivers/driver43.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/drivers/driver44.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/drivers/driver5.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/drivers/driver6.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/drivers/driver7.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/drivers/driver8.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/drivers/driver9.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/drivers/oncore-shmem.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/drivers/scripts/footer.txt#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/drivers/scripts/style.css#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/drivers/tf582_4.html#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/extern.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/gadget.html#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/groups.html#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/hints.html#2 delete .. //depot/projects/ndisusb/contrib/ntp/html/hints/a-ux#2 delete .. //depot/projects/ndisusb/contrib/ntp/html/hints/aix#2 delete .. //depot/projects/ndisusb/contrib/ntp/html/hints/bsdi#2 delete .. //depot/projects/ndisusb/contrib/ntp/html/hints/changes#2 delete .. //depot/projects/ndisusb/contrib/ntp/html/hints/decosf1#2 delete .. //depot/projects/ndisusb/contrib/ntp/html/hints/decosf2#2 delete .. //depot/projects/ndisusb/contrib/ntp/html/hints/freebsd#2 delete .. //depot/projects/ndisusb/contrib/ntp/html/hints/hpux#2 delete .. //depot/projects/ndisusb/contrib/ntp/html/hints/linux#2 delete .. //depot/projects/ndisusb/contrib/ntp/html/hints/mpeix#2 delete .. //depot/projects/ndisusb/contrib/ntp/html/hints/netbsd#2 delete .. //depot/projects/ndisusb/contrib/ntp/html/hints/notes-xntp-v3#2 delete .. //depot/projects/ndisusb/contrib/ntp/html/hints/parse#2 delete .. //depot/projects/ndisusb/contrib/ntp/html/hints/refclocks#2 delete .. //depot/projects/ndisusb/contrib/ntp/html/hints/rs6000#2 delete .. //depot/projects/ndisusb/contrib/ntp/html/hints/sco.html#2 delete .. //depot/projects/ndisusb/contrib/ntp/html/hints/sgi#2 delete .. //depot/projects/ndisusb/contrib/ntp/html/hints/solaris-dosynctodr.html#2 delete .. //depot/projects/ndisusb/contrib/ntp/html/hints/solaris.html#2 delete .. //depot/projects/ndisusb/contrib/ntp/html/hints/solaris.xtra.4023118#2 delete .. //depot/projects/ndisusb/contrib/ntp/html/hints/solaris.xtra.4095849#2 delete .. //depot/projects/ndisusb/contrib/ntp/html/hints/solaris.xtra.S99ntpd#2 delete .. //depot/projects/ndisusb/contrib/ntp/html/hints/solaris.xtra.patchfreq#2 delete .. //depot/projects/ndisusb/contrib/ntp/html/hints/sun4#2 delete .. //depot/projects/ndisusb/contrib/ntp/html/hints/svr4-dell#2 delete .. //depot/projects/ndisusb/contrib/ntp/html/hints/svr4_package#2 delete .. //depot/projects/ndisusb/contrib/ntp/html/hints/todo#2 delete .. //depot/projects/ndisusb/contrib/ntp/html/hints/vxworks.html#2 delete .. //depot/projects/ndisusb/contrib/ntp/html/hints/winnt.html#2 delete .. //depot/projects/ndisusb/contrib/ntp/html/howto.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/index.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/kern.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/keygen.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/ldisc.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/manyopt.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/measure.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/miscopt.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/monopt.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/msyslog.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/mx4200data.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/notes.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/ntp_conf.html#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/ntpd.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/ntpdate.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/ntpdc.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/ntpdsim.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/ntpdsim_new.html#1 branch .. //depot/projects/ndisusb/contrib/ntp/html/ntpq.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/ntptime.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/ntptrace.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/parsedata.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/parsenew.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/patches.html#2 delete .. //depot/projects/ndisusb/contrib/ntp/html/porting.html#2 delete .. //depot/projects/ndisusb/contrib/ntp/html/pps.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/prefer.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/quick.html#2 delete .. //depot/projects/ndisusb/contrib/ntp/html/rdebug.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/refclock.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/release.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/scripts/links11.txt#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/scripts/links7.txt#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/scripts/links8.txt#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/scripts/links9.txt#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/sntp.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/html/tickadj.html#2 integrate .. //depot/projects/ndisusb/contrib/ntp/include/Makefile.am#2 integrate .. //depot/projects/ndisusb/contrib/ntp/include/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/ntp/include/adjtime.h#2 integrate .. //depot/projects/ndisusb/contrib/ntp/include/ascii.h#2 integrate .. //depot/projects/ndisusb/contrib/ntp/include/autogen-version.def#1 branch .. //depot/projects/ndisusb/contrib/ntp/include/binio.h#2 integrate .. //depot/projects/ndisusb/contrib/ntp/include/copyright.def#1 branch .. //depot/projects/ndisusb/contrib/ntp/include/debug-opt.def#1 branch .. //depot/projects/ndisusb/contrib/ntp/include/homerc.def#1 branch .. //depot/projects/ndisusb/contrib/ntp/include/ieee754io.h#2 integrate .. //depot/projects/ndisusb/contrib/ntp/include/isc/Makefile.am#2 integrate .. //depot/projects/ndisusb/contrib/ntp/include/isc/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/ntp/include/isc/buffer.h#1 branch .. //depot/projects/ndisusb/contrib/ntp/include/isc/interfaceiter.h#2 integrate .. //depot/projects/ndisusb/contrib/ntp/include/isc/ipv6.h#2 integrate .. //depot/projects/ndisusb/contrib/ntp/include/isc/msgs.h#2 integrate .. //depot/projects/ndisusb/contrib/ntp/include/isc/net.h#2 integrate .. //depot/projects/ndisusb/contrib/ntp/include/isc/netaddr.h#2 integrate .. //depot/projects/ndisusb/contrib/ntp/include/isc/netscope.h#1 branch .. //depot/projects/ndisusb/contrib/ntp/include/isc/region.h#1 branch .. //depot/projects/ndisusb/contrib/ntp/include/isc/result.h#2 integrate .. //depot/projects/ndisusb/contrib/ntp/include/isc/sockaddr.h#2 integrate .. //depot/projects/ndisusb/contrib/ntp/include/l_stdlib.h#2 integrate .. //depot/projects/ndisusb/contrib/ntp/include/mbg_gps166.h#2 integrate .. //depot/projects/ndisusb/contrib/ntp/include/ntp.h#2 integrate .. //depot/projects/ndisusb/contrib/ntp/include/ntp_config.h#2 integrate .. //depot/projects/ndisusb/contrib/ntp/include/ntp_control.h#2 integrate .. //depot/projects/ndisusb/contrib/ntp/include/ntp_crypto.h#2 integrate .. //depot/projects/ndisusb/contrib/ntp/include/ntp_debug.h#1 branch .. //depot/projects/ndisusb/contrib/ntp/include/ntp_filegen.h#2 integrate .. //depot/projects/ndisusb/contrib/ntp/include/ntp_fp.h#2 integrate .. //depot/projects/ndisusb/contrib/ntp/include/ntp_machine.h#2 integrate .. //depot/projects/ndisusb/contrib/ntp/include/ntp_random.h#1 branch .. //depot/projects/ndisusb/contrib/ntp/include/ntp_refclock.h#2 integrate .. //depot/projects/ndisusb/contrib/ntp/include/ntp_request.h#2 integrate .. //depot/projects/ndisusb/contrib/ntp/include/ntp_rfc2553.h#2 integrate .. //depot/projects/ndisusb/contrib/ntp/include/ntp_stdlib.h#2 integrate .. //depot/projects/ndisusb/contrib/ntp/include/ntp_tty.h#2 integrate .. //depot/projects/ndisusb/contrib/ntp/include/ntp_types.h#2 integrate .. //depot/projects/ndisusb/contrib/ntp/include/ntpd.h#2 integrate .. //depot/projects/ndisusb/contrib/ntp/include/parse.h#2 integrate .. //depot/projects/ndisusb/contrib/ntp/include/parse_conf.h#2 integrate .. //depot/projects/ndisusb/contrib/ntp/include/recvbuff.h#2 integrate .. //depot/projects/ndisusb/contrib/ntp/include/timepps-SCO.h#1 branch .. //depot/projects/ndisusb/contrib/ntp/include/timepps-Solaris.h#1 branch .. //depot/projects/ndisusb/contrib/ntp/include/timepps-SunOS.h#1 branch .. //depot/projects/ndisusb/contrib/ntp/include/trimble.h#2 integrate .. //depot/projects/ndisusb/contrib/ntp/include/version.def#1 branch .. //depot/projects/ndisusb/contrib/ntp/install-sh#2 integrate .. //depot/projects/ndisusb/contrib/ntp/kernel/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/ntp/kernel/chuinit.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/kernel/clkinit.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/kernel/sys/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/ntp/kernel/sys/parsestreams.h#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libisc/ifiter_getifaddrs.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/libisc/ifiter_ioctl.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libisc/ifiter_sysctl.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libisc/inet_aton.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/libisc/inet_pton.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/libisc/interfaceiter.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libisc/net.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libisc/netaddr.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/libisc/netscope.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/libisc/sockaddr.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/libntp/Makefile.am#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libntp/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libntp/a_md5encrypt.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libntp/adjtime.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libntp/audio.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libntp/binio.c#2 delete .. //depot/projects/ndisusb/contrib/ntp/libntp/buftvtots.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libntp/caljulian.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libntp/calleapwhen.c#2 delete .. //depot/projects/ndisusb/contrib/ntp/libntp/clocktypes.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libntp/decodenetnum.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libntp/dolfptoa.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libntp/gpstolfp.c#2 delete .. //depot/projects/ndisusb/contrib/ntp/libntp/humandate.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libntp/icom.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libntp/ieee754io.c#2 delete .. //depot/projects/ndisusb/contrib/ntp/libntp/iosignal.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libntp/lib_strbuf.h#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libntp/log.c#2 delete .. //depot/projects/ndisusb/contrib/ntp/libntp/log.h#2 delete .. //depot/projects/ndisusb/contrib/ntp/libntp/machines.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libntp/mfp_mul.c#2 delete .. //depot/projects/ndisusb/contrib/ntp/libntp/mktime.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libntp/msyslog.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libntp/ntp_random.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/libntp/ntp_rfc2553.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libntp/numtohost.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libntp/prettydate.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libntp/random.c#2 delete .. //depot/projects/ndisusb/contrib/ntp/libntp/ranny.c#2 delete .. //depot/projects/ndisusb/contrib/ntp/libntp/recvbuff.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libntp/socktoa.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libntp/socktohost.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libntp/statestr.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libntp/systime.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libopts/COPYING.lgpl#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/COPYING.mbsd#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/MakeDefs.inc#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/Makefile.am#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/Makefile.in#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/README#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/autoopts.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/autoopts.h#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/autoopts/options.h#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/autoopts/usage-txt.h#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/boolean.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/compat/compat.h#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/compat/pathfind.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/compat/snprintf.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/compat/strchr.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/compat/strdup.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/compat/windows-config.h#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/configfile.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/cook.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/enumeration.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/environment.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/genshell.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/genshell.h#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/libopts.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/load.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/m4/libopts.m4#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/m4/liboptschk.m4#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/makeshell.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/nested.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/numeric.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/pgusage.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/proto.h#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/putshell.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/restore.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/save.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/sort.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/stack.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/streqvcmp.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/text_mmap.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/tokenize.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/usage.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/libopts/version.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/libparse/Makefile.am#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libparse/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libparse/README#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libparse/binio.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/libparse/clk_computime.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libparse/clk_dcf7000.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libparse/clk_hopf6021.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libparse/clk_meinberg.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libparse/clk_rawdcf.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libparse/clk_rcc8000.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libparse/clk_schmid.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libparse/clk_trimtaip.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libparse/clk_trimtsip.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libparse/clk_varitext.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libparse/clk_wharton.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libparse/data_mbg.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libparse/gpstolfp.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/libparse/ieee754io.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/libparse/info_trimble.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libparse/mfp_mul.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/libparse/parse.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libparse/parse_conf.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libparse/parsesolaris.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libparse/parsestreams.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/libparse/trim_info.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ltmain.sh#1 branch .. //depot/projects/ndisusb/contrib/ntp/m4/define_dir.m4#1 branch .. //depot/projects/ndisusb/contrib/ntp/m4/hs_ulong_const.m4#1 branch .. //depot/projects/ndisusb/contrib/ntp/m4/os_cflags.m4#1 branch .. //depot/projects/ndisusb/contrib/ntp/missing#2 integrate .. //depot/projects/ndisusb/contrib/ntp/mkinstalldirs#2 delete .. //depot/projects/ndisusb/contrib/ntp/ntpd/Makefile.am#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/cmd_args.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/map_vme.c#2 delete .. //depot/projects/ndisusb/contrib/ntp/ntpd/ntp_config.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/ntp_control.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/ntp_crypto.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/ntp_filegen.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/ntp_intres.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/ntp_io.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/ntp_loopfilter.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/ntp_monitor.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/ntp_peer.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/ntp_proto.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/ntp_refclock.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/ntp_request.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/ntp_restrict.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/ntp_timer.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/ntp_util.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/ntpd-opts.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/ntpd/ntpd-opts.def#1 branch .. //depot/projects/ndisusb/contrib/ntp/ntpd/ntpd-opts.h#1 branch .. //depot/projects/ndisusb/contrib/ntp/ntpd/ntpd-opts.menu#1 branch .. //depot/projects/ndisusb/contrib/ntp/ntpd/ntpd-opts.texi#1 branch .. //depot/projects/ndisusb/contrib/ntp/ntpd/ntpd.1#1 branch .. //depot/projects/ndisusb/contrib/ntp/ntpd/ntpd.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/ntpdbase-opts.def#1 branch .. //depot/projects/ndisusb/contrib/ntp/ntpd/ntpdsim-opts.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/ntpd/ntpdsim-opts.def#1 branch .. //depot/projects/ndisusb/contrib/ntp/ntpd/ntpdsim-opts.h#1 branch .. //depot/projects/ndisusb/contrib/ntp/ntpd/ntpdsim-opts.menu#1 branch .. //depot/projects/ndisusb/contrib/ntp/ntpd/ntpdsim-opts.texi#1 branch .. //depot/projects/ndisusb/contrib/ntp/ntpd/ntpdsim.1#1 branch .. //depot/projects/ndisusb/contrib/ntp/ntpd/ntpsim.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/ppsapi_timepps.h#1 branch .. //depot/projects/ndisusb/contrib/ntp/ntpd/refclock_acts.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/refclock_arbiter.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/refclock_arc.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/refclock_atom.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/refclock_bancomm.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/refclock_chu.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/refclock_conf.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/refclock_datum.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/refclock_fg.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/refclock_gpsvme.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/refclock_heath.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/refclock_hopfpci.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/refclock_hopfser.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/refclock_hpgps.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/refclock_irig.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/refclock_jjy.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/refclock_jupiter.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/refclock_leitch.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/refclock_local.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/refclock_msfees.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/refclock_mx4200.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/refclock_neoclock4x.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/refclock_nmea.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/refclock_oncore.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/refclock_palisade.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/refclock_palisade.h#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/refclock_parse.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/refclock_pst.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/refclock_ptbacts.c#2 delete .. //depot/projects/ndisusb/contrib/ntp/ntpd/refclock_ripencc.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/refclock_shm.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/refclock_ulink.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/refclock_usno.c#2 delete .. //depot/projects/ndisusb/contrib/ntp/ntpd/refclock_wwv.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpd/refclock_wwvb.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpdate/Makefile.am#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpdate/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpdate/ntpdate.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpdate/ntptimeset.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpdc/Makefile.am#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpdc/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpdc/layout.std#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpdc/nl.pl#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpdc/nl.pl.in#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpdc/ntpdc-opts.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/ntpdc/ntpdc-opts.def#1 branch .. //depot/projects/ndisusb/contrib/ntp/ntpdc/ntpdc-opts.h#1 branch .. //depot/projects/ndisusb/contrib/ntp/ntpdc/ntpdc-opts.menu#1 branch .. //depot/projects/ndisusb/contrib/ntp/ntpdc/ntpdc-opts.texi#1 branch .. //depot/projects/ndisusb/contrib/ntp/ntpdc/ntpdc.1#1 branch .. //depot/projects/ndisusb/contrib/ntp/ntpdc/ntpdc.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpdc/ntpdc.h#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpdc/ntpdc_ops.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpq/Makefile.am#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpq/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpq/ntpq-opts.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/ntpq/ntpq-opts.def#1 branch .. //depot/projects/ndisusb/contrib/ntp/ntpq/ntpq-opts.h#1 branch .. //depot/projects/ndisusb/contrib/ntp/ntpq/ntpq-opts.menu#1 branch .. //depot/projects/ndisusb/contrib/ntp/ntpq/ntpq-opts.texi#1 branch .. //depot/projects/ndisusb/contrib/ntp/ntpq/ntpq-subs.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/ntpq/ntpq.1#1 branch .. //depot/projects/ndisusb/contrib/ntp/ntpq/ntpq.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpq/ntpq.h#2 integrate .. //depot/projects/ndisusb/contrib/ntp/ntpq/ntpq_ops.c#2 delete .. //depot/projects/ndisusb/contrib/ntp/packageinfo.sh#1 branch .. //depot/projects/ndisusb/contrib/ntp/parseutil/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/ntp/parseutil/dcfd.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/parseutil/testdcf.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/scripts/Makefile.am#2 integrate .. //depot/projects/ndisusb/contrib/ntp/scripts/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/ntp/scripts/VersionName#1 branch .. //depot/projects/ndisusb/contrib/ntp/scripts/genCommitLog#1 branch .. //depot/projects/ndisusb/contrib/ntp/scripts/genver#1 branch .. //depot/projects/ndisusb/contrib/ntp/scripts/html2man.in#1 branch .. //depot/projects/ndisusb/contrib/ntp/scripts/mkver.in#2 integrate .. //depot/projects/ndisusb/contrib/ntp/scripts/monitoring/lr.pl#2 integrate .. //depot/projects/ndisusb/contrib/ntp/scripts/monitoring/ntploopwatch#2 integrate .. //depot/projects/ndisusb/contrib/ntp/scripts/ntpsweep.in#2 integrate .. //depot/projects/ndisusb/contrib/ntp/scripts/ntptrace.in#2 integrate .. //depot/projects/ndisusb/contrib/ntp/scripts/support/README#2 delete .. //depot/projects/ndisusb/contrib/ntp/scripts/support/bin/monl#2 delete .. //depot/projects/ndisusb/contrib/ntp/scripts/support/bin/mvstats#2 delete .. //depot/projects/ndisusb/contrib/ntp/scripts/support/conf/hp300.hp300#2 delete .. //depot/projects/ndisusb/contrib/ntp/scripts/support/conf/hp700.hp700#2 delete .. //depot/projects/ndisusb/contrib/ntp/scripts/support/conf/hp700.hp700.faui47#2 delete .. //depot/projects/ndisusb/contrib/ntp/scripts/support/conf/hp800.hp800#2 delete .. //depot/projects/ndisusb/contrib/ntp/scripts/support/conf/ntp.conf#2 delete .. //depot/projects/ndisusb/contrib/ntp/scripts/support/conf/sun3.sun3#2 delete .. //depot/projects/ndisusb/contrib/ntp/scripts/support/conf/sun4.sun4.faui01#2 delete .. //depot/projects/ndisusb/contrib/ntp/scripts/support/conf/sun4.sun4.faui10#2 delete .. //depot/projects/ndisusb/contrib/ntp/scripts/support/conf/sun4.sun4.faui45#2 delete .. //depot/projects/ndisusb/contrib/ntp/scripts/support/conf/sun4.sun4c#2 delete .. //depot/projects/ndisusb/contrib/ntp/scripts/support/conf/sun4.sun4c.Lucifer#2 delete .. //depot/projects/ndisusb/contrib/ntp/scripts/support/conf/sun4.sun4m#2 delete .. //depot/projects/ndisusb/contrib/ntp/scripts/support/conf/sun4.sun4m.faui42#2 delete .. //depot/projects/ndisusb/contrib/ntp/scripts/support/conf/sun4.sun4m.faui45m#2 delete .. //depot/projects/ndisusb/contrib/ntp/scripts/support/conf/tickconf#2 delete .. //depot/projects/ndisusb/contrib/ntp/scripts/support/etc/cron#2 delete .. //depot/projects/ndisusb/contrib/ntp/scripts/support/etc/crontab#2 delete .. //depot/projects/ndisusb/contrib/ntp/scripts/support/etc/install#2 delete .. //depot/projects/ndisusb/contrib/ntp/scripts/support/etc/rc#2 delete .. //depot/projects/ndisusb/contrib/ntp/scripts/support/etc/setup#2 delete .. //depot/projects/ndisusb/contrib/ntp/sntp/COPYRIGHT#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/Makefile.am#2 integrate .. //depot/projects/ndisusb/contrib/ntp/sntp/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/ntp/sntp/README#2 integrate .. //depot/projects/ndisusb/contrib/ntp/sntp/aclocal.m4#2 integrate .. //depot/projects/ndisusb/contrib/ntp/sntp/autogen-version.def#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/bincheck.mf#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/compile#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/config.guess#2 integrate .. //depot/projects/ndisusb/contrib/ntp/sntp/config.h.in#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/config.sub#2 integrate .. //depot/projects/ndisusb/contrib/ntp/sntp/configure#2 integrate .. //depot/projects/ndisusb/contrib/ntp/sntp/configure.ac#2 integrate .. //depot/projects/ndisusb/contrib/ntp/sntp/depcomp#2 integrate .. //depot/projects/ndisusb/contrib/ntp/sntp/header.h#2 integrate .. //depot/projects/ndisusb/contrib/ntp/sntp/install-sh#2 integrate .. //depot/projects/ndisusb/contrib/ntp/sntp/internet.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/sntp/internet.h#2 integrate .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/COPYING.lgpl#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/COPYING.mbsd#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/MakeDefs.inc#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/Makefile.am#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/Makefile.in#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/README#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/autoopts.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/autoopts.h#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/autoopts/options.h#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/autoopts/usage-txt.h#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/boolean.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/compat/compat.h#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/compat/pathfind.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/compat/snprintf.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/compat/strchr.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/compat/strdup.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/compat/windows-config.h#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/configfile.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/cook.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/enumeration.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/environment.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/genshell.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/genshell.h#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/libopts.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/load.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/m4/libopts.m4#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/m4/liboptschk.m4#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/makeshell.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/nested.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/numeric.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/pgusage.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/proto.h#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/putshell.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/restore.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/save.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/sort.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/stack.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/streqvcmp.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/text_mmap.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/tokenize.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/usage.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/libopts/version.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/ltmain.sh#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/main.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/sntp/missing#2 integrate .. //depot/projects/ndisusb/contrib/ntp/sntp/mkinstalldirs#2 delete .. //depot/projects/ndisusb/contrib/ntp/sntp/sntp-opts.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/sntp-opts.def#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/sntp-opts.h#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/sntp-opts.menu#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/sntp-opts.texi#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/sntp.1#1 branch .. //depot/projects/ndisusb/contrib/ntp/sntp/socket.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/sntp/timing.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/sntp/version.def#1 branch .. //depot/projects/ndisusb/contrib/ntp/util/Makefile.am#2 integrate .. //depot/projects/ndisusb/contrib/ntp/util/Makefile.in#2 integrate .. //depot/projects/ndisusb/contrib/ntp/util/ansi2knr.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/util/hist.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/util/jitter.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/util/jitter.h#1 branch .. //depot/projects/ndisusb/contrib/ntp/util/ntp-keygen-opts.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/util/ntp-keygen-opts.def#1 branch .. //depot/projects/ndisusb/contrib/ntp/util/ntp-keygen-opts.h#1 branch .. //depot/projects/ndisusb/contrib/ntp/util/ntp-keygen-opts.menu#1 branch .. //depot/projects/ndisusb/contrib/ntp/util/ntp-keygen-opts.texi#1 branch .. //depot/projects/ndisusb/contrib/ntp/util/ntp-keygen.1#1 branch .. //depot/projects/ndisusb/contrib/ntp/util/ntp-keygen.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/util/ntptime.c#2 integrate .. //depot/projects/ndisusb/contrib/ntp/util/tg.c#1 branch .. //depot/projects/ndisusb/contrib/ntp/version#2 integrate .. //depot/projects/ndisusb/contrib/ntp/version.m4#1 branch .. //depot/projects/ndisusb/contrib/sendmail/FREEBSD-upgrade#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/KNOWNBUGS#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/PGPKEYS#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/README#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/RELEASE_NOTES#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/cf/README#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/cf/cf/submit.cf#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/cf/m4/proto.m4#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/cf/m4/version.m4#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/include/libmilter/mfapi.h#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/libmilter/Makefile.m4#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/libmilter/docs/smfi_opensocket.html#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/libmilter/docs/smfi_version.html#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/libmilter/engine.c#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/libmilter/main.c#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/libmilter/worker.c#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/mail.local/mail.local.c#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/makemap/makemap.8#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/makemap/makemap.c#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/smrsh/README#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/smrsh/smrsh.c#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/src/Makefile.m4#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/src/README#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/src/collect.c#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/src/conf.c#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/src/conf.h#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/src/daemon.c#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/src/envelope.c#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/src/err.c#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/src/headers.c#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/src/mailq.1#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/src/main.c#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/src/mci.c#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/src/parseaddr.c#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/src/queue.c#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/src/ratectrl.c#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/src/readcf.c#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/src/savemail.c#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/src/sendmail.h#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/src/sfsasl.c#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/src/sm_resolve.c#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/src/srvrsmtp.c#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/src/usersmtp.c#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/src/util.c#2 integrate .. //depot/projects/ndisusb/contrib/sendmail/src/version.c#2 integrate .. //depot/projects/ndisusb/contrib/smbfs/lib/smb/nb_name.c#2 integrate .. //depot/projects/ndisusb/contrib/tcsh/sh.c#2 integrate .. //depot/projects/ndisusb/contrib/tcsh/tc.const.c#2 integrate .. //depot/projects/ndisusb/contrib/telnet/arpa/telnet.h#2 integrate .. //depot/projects/ndisusb/contrib/telnet/telnetd/ext.h#2 integrate .. //depot/projects/ndisusb/contrib/telnet/telnetd/state.c#2 integrate .. //depot/projects/ndisusb/contrib/telnet/telnetd/sys_term.c#2 integrate .. //depot/projects/ndisusb/contrib/telnet/telnetd/telnetd.8#2 integrate .. //depot/projects/ndisusb/contrib/telnet/telnetd/telnetd.c#2 integrate .. //depot/projects/ndisusb/crypto/openssh/ChangeLog#2 integrate .. //depot/projects/ndisusb/crypto/openssh/FREEBSD-Xlist#2 delete .. //depot/projects/ndisusb/crypto/openssh/FREEBSD-tricks#2 integrate .. //depot/projects/ndisusb/crypto/openssh/FREEBSD-upgrade#2 integrate .. //depot/projects/ndisusb/crypto/openssh/FREEBSD-vendor#2 integrate .. //depot/projects/ndisusb/crypto/openssh/INSTALL#2 integrate .. //depot/projects/ndisusb/crypto/openssh/LICENCE#2 integrate .. //depot/projects/ndisusb/crypto/openssh/PROTOCOL#1 branch .. //depot/projects/ndisusb/crypto/openssh/PROTOCOL.agent#1 branch .. //depot/projects/ndisusb/crypto/openssh/README#2 integrate .. //depot/projects/ndisusb/crypto/openssh/README.platform#2 integrate .. //depot/projects/ndisusb/crypto/openssh/RFC.nroff#2 delete .. //depot/projects/ndisusb/crypto/openssh/addrmatch.c#1 branch .. //depot/projects/ndisusb/crypto/openssh/atomicio.c#2 integrate .. //depot/projects/ndisusb/crypto/openssh/audit-bsm.c#2 integrate .. //depot/projects/ndisusb/crypto/openssh/auth-bsdauth.c#2 integrate .. //depot/projects/ndisusb/crypto/openssh/auth-chall.c#2 integrate .. //depot/projects/ndisusb/crypto/openssh/auth-krb5.c#2 integrate .. //depot/projects/ndisusb/crypto/openssh/auth-options.c#2 integrate .. //depot/projects/ndisusb/crypto/openssh/auth-options.h#2 integrate .. //depot/projects/ndisusb/crypto/openssh/auth-pam.c#2 integrate .. //depot/projects/ndisusb/crypto/openssh/auth-pam.h#2 integrate .. //depot/projects/ndisusb/crypto/openssh/auth-passwd.c#2 integrate .. //depot/projects/ndisusb/crypto/openssh/auth-rhosts.c#2 integrate .. //depot/projects/ndisusb/crypto/openssh/auth-rsa.c#2 integrate .. //depot/projects/ndisusb/crypto/openssh/auth-shadow.c#2 integrate .. //depot/projects/ndisusb/crypto/openssh/auth-sia.c#2 integrate .. //depot/projects/ndisusb/crypto/openssh/auth-skey.c#2 integrate .. //depot/projects/ndisusb/crypto/openssh/auth.c#2 integrate .. //depot/projects/ndisusb/crypto/openssh/auth.h#2 integrate .. //depot/projects/ndisusb/crypto/openssh/auth1.c#2 integrate .. //depot/projects/ndisusb/crypto/openssh/auth2-chall.c#2 integrate .. //depot/projects/ndisusb/crypto/openssh/auth2-gss.c#2 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Thu Nov 27 09:58:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 737451065677; Thu, 27 Nov 2008 09:58:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 376AE1065672 for ; Thu, 27 Nov 2008 09:58:49 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2A4D68FC0A for ; Thu, 27 Nov 2008 09:58:49 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAR9wn4b000514 for ; Thu, 27 Nov 2008 09:58:49 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAR9wmCB000510 for perforce@freebsd.org; Thu, 27 Nov 2008 09:58:48 GMT (envelope-from zec@tel.fer.hr) Date: Thu, 27 Nov 2008 09:58:48 GMT Message-Id: <200811270958.mAR9wmCB000510@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153661 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, 27 Nov 2008 09:58:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=153661 Change 153661 by zec@zec_tca51 on 2008/11/27 09:58:05 Unbreak build, and remove redundant #include lines Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_poll.c#13 edit .. //depot/projects/vimage/src/sys/kern/kern_synch.c#26 edit .. //depot/projects/vimage/src/sys/kern/kern_thread.c#20 edit .. //depot/projects/vimage/src/sys/kern/tty.c#27 edit .. //depot/projects/vimage/src/sys/net/if_loop.c#33 edit .. //depot/projects/vimage/src/sys/net80211/ieee80211_ioctl.c#15 edit .. //depot/projects/vimage/src/sys/netinet/ip_carp.c#16 edit .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#63 edit .. //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#29 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_poll.c#13 (text+ko) ==== @@ -37,7 +37,6 @@ #include #include #include -#include #include /* for IFF_* flags */ #include /* for NETISR_POLL */ ==== //depot/projects/vimage/src/sys/kern/kern_synch.c#26 (text+ko) ==== @@ -62,7 +62,6 @@ #include #include #endif -#include #include ==== //depot/projects/vimage/src/sys/kern/kern_thread.c#20 (text+ko) ==== @@ -47,7 +47,6 @@ #include #include #include -#include #include ==== //depot/projects/vimage/src/sys/kern/tty.c#27 (text+ko) ==== @@ -60,7 +60,6 @@ #include #undef TTYDEFCHARS #include -#include #include #include ==== //depot/projects/vimage/src/sys/net/if_loop.c#33 (text+ko) ==== @@ -223,7 +223,6 @@ static int loop_modevent(module_t mod, int type, void *data) { - INIT_VNET_NET(curvnet); switch (type) { case MOD_LOAD: ==== //depot/projects/vimage/src/sys/net80211/ieee80211_ioctl.c#15 (text+ko) ==== @@ -42,7 +42,6 @@ #include #include #include -#include #include #include ==== //depot/projects/vimage/src/sys/netinet/ip_carp.c#16 (text+ko) ==== @@ -49,7 +49,6 @@ #include #include #include -#include #include #include ==== //depot/projects/vimage/src/sys/netinet/tcp_subr.c#63 (text+ko) ==== @@ -124,8 +124,8 @@ static int tcp_inflight_min; static int tcp_inflight_max; static int tcp_inflight_stab; +static int tcp_inflight_rttthresh; #endif -static int tcp_inflight_rttthresh; static int sysctl_net_inet_tcp_mss_check(SYSCTL_HANDLER_ARGS) ==== //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#29 (text+ko) ==== @@ -65,7 +65,6 @@ unsigned long in6_maxmtu; int ip6_auto_linklocal; struct callout in6_tmpaddrtimer_ch; -#endif extern struct inpcbinfo ripcbinfo; #endif From owner-p4-projects@FreeBSD.ORG Thu Nov 27 13:15:08 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D08A41065679; Thu, 27 Nov 2008 13:15:08 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 944F21065672 for ; Thu, 27 Nov 2008 13:15:08 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8142D8FC1E for ; Thu, 27 Nov 2008 13:15:08 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mARDF8jX029165 for ; Thu, 27 Nov 2008 13:15:08 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mARDF8tu029163 for perforce@freebsd.org; Thu, 27 Nov 2008 13:15:08 GMT (envelope-from zec@tel.fer.hr) Date: Thu, 27 Nov 2008 13:15:08 GMT Message-Id: <200811271315.mARDF8tu029163@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153665 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, 27 Nov 2008 13:15:09 -0000 http://perforce.freebsd.org/chv.cgi?CH=153665 Change 153665 by zec@zec_tpx32 on 2008/11/27 13:15:02 Bring in ip_output.c in sync with svn:head/sys/netinet/ip_output.c, not with //depot/vendor/freebsd/src/sys/netinet/ip_output.c which is broken! Affected files ... .. //depot/projects/vimage-commit/src/sys/netinet/ip_output.c#8 edit Differences ... ==== //depot/projects/vimage-commit/src/sys/netinet/ip_output.c#8 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/ip_output.c,v 1.285 2008/08/21 17:24:49 rwatson Exp $"); +__FBSDID("$FreeBSD: head/sys/netinet/ip_output.c 185348 2008-11-26 22:32:07Z zec $"); #include "opt_ipfw.h" #include "opt_ipsec.h" @@ -83,7 +83,9 @@ (ntohl(a.s_addr)>>8)&0xFF,\ (ntohl(a.s_addr))&0xFF, y); +#ifdef VIMAGE_GLOBALS u_short ip_id; +#endif #ifdef MBUF_STRESS_TEST int mbuf_frag_size = 0; @@ -109,6 +111,8 @@ ip_output(struct mbuf *m, struct mbuf *opt, struct route *ro, int flags, struct ip_moptions *imo, struct inpcb *inp) { + INIT_VNET_NET(curvnet); + INIT_VNET_INET(curvnet); struct ip *ip; struct ifnet *ifp = NULL; /* keep compiler happy */ struct mbuf *m0; @@ -130,8 +134,10 @@ bzero(ro, sizeof (*ro)); } - if (inp != NULL) + if (inp != NULL) { + M_SETFIB(m, inp->inp_inc.inc_fibnum); INP_LOCK_ASSERT(inp); + } if (opt) { len = 0; @@ -626,6 +632,7 @@ ip_fragment(struct ip *ip, struct mbuf **m_frag, int mtu, u_long if_hwassist_flags, int sw_csum) { + INIT_VNET_INET(curvnet); int error = 0; int hlen = ip->ip_hl << 2; int len = (mtu - hlen) & ~7; /* size of payload in each fragment */ @@ -784,6 +791,7 @@ void in_delayed_cksum(struct mbuf *m) { + INIT_VNET_INET(curvnet); struct ip *ip; u_short csum, offset; @@ -819,6 +827,11 @@ error = optval = 0; if (sopt->sopt_level != IPPROTO_IP) { + if ((sopt->sopt_level == SOL_SOCKET) && + (sopt->sopt_name == SO_SETFIB)) { + inp->inp_inc.inc_fibnum = so->so_fibnum; + return (0); + } return (EINVAL); } @@ -1146,7 +1159,11 @@ register struct ip *ip; struct mbuf *copym; - copym = m_copy(m, 0, M_COPYALL); + /* + * Make a deep copy of the packet because we're going to + * modify the pack in order to generate checksums. + */ + copym = m_dup(m, M_DONTWAIT); if (copym != NULL && (copym->m_flags & M_EXT || copym->m_len < hlen)) copym = m_pullup(copym, hlen); if (copym != NULL) { From owner-p4-projects@FreeBSD.ORG Thu Nov 27 13:17:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0BBC81065672; Thu, 27 Nov 2008 13:17:11 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C38E6106564A for ; Thu, 27 Nov 2008 13:17:10 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id B0C7D8FC1B for ; Thu, 27 Nov 2008 13:17:10 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mARDHAHr029315 for ; Thu, 27 Nov 2008 13:17:10 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mARDHAgC029313 for perforce@freebsd.org; Thu, 27 Nov 2008 13:17:10 GMT (envelope-from zec@tel.fer.hr) Date: Thu, 27 Nov 2008 13:17:10 GMT Message-Id: <200811271317.mARDHAgC029313@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153666 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, 27 Nov 2008 13:17:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=153666 Change 153666 by zec@zec_tpx32 on 2008/11/27 13:16:19 Bring in ip_output.c in sync with svn:head/sys/netinet/ip_output.c, not with //depot/vendor/freebsd/src/sys/netinet/ip_output.c which is broken! Affected files ... .. //depot/projects/vimage-commit2/src/sys/netinet/ip_output.c#13 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_output.c#13 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/netinet/ip_output.c,v 1.285 2008/08/21 17:24:49 rwatson Exp $"); +__FBSDID("$FreeBSD: head/sys/netinet/ip_output.c 185348 2008-11-26 22:32:07Z zec $"); #include "opt_ipfw.h" #include "opt_ipsec.h" @@ -83,7 +83,9 @@ (ntohl(a.s_addr)>>8)&0xFF,\ (ntohl(a.s_addr))&0xFF, y); +#ifdef VIMAGE_GLOBALS u_short ip_id; +#endif #ifdef MBUF_STRESS_TEST int mbuf_frag_size = 0; @@ -132,8 +134,10 @@ bzero(ro, sizeof (*ro)); } - if (inp != NULL) + if (inp != NULL) { + M_SETFIB(m, inp->inp_inc.inc_fibnum); INP_LOCK_ASSERT(inp); + } if (opt) { len = 0; @@ -787,6 +791,7 @@ void in_delayed_cksum(struct mbuf *m) { + INIT_VNET_INET(curvnet); struct ip *ip; u_short csum, offset; @@ -822,6 +827,11 @@ error = optval = 0; if (sopt->sopt_level != IPPROTO_IP) { + if ((sopt->sopt_level == SOL_SOCKET) && + (sopt->sopt_name == SO_SETFIB)) { + inp->inp_inc.inc_fibnum = so->so_fibnum; + return (0); + } return (EINVAL); } @@ -1149,7 +1159,11 @@ register struct ip *ip; struct mbuf *copym; - copym = m_copy(m, 0, M_COPYALL); + /* + * Make a deep copy of the packet because we're going to + * modify the pack in order to generate checksums. + */ + copym = m_dup(m, M_DONTWAIT); if (copym != NULL && (copym->m_flags & M_EXT || copym->m_len < hlen)) copym = m_pullup(copym, hlen); if (copym != NULL) { From owner-p4-projects@FreeBSD.ORG Thu Nov 27 13:50:48 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F3397106567A; Thu, 27 Nov 2008 13:50:47 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B721A1065670 for ; Thu, 27 Nov 2008 13:50:47 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A52D98FC1A for ; Thu, 27 Nov 2008 13:50:47 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mARDolpk032124 for ; Thu, 27 Nov 2008 13:50:47 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mARDol7j032122 for perforce@freebsd.org; Thu, 27 Nov 2008 13:50:47 GMT (envelope-from zec@tel.fer.hr) Date: Thu, 27 Nov 2008 13:50:47 GMT Message-Id: <200811271350.mARDol7j032122@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153669 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, 27 Nov 2008 13:50:48 -0000 http://perforce.freebsd.org/chv.cgi?CH=153669 Change 153669 by zec@zec_tca51 on 2008/11/27 13:50:35 Unbreak LINT and VLINT builds. Affected files ... .. //depot/projects/vimage/src/sys/kern/kern_poll.c#14 edit .. //depot/projects/vimage/src/sys/net/bpf.c#30 edit .. //depot/projects/vimage/src/sys/netipsec/keysock.c#22 edit .. //depot/projects/vimage/src/sys/netipsec/keysock.h#4 edit Differences ... ==== //depot/projects/vimage/src/sys/kern/kern_poll.c#14 (text+ko) ==== @@ -37,6 +37,7 @@ #include #include #include +#include #include /* for IFF_* flags */ #include /* for NETISR_POLL */ @@ -44,7 +45,6 @@ #include #include #include -#include static void netisr_poll(void); /* the two netisr handlers */ static void netisr_pollmore(void); ==== //depot/projects/vimage/src/sys/net/bpf.c#30 (text+ko) ==== @@ -873,21 +873,18 @@ m->m_len -= hlen; m->m_data += hlen; /* XXX */ + CURVNET_SET(ifp->if_vnet); #ifdef MAC BPFD_LOCK(d); - CURVNET_SET(ifp->if_vnet); mac_bpfdesc_create_mbuf(d, m); - CURVNET_RESTORE(); if (mc != NULL) mac_bpfdesc_create_mbuf(d, mc); BPFD_UNLOCK(d); #endif - CURVNET_SET(ifp->if_vnet); error = (*ifp->if_output)(ifp, m, &dst, NULL); if (error) d->bd_wdcount++; - CURVNET_RESTORE(); if (mc != NULL) { if (error == 0) @@ -895,6 +892,7 @@ else m_freem(mc); } + CURVNET_RESTORE(); return (error); } ==== //depot/projects/vimage/src/sys/netipsec/keysock.c#22 (text+ko) ==== ==== //depot/projects/vimage/src/sys/netipsec/keysock.h#4 (text+ko) ==== @@ -58,12 +58,10 @@ u_quad_t sockerr; /* # of socket related errors */ }; -#ifdef VIMAGE struct key_cb { int key_count; int any_count; }; -#endif #define KEY_SENDUP_ONE 0 #define KEY_SENDUP_ALL 1 From owner-p4-projects@FreeBSD.ORG Thu Nov 27 16:51:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 942881065672; Thu, 27 Nov 2008 16:51:52 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 56903106564A for ; Thu, 27 Nov 2008 16:51:52 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 4842E8FC18 for ; Thu, 27 Nov 2008 16:51:52 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mARGpqQD062668 for ; Thu, 27 Nov 2008 16:51:52 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mARGppdn062666 for perforce@freebsd.org; Thu, 27 Nov 2008 16:51:51 GMT (envelope-from pgj@FreeBSD.org) Date: Thu, 27 Nov 2008 16:51:51 GMT Message-Id: <200811271651.mARGppdn062666@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 153673 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, 27 Nov 2008 16:51:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=153673 Change 153673 by pgj@kolbasz on 2008/11/27 16:51:30 Add Hungarian translation of chapter "SGML Markup" from FDP Primer Affected files ... .. //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.sgml#2 edit Differences ... ==== //depot/projects/docproj_hu/doc/hu_HU.ISO8859-2/books/fdp-primer/sgml-markup/chapter.sgml#2 (text+ko) ==== @@ -31,95 +31,135 @@ --> - SGML Markup + Az SGML alkalmazása + + Ebben a fejezetben a &os; Dokumentációs Projekt + keretein belül két leggyakrabban elõforduló + jelölõnyelvet ismerhetjük meg. Az egyes szakaszokban + ezen nyelvek bemutatására, illetve jelenleg + alkalmazott vagy alkalmazandó jelölési + sajátosságaira térünk ki. - This chapter describes the two markup languages you will encounter - when you contribute to the FreeBSD documentation project. Each section - describes the markup language, and details the markup that you are likely - to want to use, or that is already in use. + Az itt tárgyalt jelölõnyelvek nagy + számú elemet tartalmaznak, és ezért + gyakorta zavarba ejtõ lehet az adott helyzetnek + leginkább megfelelõ elemek kiválasztása a + rengeteg kínálkozó alternatíva + közül. Ebben a szakaszban ezért igyekezük + érinteni az összes fontosabb elemet, valamint + példákat mutatni a megfelelõ + használatukra. - These markup languages contain a large number of elements, and it can - be confusing sometimes to know which element to use for a particular - situation. This section goes through the elements you are most likely to - need, and gives examples of how you would use them. - - This is not an exhaustive list of elements, since - that would just reiterate the documentation for each language. The aim of - this section is to list those elements more likely to be useful to you. - If you have a question about how best to markup a particular piece of - content, please post it to the &a.doc;. + Ez az összefoglalás természetesen + nem tartalmazza mindegyik elemet, mivel ezzel + lényegében a nyelv saját + dokumentációját írnánk le + ismételten. Ebben a szakaszban elsõsorban inkább + azon elemek ismertetését tûztük ki + célul, amelyek a munkánk során + valószínûleg a leghasznosabbaknak fognak + bizonyulni. A további különbözõ + jelölési megoldásokra vonatkozóan + bátran kérhetünk tanácsot a &a.doc; + tagjaitól! - Inline vs. block - - In the remainder of this document, when describing elements, - inline means that the element can occur within a - block element, and does not cause a line break. A - block element, by comparison, will cause a line - break (and other processing) when it is encountered. + Belsõ elemek kontra blokkok + + A leírás további részeiben + belsõnek nevezzük azokat az elemeket, + amelyek szerepelhetnek blokkelemekben és nem okoznak + sortörést. Ezzel szemben viszont a + blokk formátumú elemek + feldolgozása sortörést (vagy egyéb + feldolgozási lépéseket) + eredményez. - + HTML - - HTML, the HyperText Markup Language, is the markup language of - choice on the World Wide Web. More information can be found at - <URL:>. + + A HTML, más néven HyperText Markup Language, a + Világháló jelölõnyelve. Ezzel + kapcsolatban részlesebb leírásokat a címen + találhatunk. + + A HTML használata a &os; honlapján + található oldalak + készítésénél jelenik meg. + Más dokumentációkhoz azonban + (általánosságban) nem szokták + alkalmazni, mivel a DocBook ennél sokkal + bõségesebb eszközöket kínál + fel. Ennek következményeképpen tehát + többnyire csak a honlap fejlesztése során + fogunk HTML oldalakkal találkozni. - HTML is used to markup pages on the FreeBSD web site. It should not - (generally) be used to mark up other documentation, - since DocBook offers a - far richer set of elements to choose from. Consequently, you will - normally only encounter HTML pages if you are writing for the web - site. + A HTML létrejötte óta több + verzióváltáson is keresztülment + már, az 1, 2, 3.0, 3.2 verziókat követõen + egészen a legfrissebb 4.0 változatáig (amely + egyaránt elérhetõ + szigorú (strict) és + enyhébb (loose) formáiban + is). - HTML has gone through a number of versions, 1, 2, 3.0, 3.2, and the - latest, 4.0 (available in both strict and - loose variants). - - The HTML DTDs are available from the ports collection in the - textproc/html port. They are automatically - installed as part of the textproc/docproj - port. + A HTML DTD-k a Portgyûjteménybõl a textproc/html porton keresztül + érhetõek el. A textproc/docproj port ezt automatikusan + telepíti. - Formal Public Identifier (FPI) + Formális publikus azonosító - There are a number of HTML FPIs, depending upon the version (also - known as the level) of HTML that you want to declare your document to - be compliant with. + A HTML megfelelni kívánt verziójától (amelyet sokszor szintnek is szoktak + nevezni) függõen különbözõ formális publikus azonosító (FPI) + áll rendelkezésünkre. - The majority of HTML documents on the FreeBSD web site comply with - the loose version of HTML 4.0. + A &os; honlapján található + HTML dokumentumok többsége a HTML 4.0 enyhébb + változatának felel meg: PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" - Sectional elements + A dokumentum részei - An HTML document is normally split into two sections. The first - section, called the head, contains - meta-information about the document, such as its title, the name of - the author, the parent document, and so on. The second section, the - body, contains the content that will be displayed - to the user. + A HTML dokumentumok általános esetben + két részre oszthatóak. Az elsõ, + fejnek nevezett rész tartalmazza a + dokumentumhoz tartozó metainformációkat, + például a címét, a szerzõ + nevét, a szülõdokumentumot és így + tovább. A második, + törzsnek hívott rész + pedig a felhasználó részére + megjelenített tartalmat foglalja magában. - These sections are indicated with head and - body elements respectively. These elements are - contained within the top-level html element. + A dokumentum ezen részeit rendre a + head (mint angolul a fej) + és a body (mint angolul a + törzs) elemekkel jelöljük. Ezeket + az elemeket végül a legfelsõbb szinten + álló html elem + tartalmazza. - Normal HTML document structure + Egy átlagos HTML dokumentum + felépítése <html> <head> - <title>The document's title</title> + <title>A dokumentum címe</title> </head> <body> @@ -130,347 +170,439 @@ </html> - + - Block elements + Blokkok - Headings + Fejlécek - HTML allows you to denote headings in your document, at up to - six different levels. + A HTML lehetõvé teszi fejlécek + jelölését egészen hat + különbözõ szintig. - The largest and most prominent heading is h1, - then h2, continuing down to - h6. + A legnagyobb és legkiemelkedõbb fejléc + a h1, majd ezt követi a + h2, egészen a h6 + címkéig. - The element's content is the text of the heading. + Az elem tartalma a fejléc szövege lesz. - <sgmltag>h1</sgmltag>, <sgmltag>h2</sgmltag>, etc. + A <sgmltag>h1</sgmltag>, <sgmltag>h2</sgmltag>, stb. + elmek - Use: + A használat módja: - First section + ]]>Elsõ szakasz - + -

      This is the heading for the first section

      +

      ]]>Ez az elsõ szakasz fejléce - + -

      This is the heading for the first sub-section

      +

      ]]>Ez az elsõ alszakasz fejléce - + -

      This is the heading for the second section

      +

      ]]>Ez a második szakasz fejléce -]]> +]]> - - Generally, an HTML page should have one first level heading - (h1). This can contain many second level - headings (h2), which can in turn contain many - third level headings. Each - hn element should have - the same element, but one further up the hierarchy, preceding it. - Leaving gaps in the numbering is to be avoided. + + A HTML oldalaknak általában + rendelkezniük kell elsõ szintû fejléccel + (h1). Ez tetszõleges + számú második szintû fejlécet + (h2) tartalmazhat, amelyek szintén + tetszõleges mennyiségû harmadik szintû + fejlécet. Ügyeljünk arra, hogy minden + hn elem mindig a + nála eggyel nagyobb szintû elemet tartalmazza, a + sorszámozásban tehát nem javasolt + közöket hagyni. - Bad ordering of - <sgmltag>h<replaceable>n</replaceable></sgmltag> elements + A <sgmltag>h<replaceable>n</replaceable></sgmltag> + elemek helytelen sorrendje - Use: + A használati módja: - First section

      + ]]>Elsõ szakasz - + -

      Sub-section

      +

      ]]>Alszakasz -]]> +]]> - + - Paragraphs + Bekezdések - HTML supports a single paragraph element, + A HTML egyetlen bekezdésfajtát ismer, ez a p. - <sgmltag>p</sgmltag> + A <sgmltag>p</sgmltag> elem - Use: + A használat módja: - This is a paragraph. It can contain just about any - other element.

      ]]>       + ]]>Ez egy bekezdés. Szinte bármilyen más elemet tartalmazhat.]]>       - Block quotations + Idézetblokkok - A block quotation is an extended quotation from another document - that should not appear within the current paragraph. + Az idézetblokkok más dokumentumok nagyobb + részeinek idézésére + használhatóak az aktuális + bekezdésen túl. - <sgmltag>blockquote</sgmltag> + A <sgmltag>blockquote</sgmltag> elem + + A használat módja: + + ]]>Részlet a Szózatból: + +
      ]]>Hazádnak rendületlenûl + Légy híve, oh magyar, + Bölcsõd az 's majdan sírod is, + Melly ápol 's eltakar. + + A' nagy világon e' kivûl + Nincsen számodra hely, + Áldjon vagy verjen sors' keze, + Itt élned, halnod kell. - Use: + Ez a' föld, mellyen annyiszor + Apáid' vére folyt; + Ez, mellyhez minden szent nevet + Egy ezredév csatolt. - A small excerpt from the US Constitution:

      + Itt küzdtenek honért a' hõs + Árpádnak hadai, + Itt törtek össze rabigát + Hunyadnak karjai. -
      We the People of the United States, in Order to form - a more perfect Union, establish Justice, insure domestic - Tranquility, provide for the common defence, promote the general - Welfare, and secure the Blessings of Liberty to ourselves and our - Posterity, do ordain and establish this Constitution for the - United States of America.
      ]]>       + Szabadság! Itten hordozák + Véres zászlóidat, + 'S elhulltanak legjobbjaink + A' hosszu harcz alatt.]]> - Lists + Felsorolások - You can present the user with three types of lists, ordered, - unordered, and definition. + A dokumentumokban háromféle + felsorolást használhatunk: sorszámozott, + sorszámozás nélkül és + definíciós. - Typically, each entry in an ordered list will be numbered, while - each entry in an unordered list will be preceded by a bullet point. - Definition lists are composed of two sections for each entry. The - first section is the term being defined, and the second section is - the definition of the term. + Röviden úgy mutathatnánk be ezeket a + formátumokat, hogy a sorszámozott + felsorolásban az elemek elé számok + kerülnek, a sorszámozás nélküli + esetben pontok, a definíciós + felsorolásban pedig a bejegyzések két + részébõl jönnek létre az + elemek. Ezek közül az elsõ részben a + meghatározandó fogalom található, + míg a második részben annak + meghatározása. - Ordered lists are indicated by the ol - element, unordered lists by the ul element, and - definition lists by the dl element. + A sorszámozott felsorolásokat az + ol elem jelzi, a sorszámozás + nélküli felsorolásokat az + ul elem, végül a + definíciós felsorolásokat a + dl elem. - Ordered and unordered lists contain listitems, indicated by the - li element. A listitem can contain textual - content, or it may be further wrapped in one or more - p elements. + A sorszámozott és sorszámozás + nélküli felsorolások a felsorolás + elemeit tartalmazzák, amelyeket a li + elemekkel vezetünk be. A felsorolások elemeinek + szöveges tartalma lehet, vagy ha ezeket becsomagoljuk egy + vagy több p elembe, további + elemeket tartalmazhatnak. - Definition lists contain definition terms - (dt) and definition descriptions - (dd). A definition term can only contain inline - elements. A definition description can contain other block - elements. + A definíciós felsorolások + meghatározandó fogalmakat (dt) + és meghatározásokat + (dd) tartalmazhatnak. A + meghatározandó fogalmat tartalmazó + részben csak belsõ elemek szerepelhetnek. A + meghatározásokban viszont további blokkok + is megjelenhetnek. - <sgmltag>ul</sgmltag> and <sgmltag>ol</sgmltag> + Az <sgmltag>ul</sgmltag> és + <sgmltag>ol</sgmltag> elemek - Use: + A használat módja: - An unordered list. Listitems will probably be - preceded by bullets.

      + ]]>Egy sorszámozás nélkül felsorolás. A felsorolás elemei elõtt minden + bizonnyal pontok fognak megjelenni.
        -
      • First item
        • +
      • ]]>Elsõ elem -
      • Second item
        • +
      • ]]>Második elem -
      • Third item
        • +
      • ]]>Harmadik elem
      -

      An ordered list, with list items consisting of multiple - paragraphs. Each item (note: not each paragraph) will be - numbered.

      +

      ]]>Egy sorszámozott lista, ahol az elemek több bekezdésbõl állnak. + Mindegyik elem (figyelem: nem mindegyik bekezdés) elõtt egy sorszámnak kell + szerepelnie.

        -

      1. This is the first item. It only has one paragraph.

        2. +
      2. +

        ]]>Ez az elsõ elem. Ennek csak egy bekezdése van. +

        3. -

      3. This is the first paragraph of the second item.

        +
      4. +

        ]]>Ez a második elem elsõ bekezdése. -

        This is the second paragraph of the second item.

        5. +

        ]]>Ez a második elem második bekezdése. + -

      5. This is the first and only paragraph of the third - item.

        6. +
      6. +

        ]]>Ez az elsõ és egyetlen bekezdés a harmadik elemben. +

      ]]>             - Definition lists with <sgmltag>dl</sgmltag> + Definíciós felsorolások a + <sgmltag>dl</sgmltag> elemmel - Use: + A használat módja: -
      Term 1
      +
      ]]>Elsõ fogalom -

      Paragraph 1 of definition 1.

      +
      +

      ]]>Az elsõ fogalom meghatározásának elsõ bekezdése. -

      Paragraph 2 of definition 1.

      +

      ]]>Az elsõ fogalom meghatározásának második bekezdése. + -

      Term 2
      +
      ]]>Második fogalom -

      Paragraph 1 of definition 2.

      +
      +

      ]]>A második fogalom meghatározásának elsõ bekezdése. +

      -
      Term 3
      +
      ]]>Harmadik fogalom -

      Paragraph 1 of definition 3.

      +
      +

      ]]>A harmadik fogalom meghatározásának elsõ bekezdése. +

    ]]> - Pre-formatted text + Formázott szöveg - You can indicate that text should be shown to the user exactly - as it is in the file. Typically, this means that the text is shown - in a fixed font, multiple spaces are not merged into one, and line - breaks in the text are significant. + Megadhatjuk, hogy a szöveg egyes részei + pontosan abban a formában kerüljenek a + felhasználó elé, ahogy az eredetileg + szerepel. Ilyenkor általában a szöveg + rögzített szélességû + betûtípussal jelenik meg, az egymás mellett + levõ szóközök nem vonódnak + össze, a sortörések hatása + fontossá válik. - In order to do this, wrap the content in the - pre element. + Mindezt a pre elemen keresztül + érhetjük el. - <sgmltag>pre</sgmltag> + A <sgmltag>pre</sgmltag> elem + + A pre elem például + remekül alkalmas e-mailek + jelölésére: - You could use pre to mark up an email - message: + From: Gabor PALI <pgj@FreeBSD.org> + To: bsd@hu.FreeBSD.org + Subject: Uj FreeBSD-cikk forditas: Naplozo UFS hasznalata asztali szamitogepeken - From: nik@FreeBSD.org - To: freebsd-doc@FreeBSD.org - Subject: New documentation available + Kedves listatagok! - There is a new copy of my primer for contributors to the FreeBSD - Documentation Project available at - <URL:http://people.FreeBSD.org/~nik/primer/index.html> + Nemreg elkeszitettem az ``Implementing UFS Journaling on a Desktop + PC'' neven szerepelo [1] FreeBSD-cikk magyar forditasat [2]. + Szeretnek megkerni mindenkit, akit erdekel a honositott valtozat, + hogy olvassa el, nezze at, betatesztelje es mondjon rola velemenyt. + Egyelore meg csak a sajat Perforce repositorynkbol erheto el, de a + megadott linken naponta egyszer automatikusan frissul a HTML valtozat + a feltoltott valtoztatasok (peldaul hibajavitasok) fuggvenyeben. + Elore is nagyon szepen koszonom mindenkinek a segitseget! - Comments appreciated. + :g - N]]> + [1] http://www.freebsd.org/doc/en/articles/gjournal-desktop/ + [2] http://people.freebsd.org/~pgj/gjournal-desktop_hu/]]> - Keep in mind that < and - & still are recognized as special - characters in pre-formatted text. This is why the example - shown had to use &lt; instead of - <. For consistency, - &gt; was used in place of - >, too. Watch out for the special characters - that may appear in text copied from a plain-text source, - e.g., an email message or program code. + Hasznos azonban tudnunk, hogy a < + és & jelek a formázott + szövegben továbbra is speciális + jelentéssel bírnak. A példában + ezért is használtunk + &lt; egyedeket a + < jelek helyett. Ugyanezért a + &gt; a > + helyén is látható. Ezért mindig + körültekintõen bánjunk a nyers + szövegbõl, például e-mailbõl + vagy forráskódból bemásolt + részletekkel, és ne felejtsük el + átalakítani a bennük + található speciális + karaktereket. - Tables + Táblázatok - Most text-mode browsers (such as Lynx) do not render tables - particularly effectively. If you are relying on the tabular - display of your content, you should consider using alternative - markup to prevent confusion. + A legtöbb (Lynx-hez hasonló) szöveges + módban futó böngészõ + kifejezetten ügyetlen módon jeleníti meg + a táblázatokat. Ha az oldalon a + táblázatos felépítést + választjuk, akkor a problémák + elkerüléséhez érdemes egy + alternatív jelölési módszert + alkalmazni. - Mark up tabular information using the table - element. A table consists of one or more table rows - (tr), each containing one or more cells of table - data (td). Each cell can contain other block - elements, such as paragraphs or lists. It can also contain another - table (this nesting can repeat indefinitely). If the cell only - contains one paragraph then you do not need to include the - p element. + A táblázatos formában + megjeleníteni kívánt + információt jelöljük a + table elemmel. A táblázatok + egy több sorból (tr mint + table row) állnak, amelyek egy vagy + több adatcellát (td mint + table data) tartalmaznak. Mindegyik cella + tartalmazhat további blokkokat, például + bekezdéseket vagy listákat, de akár + táblázatokat (ez a beágyazás + tetszõleges mélységig folytatható). + Ha a cella tartalma csak egyetlen bekezdés, akkor + nincs szükség a p elem + használatára. - Simple use of <sgmltag>table</sgmltag> + A <sgmltag>table</sgmltag> egyszerû + használata - Use: + A használat módja: - This is a simple 2x2 table.

    + ]]>Ez egy 2x2-es táblázat. - + + - + +
    Top left cell]]>Bal felsõ cella - Top right cell]]>Jobb felsõ cella
    Bottom left cell]]>Bal alsó cella - Bottom right cell]]>Jobb alsó cella
    ]]>     - A cell can span multiple rows and columns. To indicate this, - add the rowspan and/or colspan - attributes, with values indicating the number of rows of columns - that should be spanned. + Egy cella több sorra vagy oszlopra is + átnyúlhat. Ennek jelzéséhez a + kiterjesztendõ sorokhoz a rowspan + és/vagy oszlopokhoz a colspan + tulajdonságot adjuk meg a megfelelõ + értékkel. - Using <literal>rowspan</literal> + A <literal>rowspan</literal> tulajdonság - Use: + A használat módja: - One tall thin cell on the left, two short cells next to - it on the right.

    + ]]>Egy magas keskeny cella a bal oldalon, mellette jobbra + két rövid cella. - + - + +
    Long and thin]]>Hosszú és keskeny
    Top cell]]>Felsõ cella - Bottom cell]]>Alsó cella
    ]]>         - Using <literal>colspan</literal> + A <literal>colspan</literal> tulajdonság - Use: + A használat módja: - One long cell on top, two short cells below it.

    + ]]>Felül egy hosszú cella, alatt két rövidebb cella. - + - + +
    Top cell]]>Felsõ cella
    Bottom left cell]]>Bal alsó cella - Bottom right cell]]>Jobb alsó cella
    ]]>         - Using <literal>rowspan</literal> and - <literal>colspan</literal> together + A <literal>rowspan</literal> és + <literal>colspan</literal> tulajdonságok + együttes használata - Use: + A használat módja: - On a 3x3 grid, the top left block is a 2x2 set of - cells merged into one. The other cells are normal.

    + ]]>Egy 3x3-as rácson a bal felsõ blokk 2x2 egymásba olvasztott + cellából áll. A többi cella normális. - + + - - - + + + - + + +
    Top left large cell]]>Bal felsõ nagy cella - Top right cell]]>Jobb felsõ cella
    Middle right cell]]>Jobb középsõ cella
    Bottom left cell]]>Bal alsó cella - Bottom middle cell]]>Bal középsõ cella - Bottom right cell]]>Jobb alsó cella
    ]]>         @@ -478,345 +610,451 @@     - In-line elements + Belsõ elemek - Emphasizing information + Az információ kiemelése - You have two levels of emphasis available in HTML, - em and strong. - em is for a normal level of emphasis and - strong indicates stronger emphasis. + A HTML esetén a kiemelésnek két + szintje létezik, az em és a + strong. Ezek közül az + em jelenti a hagyományos + kiemelést és a strong az + erõsebbet. - Typically, em is rendered in italic and - strong is rendered in bold. This is not always - the case, however, and you should not rely on it. + Az em elem tartalma + általában dõlt betûvel jelenik meg, + miközben a strong elem tartalma + félkövéren. Ez a + megállapítás azonban nem minden esetben + igaz, ezért nem szabad semmi ilyesmit + feltételeznünk a használatukkor. - <sgmltag>em</sgmltag> and <sgmltag>strong</sgmltag> + A <sgmltag>em</sgmltag> és + <sgmltag>strong</sgmltag> elemek - Use: + A használat módja: - This has been emphasized, while - this has been strongly emphasized.

    ]]>     + ]]><em>Ezt</em> a részt kiemeltük, miközben <strong>ezt</strong> részt + erõsebben kiemeltük.]]>     - Bold and italics + Félkövér és dõlt + formázás - Because HTML includes presentational markup, you can also - indicate that particular content should be rendered in bold or - italic. The elements are b and - i respectively. + Mivel a HTML tartalmaz konkrétan a + megjelenítésre vonatkozó + jelölõket is, ezért külön jelezni + tudjuk a forrásban, hogy a szöveg melyik + részét szeretnénk + félkövéren vagy dõlten látni. + Ezeket a funkciókat a b, illetve az + i elemekkel érhetjük el. - <sgmltag>b</sgmltag> and <sgmltag>i</sgmltag> + A <sgmltag>b</sgmltag> és <sgmltag>i</sgmltag> + elemek - This is in bold, while this is - in italics.

    ]]>     + ]]><b>Ez</b> félkövér, <i>ez</i> pedig dõlt.]]>     - Indicating fixed pitch text + Írógépszerû + formázás - If you have content that should be rendered in a fixed pitch - (typewriter) typeface, use tt (for - teletype). + Az írógépszerûen + (rögzített szélességû + karakterekkel) írt szövegek + formázásához a tt + (mint teletype) elemet + használhatjuk. - <sgmltag>tt</sgmltag> + A <sgmltag>tt</sgmltag> elem - Use: + A használat módja: - This document was originally written by - Nik Clayton, who can be reached by email as - nik@FreeBSD.org.

    ]]>     + ]]>Ezt a dokumentumot eredetileg Páli Gábor fordította, + és a következõ címen érhetõ el: <tt>pgj@FreeBSD.org</tt>.]]>     - Content size + Méretezés - You can indicate that content should be shown in a larger or - smaller font. There are three ways of doing this. + Elõfordulhat, hogy szeretnénk növelni + vagy csökkenteni a szöveg + megjelenítéséhez használt + betûtípus méretét. Erre + alapvetõen három lehetõség + kínálkozik. - Use big and small - around the content you wish to change size. These tags can be - nested, so <big><big>This is much - bigger</big></big> is possible. + Ágyazzuk az átméterezendõ + szöveget big és + small elemekbe. Ezeket a + címkéket tetszõleges + mélységig egymásba tudjuk + ágyazni, tehát írható olyan, + hogy <big><big>Ez már sokkal + nagyobb!</big></big>. - Use font with the size - attribute set to +1 or -1 - respectively. This has the same effect as using - big or small. However, - the use of this approach is deprecated. + Használjuk a font elemet, + és a size + tulajdonságát állítsuk a + +1 vagy -1 + értékre. Ez hatása szerint + megegyezik a big és a + small elemek + használatával, azonban ez a + típusú megoldás már + elavult. - Use font with the size - attribute set to a number between 1 and 7. The default font size - is 3. This approach is deprecated. + A font size + tulajdonsága 1 és + 7 között + állítható. A betû + alapértelmezett mérete 3. + Ez a megközelítés már + elavult. - <sgmltag>big</sgmltag>, <sgmltag>small</sgmltag>, and - <sgmltag>font</sgmltag> + A <sgmltag>big</sgmltag>, <sgmltag>small</sgmltag> + és a <sgmltag>font</sgmltag> elemek - The following fragments all do the same thing. + A következõ kódrészleteknek >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Nov 28 00:47:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id D90DD106567B; Fri, 28 Nov 2008 00:47:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 836C91065675 for ; Fri, 28 Nov 2008 00:47:56 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6E04E8FC14 for ; Fri, 28 Nov 2008 00:47:56 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAS0lu4P035884 for ; Fri, 28 Nov 2008 00:47:56 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAS0luDJ035879 for perforce@freebsd.org; Fri, 28 Nov 2008 00:47:56 GMT (envelope-from zec@tel.fer.hr) Date: Fri, 28 Nov 2008 00:47:56 GMT Message-Id: <200811280047.mAS0luDJ035879@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153678 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, 28 Nov 2008 00:47:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=153678 Change 153678 by zec@zec_tca51 on 2008/11/28 00:47:05 Alchemy... Remove #ifdef VIMAGE blocks around virtualization container declarations, and make quite a few black-magic adjustments required to unbreak the build. Affected files ... .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#9 edit .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 edit .. //depot/projects/vimage-commit2/src/sys/kern/kern_prot.c#3 edit .. //depot/projects/vimage-commit2/src/sys/net/vnet.h#6 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#11 edit .. //depot/projects/vimage-commit2/src/sys/netinet/in.c#14 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_id.c#8 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#19 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_var.h#8 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#14 edit .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.h#1 add .. //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#15 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#16 edit .. //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#13 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/keysock.c#17 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/keysock.h#2 edit .. //depot/projects/vimage-commit2/src/sys/netipsec/vipsec.h#12 edit .. //depot/projects/vimage-commit2/src/sys/rpc/rpc.h#2 edit .. //depot/projects/vimage-commit2/src/sys/sys/param.h#17 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#9 (text+ko) ==== @@ -121,7 +121,7 @@ #endif extern int ip_optcopy __P((struct ip *, struct ip *)); -#if (__FreeBSD_version > 460000) +#if (__FreeBSD_version > 460000) && (__FreeBSD_version < 800000) extern int path_mtu_discovery; #endif ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 (text+ko) ==== @@ -43,7 +43,6 @@ static int ipf_modload(void); static int ipf_modunload(void); -SYSCTL_DECL(_net_inet); #define SYSCTL_IPF(parent, nbr, name, access, ptr, val, descr) \ SYSCTL_OID(parent, nbr, name, CTLTYPE_INT|access, \ ptr, val, sysctl_ipf_int, "I", descr); ==== //depot/projects/vimage-commit2/src/sys/kern/kern_prot.c#3 (text+ko) ==== ==== //depot/projects/vimage-commit2/src/sys/net/vnet.h#6 (text+ko) ==== @@ -33,9 +33,10 @@ #ifndef _NET_VNET_H_ #define _NET_VNET_H_ -#ifdef VIMAGE #include "opt_route.h" +#include +#include #include #include #include @@ -66,8 +67,6 @@ int _ether_ipfw; }; -#endif - /* * Symbol translation macros */ ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#11 (text+ko) ==== @@ -447,7 +447,9 @@ caddr_t ptr; int buflen; +#if 0 /* XXX SA_SIZE(s) defined in net/route.h */ #define SA_SIZE(s) ((s)->sa_lensa_len) +#endif /* Determine size of response and allocate it */ buflen = 0; ==== //depot/projects/vimage-commit2/src/sys/netinet/in.c#14 (text+ko) ==== @@ -70,7 +70,6 @@ static int subnetsarelocal; static int sameprefixcarponly; extern struct inpcbinfo ripcbinfo; -extern struct inpcbinfo udbinfo; #endif SYSCTL_V_INT(V_NET, vnet_inet, _net_inet_ip, OID_AUTO, subnets_are_local, ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_id.c#8 (text+ko) ==== @@ -104,7 +104,6 @@ MTX_SYSINIT(ip_id_mtx, &ip_id_mtx, "ip_id_mtx", MTX_DEF); -SYSCTL_DECL(_net_inet_ip); SYSCTL_PROC(_net_inet_ip, OID_AUTO, random_id_period, CTLTYPE_INT|CTLFLAG_RW, &array_size, 0, sysctl_ip_id_change, "IU", "IP ID Array size"); SYSCTL_INT(_net_inet_ip, OID_AUTO, random_id_collisions, CTLFLAG_RD, ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#19 (text+ko) ==== @@ -104,7 +104,7 @@ static int ip_rsvp_on; struct socket *ip_rsvpd; int rsvp_on; -static TAILQ_HEAD(ipqhead, ipq) ipq[IPREASS_NHASH]; +static struct ipqhead ipq[IPREASS_NHASH]; static int maxnipq; /* Administrative limit on # reass queues. */ static int maxfragsperpacket; int ipstealth; ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_var.h#8 (text+ko) ==== @@ -234,6 +234,7 @@ void in_delayed_cksum(struct mbuf *m); +#if 0 /* XXX moved to netinet/vinet.h */ static __inline uint16_t ip_newid(void); extern int ip_do_randomid; @@ -245,6 +246,7 @@ return htons(V_ip_id++); } +#endif #endif /* _KERNEL */ ==== //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#14 (text+ko) ==== @@ -98,55 +98,12 @@ #include - -TAILQ_HEAD(hc_qhead, hc_metrics); - -struct hc_head { - struct hc_qhead hch_bucket; - u_int hch_length; - struct mtx hch_mtx; -}; - -struct hc_metrics { - /* housekeeping */ - TAILQ_ENTRY(hc_metrics) rmx_q; - struct hc_head *rmx_head; /* head of bucket tail queue */ - struct in_addr ip4; /* IP address */ - struct in6_addr ip6; /* IP6 address */ - /* endpoint specific values for TCP */ - u_long rmx_mtu; /* MTU for this path */ - u_long rmx_ssthresh; /* outbound gateway buffer limit */ - u_long rmx_rtt; /* estimated round trip time */ - u_long rmx_rttvar; /* estimated rtt variance */ - u_long rmx_bandwidth; /* estimated bandwidth */ - u_long rmx_cwnd; /* congestion window */ - u_long rmx_sendpipe; /* outbound delay-bandwidth product */ - u_long rmx_recvpipe; /* inbound delay-bandwidth product */ - /* TCP hostcache internal data */ - int rmx_expire; /* lifetime for object */ - u_long rmx_hits; /* number of hits */ - u_long rmx_updates; /* number of updates */ -}; - /* Arbitrary values */ #define TCP_HOSTCACHE_HASHSIZE 512 #define TCP_HOSTCACHE_BUCKETLIMIT 30 #define TCP_HOSTCACHE_EXPIRE 60*60 /* one hour */ #define TCP_HOSTCACHE_PRUNE 5*60 /* every 5 minutes */ -struct tcp_hostcache { - struct hc_head *hashbase; - uma_zone_t zone; - u_int hashsize; - u_int hashmask; - u_int bucket_limit; - u_int cache_count; - u_int cache_limit; - int expire; - int prune; - int purgeall; -}; - #ifdef VIMAGE_GLOBALS static struct tcp_hostcache tcp_hostcache; static struct callout tcp_hc_callout; ==== //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#15 (text+ko) ==== @@ -33,11 +33,12 @@ #ifndef _NETINET_VINET_H_ #define _NETINET_VINET_H_ -#ifdef VIMAGE #include #include #include +#include + #include #include #include @@ -196,8 +197,6 @@ int _icmp_quotelen; int _icmpbmcastecho; }; -#endif - /* * Symbol translation macros @@ -333,4 +332,17 @@ #define V_udpstat VNET_INET(udpstat) #define V_useloopback VNET_INET(useloopback) +/* XXX moved from netinet/ip_var.h */ +static __inline uint16_t ip_newid(void); +extern int ip_do_randomid; + +static __inline uint16_t +ip_newid(void) +{ + if (V_ip_do_randomid) + return ip_randomid(); + + return htons(V_ip_id++); +} + #endif /* !_NETINET_VINET_H_ */ ==== //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#16 (text+ko) ==== @@ -65,7 +65,6 @@ unsigned long in6_maxmtu; int ip6_auto_linklocal; struct callout in6_tmpaddrtimer_ch; -extern struct inpcbinfo udbinfo; extern struct inpcbinfo ripcbinfo; #endif ==== //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#13 (text+ko) ==== @@ -33,7 +33,6 @@ #ifndef _NETINET6_VINET6_H_ #define _NETINET6_VINET6_H_ -#ifdef VIMAGE #include #include #include @@ -154,15 +153,12 @@ struct ip6_pktopts _ip6_opts; }; -#endif - #define INIT_VNET_INET6(vnet) \ INIT_FROM_VNET(vnet, VNET_MOD_INET6, struct vnet_inet6, vnet_inet6) #define VNET_INET6(sym) VSYM(vnet_inet6, sym) - /* * Symbol translation macros */ ==== //depot/projects/vimage-commit2/src/sys/netipsec/keysock.c#17 (text+ko) ==== @@ -66,11 +66,6 @@ #include -struct key_cb { - int key_count; - int any_count; -}; - #ifdef VIMAGE_GLOBALS static struct key_cb key_cb; struct pfkeystat pfkeystat; ==== //depot/projects/vimage-commit2/src/sys/netipsec/keysock.h#2 (text+ko) ==== @@ -58,6 +58,11 @@ u_quad_t sockerr; /* # of socket related errors */ }; +struct key_cb { + int key_count; + int any_count; +}; + #define KEY_SENDUP_ONE 0 #define KEY_SENDUP_ALL 1 #define KEY_SENDUP_REGISTERED 2 ==== //depot/projects/vimage-commit2/src/sys/netipsec/vipsec.h#12 (text+ko) ==== @@ -33,7 +33,6 @@ #ifndef _NETIPSEC_VIPSEC_H_ #define _NETIPSEC_VIPSEC_H_ -#ifdef VIMAGE #include #include #include @@ -112,7 +111,6 @@ LIST_HEAD(, secacq) _acqtree; LIST_HEAD(, secspacq) _spacqtree; }; -#endif /* * Symbol translation macros ==== //depot/projects/vimage-commit2/src/sys/rpc/rpc.h#2 (text+ko) ==== ==== //depot/projects/vimage-commit2/src/sys/sys/param.h#17 (text+ko) ==== @@ -92,9 +92,13 @@ #include #endif +#ifndef FALSE #define FALSE 0 +#endif +#ifndef TRUE #define TRUE 1 #endif +#endif #ifndef _KERNEL /* Signals. */ From owner-p4-projects@FreeBSD.ORG Fri Nov 28 01:26:37 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2AED01065673; Fri, 28 Nov 2008 01:26:37 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E3687106564A for ; Fri, 28 Nov 2008 01:26:35 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9D78E8FC0C for ; Fri, 28 Nov 2008 01:26:35 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAS1QZFe039826 for ; Fri, 28 Nov 2008 01:26:35 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAS1QZX9039824 for perforce@freebsd.org; Fri, 28 Nov 2008 01:26:35 GMT (envelope-from zec@tel.fer.hr) Date: Fri, 28 Nov 2008 01:26:35 GMT Message-Id: <200811280126.mAS1QZX9039824@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153679 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, 28 Nov 2008 01:26:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=153679 Change 153679 by zec@zec_tca51 on 2008/11/28 01:25:55 Enter struct vnet_netgraph (not used at this point). Affected files ... .. //depot/projects/vimage-commit2/src/sys/netgraph/netgraph.h#14 edit .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#15 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netgraph/netgraph.h#14 (text+ko) ==== @@ -1186,6 +1186,7 @@ /* Hash related definitions */ #define NG_ID_HASH_SIZE 128 /* most systems wont need even this many */ +#define NG_NAME_HASH_SIZE 128 /* most systems wont need even this many */ /* Virtualization macros */ #define INIT_VNET_NETGRAPH(vnet) \ @@ -1194,6 +1195,16 @@ #define VNET_NETGRAPH(sym) VSYM(vnet_netgraph, sym) +struct vnet_netgraph { + LIST_HEAD(, ng_node) _ng_ID_hash[NG_ID_HASH_SIZE]; + LIST_HEAD(, ng_node) _ng_name_hash[NG_NAME_HASH_SIZE]; + LIST_HEAD(, ng_node) _ng_nodelist; + ng_ID_t _nextID; + struct unrhdr *_ng_iface_unit; + struct unrhdr *_ng_eiface_unit; + struct unrhdr *_ng_wormhole_unit; +}; + /* Symbol translation macros */ #define V_nextID VNET_NETGRAPH(nextID) #define V_ng_ID_hash VNET_NETGRAPH(ng_ID_hash) ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#15 (text+ko) ==== @@ -183,7 +183,6 @@ } \ } while (0) -#define NG_NAME_HASH_SIZE 128 /* most systems wont need even this many */ static LIST_HEAD(, ng_node) ng_name_hash[NG_NAME_HASH_SIZE]; static struct mtx ng_namehash_mtx; #define NG_NAMEHASH(NAME, HASH) \ From owner-p4-projects@FreeBSD.ORG Fri Nov 28 01:39:49 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 792EF1065677; Fri, 28 Nov 2008 01:39:49 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3B92D106564A for ; Fri, 28 Nov 2008 01:39:49 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 293D48FC1B for ; Fri, 28 Nov 2008 01:39:49 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAS1dnF4040660 for ; Fri, 28 Nov 2008 01:39:49 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAS1dndJ040658 for perforce@freebsd.org; Fri, 28 Nov 2008 01:39:49 GMT (envelope-from zec@tel.fer.hr) Date: Fri, 28 Nov 2008 01:39:49 GMT Message-Id: <200811280139.mAS1dndJ040658@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153680 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, 28 Nov 2008 01:39:49 -0000 http://perforce.freebsd.org/chv.cgi?CH=153680 Change 153680 by zec@zec_tca51 on 2008/11/28 01:38:50 whitespace adjustment. Affected files ... .. //depot/projects/vimage-commit2/src/sys/netgraph/netgraph.h#15 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netgraph/netgraph.h#15 (text+ko) ==== @@ -1186,7 +1186,7 @@ /* Hash related definitions */ #define NG_ID_HASH_SIZE 128 /* most systems wont need even this many */ -#define NG_NAME_HASH_SIZE 128 /* most systems wont need even this many */ +#define NG_NAME_HASH_SIZE 128 /* most systems wont need even this many */ /* Virtualization macros */ #define INIT_VNET_NETGRAPH(vnet) \ From owner-p4-projects@FreeBSD.ORG Fri Nov 28 01:53:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 37E401065677; Fri, 28 Nov 2008 01:53:03 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F083F1065670 for ; Fri, 28 Nov 2008 01:53:02 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C4C0B8FC0A for ; Fri, 28 Nov 2008 01:53:02 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAS1r2Af041724 for ; Fri, 28 Nov 2008 01:53:02 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAS1r2Yo041722 for perforce@freebsd.org; Fri, 28 Nov 2008 01:53:02 GMT (envelope-from weongyo@FreeBSD.org) Date: Fri, 28 Nov 2008 01:53:02 GMT Message-Id: <200811280153.mAS1r2Yo041722@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 153682 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, 28 Nov 2008 01:53:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=153682 Change 153682 by weongyo@weongyo_ws on 2008/11/28 01:52:55 add `Safehome WLG-1500SMA5' to the supported list. Reported by: kevlo Affected files ... .. //depot/projects/vap/share/man/man4/urtw.4#2 edit Differences ... ==== //depot/projects/vap/share/man/man4/urtw.4#2 (text+ko) ==== @@ -68,6 +68,7 @@ .Pp .Bl -column "Card " "Radio " "Bus" -compact -offset 6n .It Em "Card Radio Bus" +.It Li "Safehome WLG-1500SMA5" Ta RTL8225 Ta USB .It Li "Shuttle XPC Accessory PN20" Ta RTL8225 Ta USB .El .Sh EXAMPLES From owner-p4-projects@FreeBSD.ORG Fri Nov 28 07:13:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 15F271065675; Fri, 28 Nov 2008 07:13:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C1A5C1065672 for ; Fri, 28 Nov 2008 07:13:27 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A97858FC1C for ; Fri, 28 Nov 2008 07:13:27 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAS7DRkm081635 for ; Fri, 28 Nov 2008 07:13:27 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAS7DR0K081633 for perforce@freebsd.org; Fri, 28 Nov 2008 07:13:27 GMT (envelope-from zec@tel.fer.hr) Date: Fri, 28 Nov 2008 07:13:27 GMT Message-Id: <200811280713.mAS7DR0K081633@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153683 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, 28 Nov 2008 07:13:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=153683 Change 153683 by zec@zec_tca51 on 2008/11/28 07:13:12 IFC @ 153681 Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/include/pmc_mdep.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/boot/arm/uboot/Makefile#3 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.amd64#5 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.i386#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/aac/aac_pci.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-queue.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_80003es2lan.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_82540.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_82541.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_82542.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_82543.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_82571.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_82575.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_82575.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_api.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_api.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_defines.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_hw.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_ich8lan.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_ich8lan.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_mac.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_mac.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_manage.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_nvm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_osdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_osdep.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_phy.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_phy.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_regs.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/if_em.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/if_em.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/e1000/if_igb.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/fxp/if_fxp.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/fxp/if_fxpreg.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/fxp/if_fxpvar.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/hwpmc/hwpmc_core.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/hwpmc/hwpmc_core.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/hwpmc/hwpmc_intel.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/hwpmc/hwpmc_logging.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/hwpmc/hwpmc_mod.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/hwpmc/pmc_events.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ixgbe/ixgbe.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ixgbe/ixgbe.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ixgbe/ixgbe_82598.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ixgbe/ixgbe_api.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ixgbe/ixgbe_api.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ixgbe/ixgbe_common.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ixgbe/ixgbe_common.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ixgbe/ixgbe_osdep.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ixgbe/ixgbe_phy.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ixgbe/ixgbe_phy.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ixgbe/ixgbe_type.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_node.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/pmc_mdep.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_conf.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_lockf.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/modules/hwpmc/Makefile#3 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#27 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_output.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_pcb.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_output.c#19 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timewait.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_usrreq.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_pcb.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_pcb.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/raw_ip6.c#19 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/udp6_usrreq.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#19 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.h#8 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec6.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/param.h#18 integrate .. //depot/projects/vimage-commit2/src/sys/sys/pmc.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/sys/pmclog.h#2 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/include/pmc_mdep.h#5 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/pmc_mdep.h,v 1.7 2008/11/09 17:37:54 jkoshy Exp $ + * $FreeBSD: src/sys/amd64/include/pmc_mdep.h,v 1.8 2008/11/27 09:00:47 jkoshy Exp $ */ /* Machine dependent interfaces */ @@ -40,6 +40,7 @@ #endif #include +#include #include #include @@ -51,8 +52,8 @@ #define PMC_MDEP_CLASS_INDEX_TSC 0 #define PMC_MDEP_CLASS_INDEX_K8 1 #define PMC_MDEP_CLASS_INDEX_P4 1 -#define PMC_MDEP_CLASS_INDEX_IAF 1 -#define PMC_MDEP_CLASS_INDEX_IAP 2 +#define PMC_MDEP_CLASS_INDEX_IAP 1 +#define PMC_MDEP_CLASS_INDEX_IAF 2 /* * On the amd64 platform we support the following PMCs. @@ -66,6 +67,8 @@ union pmc_md_op_pmcallocate { struct pmc_md_amd_op_pmcallocate pm_amd; + struct pmc_md_iaf_op_pmcallocate pm_iaf; + struct pmc_md_iap_op_pmcallocate pm_iap; struct pmc_md_p4_op_pmcallocate pm_p4; uint64_t __pad[4]; }; @@ -78,6 +81,8 @@ union pmc_md_pmc { struct pmc_md_amd_pmc pm_amd; + struct pmc_md_iaf_pmc pm_iaf; + struct pmc_md_iap_pmc pm_iap; struct pmc_md_p4_pmc pm_p4; }; ==== //depot/projects/vimage-commit2/src/sys/boot/arm/uboot/Makefile#3 (text+ko) ==== @@ -1,10 +1,9 @@ -# $FreeBSD: src/sys/boot/arm/uboot/Makefile,v 1.2 2008/11/19 17:34:28 raj Exp $ +# $FreeBSD: src/sys/boot/arm/uboot/Makefile,v 1.3 2008/11/27 16:53:01 raj Exp $ PROG= ubldr NEWVERSWHAT= "U-Boot loader" ${MACHINE_ARCH} BINDIR?= /boot INSTALLFLAGS= -b -NO_MAN= WARNS?= 1 # Architecture-specific loader code @@ -61,7 +60,7 @@ CFLAGS+= -I${.CURDIR}/../../common CFLAGS+= -I. -CLEANFILES+= vers.c ${PROG}.help +CLEANFILES+= vers.c loader.help CFLAGS+= -ffreestanding @@ -86,11 +85,11 @@ vers.c: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT} -${PROG}.help: help.common help.uboot +loader.help: help.common help.uboot cat ${.ALLSRC} | \ awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET} .PATH: ${.CURDIR}/../../forth -FILES= ${PROG}.help +FILES= loader.help .include ==== //depot/projects/vimage-commit2/src/sys/conf/files.amd64#5 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.124 2008/11/09 17:37:54 jkoshy Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.125 2008/11/27 09:00:47 jkoshy Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -189,6 +189,7 @@ dev/hptrr/hptrr_config.c optional hptrr dev/hwpmc/hwpmc_amd.c optional hwpmc dev/hwpmc/hwpmc_intel.c optional hwpmc +dev/hwpmc/hwpmc_core.c optional hwpmc dev/hwpmc/hwpmc_piv.c optional hwpmc dev/hwpmc/hwpmc_tsc.c optional hwpmc dev/hwpmc/hwpmc_x86.c optional hwpmc ==== //depot/projects/vimage-commit2/src/sys/conf/files.i386#10 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.609 2008/11/09 17:37:54 jkoshy Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.610 2008/11/27 09:00:47 jkoshy Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -187,6 +187,7 @@ dev/hptrr/hptrr_config.c optional hptrr dev/hwpmc/hwpmc_amd.c optional hwpmc dev/hwpmc/hwpmc_intel.c optional hwpmc +dev/hwpmc/hwpmc_core.c optional hwpmc dev/hwpmc/hwpmc_pentium.c optional hwpmc dev/hwpmc/hwpmc_piv.c optional hwpmc dev/hwpmc/hwpmc_ppro.c optional hwpmc ==== //depot/projects/vimage-commit2/src/sys/dev/aac/aac_pci.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.69 2008/09/12 18:15:12 emaste Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.70 2008/11/27 20:26:02 emaste Exp $"); /* * PCI bus interface and resource allocation. @@ -168,8 +168,6 @@ "ICP ICP9014RO SCSI RAID"}, {0x9005, 0x0285, 0x9005, 0x0294, AAC_HWIF_I960RX, 0, "Adaptec SATA RAID 2026ZCR"}, - {0x9005, 0x0285, 0x103c, 0x3227, AAC_HWIF_I960RX, 0, - "Adaptec SATA RAID 2610SA"}, {0x9005, 0x0285, 0x9005, 0x0296, AAC_HWIF_I960RX, 0, "Adaptec SCSI RAID 2240S"}, {0x9005, 0x0285, 0x9005, 0x0297, AAC_HWIF_I960RX, 0, ==== //depot/projects/vimage-commit2/src/sys/dev/ata/ata-queue.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.74 2008/10/27 09:26:24 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.75 2008/11/27 03:37:46 peter Exp $"); #include "opt_ata.h" #include @@ -357,7 +357,7 @@ "\6MEDIA_CHANGED\5NID_NOT_FOUND" "\4MEDIA_CHANGE_REQEST" "\3ABORTED\2NO_MEDIA\1ILLEGAL_LENGTH"); - if ((request->flags & ATA_R_DMA) && + if ((request->flags & ATA_R_DMA) && request->dma && (request->dma->status & ATA_BMSTAT_ERROR)) printf(" dma=0x%02x", request->dma->status); if (!(request->flags & (ATA_R_ATAPI | ATA_R_CONTROL))) ==== //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_80003es2lan.c#2 (text+ko) ==== @@ -30,9 +30,11 @@ POSSIBILITY OF SUCH DAMAGE. ******************************************************************************/ -/*$FreeBSD: src/sys/dev/e1000/e1000_80003es2lan.c,v 1.1 2008/07/30 21:56:53 jfv Exp $*/ +/*$FreeBSD: src/sys/dev/e1000/e1000_80003es2lan.c,v 1.2 2008/11/26 23:57:23 jfv Exp $*/ -/* e1000_80003es2lan +/* + * 80003ES2LAN Gigabit Ethernet Controller (Copper) + * 80003ES2LAN Gigabit Ethernet Controller (Serdes) */ #include "e1000_api.h" @@ -41,7 +43,9 @@ static s32 e1000_init_nvm_params_80003es2lan(struct e1000_hw *hw); static s32 e1000_init_mac_params_80003es2lan(struct e1000_hw *hw); static s32 e1000_acquire_phy_80003es2lan(struct e1000_hw *hw); +static s32 e1000_acquire_mac_csr_80003es2lan(struct e1000_hw *hw); static void e1000_release_phy_80003es2lan(struct e1000_hw *hw); +static void e1000_release_mac_csr_80003es2lan(struct e1000_hw *hw); static s32 e1000_acquire_nvm_80003es2lan(struct e1000_hw *hw); static void e1000_release_nvm_80003es2lan(struct e1000_hw *hw); static s32 e1000_read_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw, @@ -64,6 +68,11 @@ static s32 e1000_acquire_swfw_sync_80003es2lan(struct e1000_hw *hw, u16 mask); static s32 e1000_cfg_kmrn_10_100_80003es2lan(struct e1000_hw *hw, u16 duplex); static s32 e1000_cfg_kmrn_1000_80003es2lan(struct e1000_hw *hw); +static s32 e1000_cfg_on_link_up_80003es2lan(struct e1000_hw *hw); +static s32 e1000_read_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset, + u16 *data); +static s32 e1000_write_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset, + u16 data); static s32 e1000_copper_link_setup_gg82563_80003es2lan(struct e1000_hw *hw); static void e1000_initialize_hw_bits_80003es2lan(struct e1000_hw *hw); static void e1000_release_swfw_sync_80003es2lan(struct e1000_hw *hw, u16 mask); @@ -84,8 +93,6 @@ /** * e1000_init_phy_params_80003es2lan - Init ESB2 PHY func ptrs. * @hw: pointer to the HW structure - * - * This is a function pointer entry point called by the api module. **/ static s32 e1000_init_phy_params_80003es2lan(struct e1000_hw *hw) { @@ -122,6 +129,8 @@ phy->ops.read_reg = e1000_read_phy_reg_gg82563_80003es2lan; phy->ops.write_reg = e1000_write_phy_reg_gg82563_80003es2lan; + phy->ops.cfg_on_link_up = e1000_cfg_on_link_up_80003es2lan; + /* This can only be done after all function pointers are setup. */ ret_val = e1000_get_phy_id(hw); @@ -138,8 +147,6 @@ /** * e1000_init_nvm_params_80003es2lan - Init ESB2 NVM func ptrs. * @hw: pointer to the HW structure - * - * This is a function pointer entry point called by the api module. **/ static s32 e1000_init_nvm_params_80003es2lan(struct e1000_hw *hw) { @@ -197,8 +204,6 @@ /** * e1000_init_mac_params_80003es2lan - Init ESB2 MAC func ptrs. * @hw: pointer to the HW structure - * - * This is a function pointer entry point called by the api module. **/ static s32 e1000_init_mac_params_80003es2lan(struct e1000_hw *hw) { @@ -280,8 +285,6 @@ /* turn on/off LED */ mac->ops.led_on = e1000_led_on_generic; mac->ops.led_off = e1000_led_off_generic; - /* remove device */ - mac->ops.remove_device = e1000_remove_device_generic; /* clear hardware counters */ mac->ops.clear_hw_cntrs = e1000_clear_hw_cntrs_80003es2lan; /* link info */ @@ -295,8 +298,7 @@ * e1000_init_function_pointers_80003es2lan - Init ESB2 func ptrs. * @hw: pointer to the HW structure * - * The only function explicitly called by the api module to initialize - * all function pointers and parameters. + * Called to initialize all function pointers and parameters. **/ void e1000_init_function_pointers_80003es2lan(struct e1000_hw *hw) { @@ -305,14 +307,14 @@ hw->mac.ops.init_params = e1000_init_mac_params_80003es2lan; hw->nvm.ops.init_params = e1000_init_nvm_params_80003es2lan; hw->phy.ops.init_params = e1000_init_phy_params_80003es2lan; + e1000_get_bus_info_pcie_generic(hw); } /** * e1000_acquire_phy_80003es2lan - Acquire rights to access PHY * @hw: pointer to the HW structure * - * A wrapper to acquire access rights to the correct PHY. This is a - * function pointer entry point called by the api module. + * A wrapper to acquire access rights to the correct PHY. **/ static s32 e1000_acquire_phy_80003es2lan(struct e1000_hw *hw) { @@ -321,8 +323,6 @@ DEBUGFUNC("e1000_acquire_phy_80003es2lan"); mask = hw->bus.func ? E1000_SWFW_PHY1_SM : E1000_SWFW_PHY0_SM; - mask |= E1000_SWFW_CSR_SM; - return e1000_acquire_swfw_sync_80003es2lan(hw, mask); } @@ -330,8 +330,7 @@ * e1000_release_phy_80003es2lan - Release rights to access PHY * @hw: pointer to the HW structure * - * A wrapper to release access rights to the correct PHY. This is a - * function pointer entry point called by the api module. + * A wrapper to release access rights to the correct PHY. **/ static void e1000_release_phy_80003es2lan(struct e1000_hw *hw) { @@ -340,7 +339,41 @@ DEBUGFUNC("e1000_release_phy_80003es2lan"); mask = hw->bus.func ? E1000_SWFW_PHY1_SM : E1000_SWFW_PHY0_SM; - mask |= E1000_SWFW_CSR_SM; + e1000_release_swfw_sync_80003es2lan(hw, mask); +} + + +/** + * e1000_acquire_mac_csr_80003es2lan - Acquire rights to access Kumeran register + * @hw: pointer to the HW structure + * + * Acquire the semaphore to access the Kumeran interface. + * + **/ +static s32 e1000_acquire_mac_csr_80003es2lan(struct e1000_hw *hw) +{ + u16 mask; + + DEBUGFUNC("e1000_acquire_mac_csr_80003es2lan"); + + mask = E1000_SWFW_CSR_SM; + + return e1000_acquire_swfw_sync_80003es2lan(hw, mask); +} + +/** + * e1000_release_mac_csr_80003es2lan - Release rights to access Kumeran Register + * @hw: pointer to the HW structure + * + * Release the semaphore used to access the Kumeran interface + **/ +static void e1000_release_mac_csr_80003es2lan(struct e1000_hw *hw) +{ + u16 mask; + + DEBUGFUNC("e1000_release_mac_csr_80003es2lan"); + + mask = E1000_SWFW_CSR_SM; e1000_release_swfw_sync_80003es2lan(hw, mask); } @@ -349,8 +382,7 @@ * e1000_acquire_nvm_80003es2lan - Acquire rights to access NVM * @hw: pointer to the HW structure * - * Acquire the semaphore to access the EEPROM. This is a function - * pointer entry point called by the api module. + * Acquire the semaphore to access the EEPROM. **/ static s32 e1000_acquire_nvm_80003es2lan(struct e1000_hw *hw) { @@ -375,8 +407,7 @@ * e1000_release_nvm_80003es2lan - Relinquish rights to access NVM * @hw: pointer to the HW structure * - * Release the semaphore used to access the EEPROM. This is a - * function pointer entry point called by the api module. + * Release the semaphore used to access the EEPROM. **/ static void e1000_release_nvm_80003es2lan(struct e1000_hw *hw) { @@ -400,7 +431,7 @@ u32 swmask = mask; u32 fwmask = mask << 16; s32 ret_val = E1000_SUCCESS; - s32 i = 0, timeout = 200; + s32 i = 0, timeout = 50; DEBUGFUNC("e1000_acquire_swfw_sync_80003es2lan"); @@ -452,8 +483,8 @@ DEBUGFUNC("e1000_release_swfw_sync_80003es2lan"); - while (e1000_get_hw_semaphore_generic(hw) != E1000_SUCCESS); - /* Empty */ + while (e1000_get_hw_semaphore_generic(hw) != E1000_SUCCESS) + ; /* Empty */ swfw_sync = E1000_READ_REG(hw, E1000_SW_FW_SYNC); swfw_sync &= ~mask; @@ -468,8 +499,7 @@ * @offset: offset of the register to read * @data: pointer to the data returned from the operation * - * Read the GG82563 PHY register. This is a function pointer entry - * point called by the api module. + * Read the GG82563 PHY register. **/ static s32 e1000_read_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw, u32 offset, u16 *data) @@ -520,9 +550,8 @@ usec_delay(200); - ret_val = e1000_read_phy_reg_mdic(hw, - MAX_PHY_REG_ADDRESS & offset, - data); + ret_val = e1000_read_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset, + data); usec_delay(200); e1000_release_phy_80003es2lan(hw); @@ -537,8 +566,7 @@ * @offset: offset of the register to read * @data: value to write to the register * - * Write to the GG82563 PHY register. This is a function pointer entry - * point called by the api module. + * Write to the GG82563 PHY register. **/ static s32 e1000_write_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw, u32 offset, u16 data) @@ -590,8 +618,7 @@ usec_delay(200); - ret_val = e1000_write_phy_reg_mdic(hw, - MAX_PHY_REG_ADDRESS & offset, + ret_val = e1000_write_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset, data); usec_delay(200); @@ -608,8 +635,7 @@ * @words: number of words to write * @data: buffer of data to write to the NVM * - * Write "words" of data to the ESB2 NVM. This is a function - * pointer entry point called by the api module. + * Write "words" of data to the ESB2 NVM. **/ static s32 e1000_write_nvm_80003es2lan(struct e1000_hw *hw, u16 offset, u16 words, u16 *data) @@ -775,10 +801,17 @@ goto out; index = phy_data & GG82563_DSPD_CABLE_LENGTH; - phy->min_cable_length = e1000_gg82563_cable_length_table[index]; - phy->max_cable_length = e1000_gg82563_cable_length_table[index+5]; + + if (index < GG82563_CABLE_LENGTH_TABLE_SIZE + 5) { + phy->min_cable_length = e1000_gg82563_cable_length_table[index]; + phy->max_cable_length = + e1000_gg82563_cable_length_table[index+5]; - phy->cable_length = (phy->min_cable_length + phy->max_cable_length) / 2; + phy->cable_length = (phy->min_cable_length + + phy->max_cable_length) / 2; + } else { + ret_val = E1000_ERR_PHY; + } out: return ret_val; @@ -791,7 +824,6 @@ * @duplex: pointer to duplex buffer * * Retrieve the current speed and duplex configuration. - * This is a function pointer entry point called by the api module. **/ static s32 e1000_get_link_up_info_80003es2lan(struct e1000_hw *hw, u16 *speed, u16 *duplex) @@ -804,20 +836,13 @@ ret_val = e1000_get_speed_and_duplex_copper_generic(hw, speed, duplex); - if (ret_val) - goto out; - if (*speed == SPEED_1000) - ret_val = e1000_cfg_kmrn_1000_80003es2lan(hw); - else - ret_val = e1000_cfg_kmrn_10_100_80003es2lan(hw, - *duplex); + hw->phy.ops.cfg_on_link_up(hw); } else { ret_val = e1000_get_speed_and_duplex_fiber_serdes_generic(hw, speed, duplex); } -out: return ret_val; } @@ -826,7 +851,6 @@ * @hw: pointer to the HW structure * * Perform a global reset to the ESB2 controller. - * This is a function pointer entry point called by the api module. **/ static s32 e1000_reset_hw_80003es2lan(struct e1000_hw *hw) { @@ -840,9 +864,8 @@ * on the last TLP read/write transaction when MAC is reset. */ ret_val = e1000_disable_pcie_master_generic(hw); - if (ret_val) { + if (ret_val) DEBUGOUT("PCI-E Master disable polling has failed.\n"); - } DEBUGOUT("Masking off all interrupts\n"); E1000_WRITE_REG(hw, E1000_IMC, 0xffffffff); @@ -855,8 +878,10 @@ ctrl = E1000_READ_REG(hw, E1000_CTRL); + ret_val = e1000_acquire_phy_80003es2lan(hw); DEBUGOUT("Issuing a global reset to MAC\n"); E1000_WRITE_REG(hw, E1000_CTRL, ctrl | E1000_CTRL_RST); + e1000_release_phy_80003es2lan(hw); ret_val = e1000_get_auto_rd_done_generic(hw); if (ret_val) @@ -878,7 +903,6 @@ * @hw: pointer to the HW structure * * Initialize the hw bits, LED, VFTA, MTA, link and hw counters. - * This is a function pointer entry point called by the api module. **/ static s32 e1000_init_hw_80003es2lan(struct e1000_hw *hw) { @@ -969,9 +993,6 @@ DEBUGFUNC("e1000_initialize_hw_bits_80003es2lan"); - if (hw->mac.disable_hw_init_bits) - goto out; - /* Transmit Descriptor Control 0 */ reg = E1000_READ_REG(hw, E1000_TXDCTL(0)); reg |= (1 << 22); @@ -997,7 +1018,6 @@ reg |= (1 << 28); E1000_WRITE_REG(hw, E1000_TARC(1), reg); -out: return; } @@ -1012,8 +1032,7 @@ struct e1000_phy_info *phy = &hw->phy; s32 ret_val; u32 ctrl_ext; - u32 i = 0; - u16 data, data2; + u16 data; DEBUGFUNC("e1000_copper_link_setup_gg82563_80003es2lan"); @@ -1084,20 +1103,20 @@ } /* Bypass Rx and Tx FIFO's */ - ret_val = e1000_write_kmrn_reg_generic(hw, + ret_val = e1000_write_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_OFFSET_FIFO_CTRL, E1000_KMRNCTRLSTA_FIFO_CTRL_RX_BYPASS | E1000_KMRNCTRLSTA_FIFO_CTRL_TX_BYPASS); if (ret_val) goto out; - ret_val = e1000_read_kmrn_reg_generic(hw, + ret_val = e1000_read_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_OFFSET_MAC2PHY_OPMODE, &data); if (ret_val) goto out; data |= E1000_KMRNCTRLSTA_OPMODE_E_IDLE; - ret_val = e1000_write_kmrn_reg_generic(hw, + ret_val = e1000_write_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_OFFSET_MAC2PHY_OPMODE, data); if (ret_val) @@ -1129,30 +1148,20 @@ /* Enable Electrical Idle on the PHY */ data |= GG82563_PMCR_ENABLE_ELECTRICAL_IDLE; ret_val = hw->phy.ops.write_reg(hw, - GG82563_PHY_PWR_MGMT_CTRL, - data); + GG82563_PHY_PWR_MGMT_CTRL, + data); if (ret_val) goto out; - - do { - ret_val = hw->phy.ops.read_reg(hw, - GG82563_PHY_KMRN_MODE_CTRL, - &data); + ret_val = hw->phy.ops.read_reg(hw, + GG82563_PHY_KMRN_MODE_CTRL, + &data); if (ret_val) goto out; - ret_val = hw->phy.ops.read_reg(hw, - GG82563_PHY_KMRN_MODE_CTRL, - &data2); - if (ret_val) - goto out; - i++; - } while ((data != data2) && (i < GG82563_MAX_KMRN_RETRY)); - data &= ~GG82563_KMCR_PASS_FALSE_CARRIER; ret_val = hw->phy.ops.write_reg(hw, - GG82563_PHY_KMRN_MODE_CTRL, - data); + GG82563_PHY_KMRN_MODE_CTRL, + data); if (ret_val) goto out; @@ -1185,7 +1194,7 @@ static s32 e1000_setup_copper_link_80003es2lan(struct e1000_hw *hw) { u32 ctrl; - s32 ret_val; + s32 ret_val; u16 reg_data; DEBUGFUNC("e1000_setup_copper_link_80003es2lan"); @@ -1200,26 +1209,26 @@ * iteration and increase the max iterations when * polling the phy; this fixes erroneous timeouts at 10Mbps. */ - ret_val = e1000_write_kmrn_reg_generic(hw, GG82563_REG(0x34, 4), - 0xFFFF); + ret_val = e1000_write_kmrn_reg_80003es2lan(hw, GG82563_REG(0x34, 4), + 0xFFFF); if (ret_val) goto out; - ret_val = e1000_read_kmrn_reg_generic(hw, GG82563_REG(0x34, 9), - ®_data); + ret_val = e1000_read_kmrn_reg_80003es2lan(hw, GG82563_REG(0x34, 9), + ®_data); if (ret_val) goto out; reg_data |= 0x3F; - ret_val = e1000_write_kmrn_reg_generic(hw, GG82563_REG(0x34, 9), - reg_data); + ret_val = e1000_write_kmrn_reg_80003es2lan(hw, GG82563_REG(0x34, 9), + reg_data); if (ret_val) goto out; - ret_val = e1000_read_kmrn_reg_generic(hw, + ret_val = e1000_read_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_OFFSET_INB_CTRL, ®_data); if (ret_val) goto out; reg_data |= E1000_KMRNCTRLSTA_INB_CTRL_DIS_PADDING; - ret_val = e1000_write_kmrn_reg_generic(hw, + ret_val = e1000_write_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_OFFSET_INB_CTRL, reg_data); if (ret_val) @@ -1236,6 +1245,40 @@ } /** + * e1000_cfg_on_link_up_80003es2lan - es2 link configuration after link-up + * @hw: pointer to the HW structure + * @duplex: current duplex setting + * + * Configure the KMRN interface by applying last minute quirks for + * 10/100 operation. + **/ +static s32 e1000_cfg_on_link_up_80003es2lan(struct e1000_hw *hw) +{ + s32 ret_val = E1000_SUCCESS; + u16 speed; + u16 duplex; + + DEBUGFUNC("e1000_configure_on_link_up"); + + if (hw->phy.media_type == e1000_media_type_copper) { + + ret_val = e1000_get_speed_and_duplex_copper_generic(hw, + &speed, + &duplex); + if (ret_val) + goto out; + + if (speed == SPEED_1000) + ret_val = e1000_cfg_kmrn_1000_80003es2lan(hw); + else + ret_val = e1000_cfg_kmrn_10_100_80003es2lan(hw, duplex); + } + +out: + return ret_val; +} + +/** * e1000_cfg_kmrn_10_100_80003es2lan - Apply "quirks" for 10/100 operation * @hw: pointer to the HW structure * @duplex: current duplex setting @@ -1253,7 +1296,7 @@ DEBUGFUNC("e1000_configure_kmrn_for_10_100"); reg_data = E1000_KMRNCTRLSTA_HD_CTRL_10_100_DEFAULT; - ret_val = e1000_write_kmrn_reg_generic(hw, + ret_val = e1000_write_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_OFFSET_HD_CTRL, reg_data); if (ret_val) @@ -1268,12 +1311,12 @@ do { ret_val = hw->phy.ops.read_reg(hw, GG82563_PHY_KMRN_MODE_CTRL, - ®_data); + ®_data); if (ret_val) goto out; ret_val = hw->phy.ops.read_reg(hw, GG82563_PHY_KMRN_MODE_CTRL, - ®_data2); + ®_data2); if (ret_val) goto out; i++; @@ -1307,7 +1350,7 @@ DEBUGFUNC("e1000_configure_kmrn_for_1000"); reg_data = E1000_KMRNCTRLSTA_HD_CTRL_1000_DEFAULT; - ret_val = e1000_write_kmrn_reg_generic(hw, + ret_val = e1000_write_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_OFFSET_HD_CTRL, reg_data); if (ret_val) @@ -1322,12 +1365,12 @@ do { ret_val = hw->phy.ops.read_reg(hw, GG82563_PHY_KMRN_MODE_CTRL, - ®_data); + ®_data); if (ret_val) goto out; ret_val = hw->phy.ops.read_reg(hw, GG82563_PHY_KMRN_MODE_CTRL, - ®_data2); + ®_data2); if (ret_val) goto out; i++; @@ -1341,6 +1384,75 @@ } /** + * e1000_read_kmrn_reg_80003es2lan - Read kumeran register + * @hw: pointer to the HW structure + * @offset: register offset to be read + * @data: pointer to the read data + * + * Acquire semaphore, then read the PHY register at offset + * using the kumeran interface. The information retrieved is stored in data. + * Release the semaphore before exiting. + **/ +s32 e1000_read_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset, u16 *data) +{ + u32 kmrnctrlsta; + s32 ret_val = E1000_SUCCESS; + + DEBUGFUNC("e1000_read_kmrn_reg_80003es2lan"); + + ret_val = e1000_acquire_mac_csr_80003es2lan(hw); + if (ret_val) + goto out; + + kmrnctrlsta = ((offset << E1000_KMRNCTRLSTA_OFFSET_SHIFT) & + E1000_KMRNCTRLSTA_OFFSET) | E1000_KMRNCTRLSTA_REN; + E1000_WRITE_REG(hw, E1000_KMRNCTRLSTA, kmrnctrlsta); + + usec_delay(2); + + kmrnctrlsta = E1000_READ_REG(hw, E1000_KMRNCTRLSTA); + *data = (u16)kmrnctrlsta; + + e1000_release_mac_csr_80003es2lan(hw); + +out: + return ret_val; +} + +/** + * e1000_write_kmrn_reg_80003es2lan - Write kumeran register + * @hw: pointer to the HW structure + * @offset: register offset to write to + * @data: data to write at register offset + * + * Acquire semaphore, then write the data to PHY register + * at the offset using the kumeran interface. Release semaphore + * before exiting. + **/ +s32 e1000_write_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset, u16 data) +{ + u32 kmrnctrlsta; + s32 ret_val = E1000_SUCCESS; + + DEBUGFUNC("e1000_write_kmrn_reg_80003es2lan"); + + ret_val = e1000_acquire_mac_csr_80003es2lan(hw); + if (ret_val) + goto out; + + kmrnctrlsta = ((offset << E1000_KMRNCTRLSTA_OFFSET_SHIFT) & + E1000_KMRNCTRLSTA_OFFSET) | data; + E1000_WRITE_REG(hw, E1000_KMRNCTRLSTA, kmrnctrlsta); + + usec_delay(2); + + e1000_release_mac_csr_80003es2lan(hw); + +out: + return ret_val; +} + +/** * e1000_read_mac_addr_80003es2lan - Read device MAC address * @hw: pointer to the HW structure **/ @@ -1380,44 +1492,42 @@ **/ static void e1000_clear_hw_cntrs_80003es2lan(struct e1000_hw *hw) { - volatile u32 temp; - DEBUGFUNC("e1000_clear_hw_cntrs_80003es2lan"); e1000_clear_hw_cntrs_base_generic(hw); - temp = E1000_READ_REG(hw, E1000_PRC64); - temp = E1000_READ_REG(hw, E1000_PRC127); - temp = E1000_READ_REG(hw, E1000_PRC255); - temp = E1000_READ_REG(hw, E1000_PRC511); - temp = E1000_READ_REG(hw, E1000_PRC1023); - temp = E1000_READ_REG(hw, E1000_PRC1522); - temp = E1000_READ_REG(hw, E1000_PTC64); - temp = E1000_READ_REG(hw, E1000_PTC127); - temp = E1000_READ_REG(hw, E1000_PTC255); - temp = E1000_READ_REG(hw, E1000_PTC511); - temp = E1000_READ_REG(hw, E1000_PTC1023); - temp = E1000_READ_REG(hw, E1000_PTC1522); + E1000_READ_REG(hw, E1000_PRC64); + E1000_READ_REG(hw, E1000_PRC127); + E1000_READ_REG(hw, E1000_PRC255); + E1000_READ_REG(hw, E1000_PRC511); + E1000_READ_REG(hw, E1000_PRC1023); + E1000_READ_REG(hw, E1000_PRC1522); + E1000_READ_REG(hw, E1000_PTC64); + E1000_READ_REG(hw, E1000_PTC127); + E1000_READ_REG(hw, E1000_PTC255); + E1000_READ_REG(hw, E1000_PTC511); + E1000_READ_REG(hw, E1000_PTC1023); + E1000_READ_REG(hw, E1000_PTC1522); - temp = E1000_READ_REG(hw, E1000_ALGNERRC); - temp = E1000_READ_REG(hw, E1000_RXERRC); - temp = E1000_READ_REG(hw, E1000_TNCRS); - temp = E1000_READ_REG(hw, E1000_CEXTERR); - temp = E1000_READ_REG(hw, E1000_TSCTC); - temp = E1000_READ_REG(hw, E1000_TSCTFC); + E1000_READ_REG(hw, E1000_ALGNERRC); + E1000_READ_REG(hw, E1000_RXERRC); + E1000_READ_REG(hw, E1000_TNCRS); + E1000_READ_REG(hw, E1000_CEXTERR); + E1000_READ_REG(hw, E1000_TSCTC); + E1000_READ_REG(hw, E1000_TSCTFC); - temp = E1000_READ_REG(hw, E1000_MGTPRC); - temp = E1000_READ_REG(hw, E1000_MGTPDC); - temp = E1000_READ_REG(hw, E1000_MGTPTC); + E1000_READ_REG(hw, E1000_MGTPRC); + E1000_READ_REG(hw, E1000_MGTPDC); + E1000_READ_REG(hw, E1000_MGTPTC); - temp = E1000_READ_REG(hw, E1000_IAC); - temp = E1000_READ_REG(hw, E1000_ICRXOC); + E1000_READ_REG(hw, E1000_IAC); + E1000_READ_REG(hw, E1000_ICRXOC); - temp = E1000_READ_REG(hw, E1000_ICRXPTC); - temp = E1000_READ_REG(hw, E1000_ICRXATC); - temp = E1000_READ_REG(hw, E1000_ICTXPTC); - temp = E1000_READ_REG(hw, E1000_ICTXATC); - temp = E1000_READ_REG(hw, E1000_ICTXQEC); - temp = E1000_READ_REG(hw, E1000_ICTXQMTC); - temp = E1000_READ_REG(hw, E1000_ICRXDMTC); + E1000_READ_REG(hw, E1000_ICRXPTC); + E1000_READ_REG(hw, E1000_ICRXATC); + E1000_READ_REG(hw, E1000_ICTXPTC); + E1000_READ_REG(hw, E1000_ICTXATC); + E1000_READ_REG(hw, E1000_ICTXQEC); + E1000_READ_REG(hw, E1000_ICTXQMTC); + E1000_READ_REG(hw, E1000_ICRXDMTC); } ==== //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_82540.c#2 (text+ko) ==== @@ -30,13 +30,17 @@ POSSIBILITY OF SUCH DAMAGE. ******************************************************************************/ -/*$FreeBSD: src/sys/dev/e1000/e1000_82540.c,v 1.1 2008/07/30 21:56:53 jfv Exp $*/ +/*$FreeBSD: src/sys/dev/e1000/e1000_82540.c,v 1.2 2008/11/26 23:57:23 jfv Exp $*/ -/* e1000_82540 - * e1000_82545 - * e1000_82546 - * e1000_82545_rev_3 - * e1000_82546_rev_3 +/* + * 82540EM Gigabit Ethernet Controller + * 82540EP Gigabit Ethernet Controller + * 82545EM Gigabit Ethernet Controller (Copper) + * 82545EM Gigabit Ethernet Controller (Fiber) + * 82545GM Gigabit Ethernet Controller + * 82546EB Gigabit Ethernet Controller (Copper) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Nov 28 07:16:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 915551065673; Fri, 28 Nov 2008 07:16:31 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 3C8A11065672 for ; Fri, 28 Nov 2008 07:16:31 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 249728FC18 for ; Fri, 28 Nov 2008 07:16:31 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAS7GV44081871 for ; Fri, 28 Nov 2008 07:16:31 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAS7GUwg081869 for perforce@freebsd.org; Fri, 28 Nov 2008 07:16:30 GMT (envelope-from zec@tel.fer.hr) Date: Fri, 28 Nov 2008 07:16:30 GMT Message-Id: <200811280716.mAS7GUwg081869@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153684 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, 28 Nov 2008 07:16:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=153684 Change 153684 by zec@zec_tca51 on 2008/11/28 07:15:35 IFC @ 153681 Affected files ... .. //depot/projects/vimage-commit/src/sys/amd64/include/pmc_mdep.h#5 integrate .. //depot/projects/vimage-commit/src/sys/boot/arm/uboot/Makefile#2 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.amd64#5 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.i386#9 integrate .. //depot/projects/vimage-commit/src/sys/dev/aac/aac_pci.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-queue.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/e1000_80003es2lan.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/e1000_82540.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/e1000_82541.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/e1000_82542.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/e1000_82543.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/e1000_82571.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/e1000_82575.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/e1000_82575.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/e1000_api.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/e1000_api.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/e1000_defines.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/e1000_hw.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/e1000_ich8lan.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/e1000_ich8lan.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/e1000_mac.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/e1000_mac.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/e1000_manage.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/e1000_nvm.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/e1000_osdep.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/e1000_osdep.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/e1000_phy.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/e1000_phy.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/e1000_regs.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/if_em.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/if_em.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/if_igb.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/fxp/if_fxp.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/fxp/if_fxpreg.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/fxp/if_fxpvar.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/hwpmc/hwpmc_core.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/hwpmc/hwpmc_core.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/hwpmc/hwpmc_intel.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/hwpmc/hwpmc_logging.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/hwpmc/hwpmc_mod.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/hwpmc/pmc_events.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ixgbe/ixgbe.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ixgbe/ixgbe.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/ixgbe/ixgbe_82598.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ixgbe/ixgbe_api.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ixgbe/ixgbe_api.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ixgbe/ixgbe_common.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ixgbe/ixgbe_common.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ixgbe/ixgbe_osdep.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ixgbe/ixgbe_phy.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ixgbe/ixgbe_phy.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ixgbe/ixgbe_type.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/sbni/if_sbni.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/sbni/if_sbni_isa.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/sbni/if_sbni_pci.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/sbni/if_sbnireg.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/sbni/if_sbnivar.h#4 integrate .. //depot/projects/vimage-commit/src/sys/fs/cd9660/cd9660_node.c#4 integrate .. //depot/projects/vimage-commit/src/sys/i386/include/pmc_mdep.h#4 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_conf.c#9 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_lockf.c#5 integrate .. //depot/projects/vimage-commit/src/sys/modules/hwpmc/Makefile#4 integrate .. //depot/projects/vimage-commit/src/sys/modules/sbni/Makefile#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in_pcb.c#11 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_output.c#9 integrate .. //depot/projects/vimage-commit/src/sys/netinet/sctp_pcb.c#9 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_output.c#11 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_timewait.c#8 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_usrreq.c#9 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6_pcb.c#10 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6_pcb.h#5 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/raw_ip6.c#10 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/udp6_usrreq.c#9 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/ipsec.c#12 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/ipsec.h#8 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/ipsec6.h#4 integrate .. //depot/projects/vimage-commit/src/sys/sys/param.h#11 integrate .. //depot/projects/vimage-commit/src/sys/sys/pmc.h#4 integrate .. //depot/projects/vimage-commit/src/sys/sys/pmclog.h#3 integrate Differences ... ==== //depot/projects/vimage-commit/src/sys/amd64/include/pmc_mdep.h#5 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/pmc_mdep.h,v 1.7 2008/11/09 17:37:54 jkoshy Exp $ + * $FreeBSD: src/sys/amd64/include/pmc_mdep.h,v 1.8 2008/11/27 09:00:47 jkoshy Exp $ */ /* Machine dependent interfaces */ @@ -40,6 +40,7 @@ #endif #include +#include #include #include @@ -51,8 +52,8 @@ #define PMC_MDEP_CLASS_INDEX_TSC 0 #define PMC_MDEP_CLASS_INDEX_K8 1 #define PMC_MDEP_CLASS_INDEX_P4 1 -#define PMC_MDEP_CLASS_INDEX_IAF 1 -#define PMC_MDEP_CLASS_INDEX_IAP 2 +#define PMC_MDEP_CLASS_INDEX_IAP 1 +#define PMC_MDEP_CLASS_INDEX_IAF 2 /* * On the amd64 platform we support the following PMCs. @@ -66,6 +67,8 @@ union pmc_md_op_pmcallocate { struct pmc_md_amd_op_pmcallocate pm_amd; + struct pmc_md_iaf_op_pmcallocate pm_iaf; + struct pmc_md_iap_op_pmcallocate pm_iap; struct pmc_md_p4_op_pmcallocate pm_p4; uint64_t __pad[4]; }; @@ -78,6 +81,8 @@ union pmc_md_pmc { struct pmc_md_amd_pmc pm_amd; + struct pmc_md_iaf_pmc pm_iaf; + struct pmc_md_iap_pmc pm_iap; struct pmc_md_p4_pmc pm_p4; }; ==== //depot/projects/vimage-commit/src/sys/boot/arm/uboot/Makefile#2 (text+ko) ==== @@ -1,10 +1,9 @@ -# $FreeBSD: src/sys/boot/arm/uboot/Makefile,v 1.2 2008/11/19 17:34:28 raj Exp $ +# $FreeBSD: src/sys/boot/arm/uboot/Makefile,v 1.3 2008/11/27 16:53:01 raj Exp $ PROG= ubldr NEWVERSWHAT= "U-Boot loader" ${MACHINE_ARCH} BINDIR?= /boot INSTALLFLAGS= -b -NO_MAN= WARNS?= 1 # Architecture-specific loader code @@ -61,7 +60,7 @@ CFLAGS+= -I${.CURDIR}/../../common CFLAGS+= -I. -CLEANFILES+= vers.c ${PROG}.help +CLEANFILES+= vers.c loader.help CFLAGS+= -ffreestanding @@ -86,11 +85,11 @@ vers.c: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT} -${PROG}.help: help.common help.uboot +loader.help: help.common help.uboot cat ${.ALLSRC} | \ awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET} .PATH: ${.CURDIR}/../../forth -FILES= ${PROG}.help +FILES= loader.help .include ==== //depot/projects/vimage-commit/src/sys/conf/files.amd64#5 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.124 2008/11/09 17:37:54 jkoshy Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.125 2008/11/27 09:00:47 jkoshy Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -189,6 +189,7 @@ dev/hptrr/hptrr_config.c optional hptrr dev/hwpmc/hwpmc_amd.c optional hwpmc dev/hwpmc/hwpmc_intel.c optional hwpmc +dev/hwpmc/hwpmc_core.c optional hwpmc dev/hwpmc/hwpmc_piv.c optional hwpmc dev/hwpmc/hwpmc_tsc.c optional hwpmc dev/hwpmc/hwpmc_x86.c optional hwpmc ==== //depot/projects/vimage-commit/src/sys/conf/files.i386#9 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.609 2008/11/09 17:37:54 jkoshy Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.610 2008/11/27 09:00:47 jkoshy Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -187,6 +187,7 @@ dev/hptrr/hptrr_config.c optional hptrr dev/hwpmc/hwpmc_amd.c optional hwpmc dev/hwpmc/hwpmc_intel.c optional hwpmc +dev/hwpmc/hwpmc_core.c optional hwpmc dev/hwpmc/hwpmc_pentium.c optional hwpmc dev/hwpmc/hwpmc_piv.c optional hwpmc dev/hwpmc/hwpmc_ppro.c optional hwpmc ==== //depot/projects/vimage-commit/src/sys/dev/aac/aac_pci.c#5 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.69 2008/09/12 18:15:12 emaste Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.70 2008/11/27 20:26:02 emaste Exp $"); /* * PCI bus interface and resource allocation. @@ -168,8 +168,6 @@ "ICP ICP9014RO SCSI RAID"}, {0x9005, 0x0285, 0x9005, 0x0294, AAC_HWIF_I960RX, 0, "Adaptec SATA RAID 2026ZCR"}, - {0x9005, 0x0285, 0x103c, 0x3227, AAC_HWIF_I960RX, 0, - "Adaptec SATA RAID 2610SA"}, {0x9005, 0x0285, 0x9005, 0x0296, AAC_HWIF_I960RX, 0, "Adaptec SCSI RAID 2240S"}, {0x9005, 0x0285, 0x9005, 0x0297, AAC_HWIF_I960RX, 0, ==== //depot/projects/vimage-commit/src/sys/dev/ata/ata-queue.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.74 2008/10/27 09:26:24 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.75 2008/11/27 03:37:46 peter Exp $"); #include "opt_ata.h" #include @@ -357,7 +357,7 @@ "\6MEDIA_CHANGED\5NID_NOT_FOUND" "\4MEDIA_CHANGE_REQEST" "\3ABORTED\2NO_MEDIA\1ILLEGAL_LENGTH"); - if ((request->flags & ATA_R_DMA) && + if ((request->flags & ATA_R_DMA) && request->dma && (request->dma->status & ATA_BMSTAT_ERROR)) printf(" dma=0x%02x", request->dma->status); if (!(request->flags & (ATA_R_ATAPI | ATA_R_CONTROL))) ==== //depot/projects/vimage-commit/src/sys/dev/e1000/e1000_80003es2lan.c#3 (text+ko) ==== @@ -30,9 +30,11 @@ POSSIBILITY OF SUCH DAMAGE. ******************************************************************************/ -/*$FreeBSD: src/sys/dev/e1000/e1000_80003es2lan.c,v 1.1 2008/07/30 21:56:53 jfv Exp $*/ +/*$FreeBSD: src/sys/dev/e1000/e1000_80003es2lan.c,v 1.2 2008/11/26 23:57:23 jfv Exp $*/ -/* e1000_80003es2lan +/* + * 80003ES2LAN Gigabit Ethernet Controller (Copper) + * 80003ES2LAN Gigabit Ethernet Controller (Serdes) */ #include "e1000_api.h" @@ -41,7 +43,9 @@ static s32 e1000_init_nvm_params_80003es2lan(struct e1000_hw *hw); static s32 e1000_init_mac_params_80003es2lan(struct e1000_hw *hw); static s32 e1000_acquire_phy_80003es2lan(struct e1000_hw *hw); +static s32 e1000_acquire_mac_csr_80003es2lan(struct e1000_hw *hw); static void e1000_release_phy_80003es2lan(struct e1000_hw *hw); +static void e1000_release_mac_csr_80003es2lan(struct e1000_hw *hw); static s32 e1000_acquire_nvm_80003es2lan(struct e1000_hw *hw); static void e1000_release_nvm_80003es2lan(struct e1000_hw *hw); static s32 e1000_read_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw, @@ -64,6 +68,11 @@ static s32 e1000_acquire_swfw_sync_80003es2lan(struct e1000_hw *hw, u16 mask); static s32 e1000_cfg_kmrn_10_100_80003es2lan(struct e1000_hw *hw, u16 duplex); static s32 e1000_cfg_kmrn_1000_80003es2lan(struct e1000_hw *hw); +static s32 e1000_cfg_on_link_up_80003es2lan(struct e1000_hw *hw); +static s32 e1000_read_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset, + u16 *data); +static s32 e1000_write_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset, + u16 data); static s32 e1000_copper_link_setup_gg82563_80003es2lan(struct e1000_hw *hw); static void e1000_initialize_hw_bits_80003es2lan(struct e1000_hw *hw); static void e1000_release_swfw_sync_80003es2lan(struct e1000_hw *hw, u16 mask); @@ -84,8 +93,6 @@ /** * e1000_init_phy_params_80003es2lan - Init ESB2 PHY func ptrs. * @hw: pointer to the HW structure - * - * This is a function pointer entry point called by the api module. **/ static s32 e1000_init_phy_params_80003es2lan(struct e1000_hw *hw) { @@ -122,6 +129,8 @@ phy->ops.read_reg = e1000_read_phy_reg_gg82563_80003es2lan; phy->ops.write_reg = e1000_write_phy_reg_gg82563_80003es2lan; + phy->ops.cfg_on_link_up = e1000_cfg_on_link_up_80003es2lan; + /* This can only be done after all function pointers are setup. */ ret_val = e1000_get_phy_id(hw); @@ -138,8 +147,6 @@ /** * e1000_init_nvm_params_80003es2lan - Init ESB2 NVM func ptrs. * @hw: pointer to the HW structure - * - * This is a function pointer entry point called by the api module. **/ static s32 e1000_init_nvm_params_80003es2lan(struct e1000_hw *hw) { @@ -197,8 +204,6 @@ /** * e1000_init_mac_params_80003es2lan - Init ESB2 MAC func ptrs. * @hw: pointer to the HW structure - * - * This is a function pointer entry point called by the api module. **/ static s32 e1000_init_mac_params_80003es2lan(struct e1000_hw *hw) { @@ -280,8 +285,6 @@ /* turn on/off LED */ mac->ops.led_on = e1000_led_on_generic; mac->ops.led_off = e1000_led_off_generic; - /* remove device */ - mac->ops.remove_device = e1000_remove_device_generic; /* clear hardware counters */ mac->ops.clear_hw_cntrs = e1000_clear_hw_cntrs_80003es2lan; /* link info */ @@ -295,8 +298,7 @@ * e1000_init_function_pointers_80003es2lan - Init ESB2 func ptrs. * @hw: pointer to the HW structure * - * The only function explicitly called by the api module to initialize - * all function pointers and parameters. + * Called to initialize all function pointers and parameters. **/ void e1000_init_function_pointers_80003es2lan(struct e1000_hw *hw) { @@ -305,14 +307,14 @@ hw->mac.ops.init_params = e1000_init_mac_params_80003es2lan; hw->nvm.ops.init_params = e1000_init_nvm_params_80003es2lan; hw->phy.ops.init_params = e1000_init_phy_params_80003es2lan; + e1000_get_bus_info_pcie_generic(hw); } /** * e1000_acquire_phy_80003es2lan - Acquire rights to access PHY * @hw: pointer to the HW structure * - * A wrapper to acquire access rights to the correct PHY. This is a - * function pointer entry point called by the api module. + * A wrapper to acquire access rights to the correct PHY. **/ static s32 e1000_acquire_phy_80003es2lan(struct e1000_hw *hw) { @@ -321,8 +323,6 @@ DEBUGFUNC("e1000_acquire_phy_80003es2lan"); mask = hw->bus.func ? E1000_SWFW_PHY1_SM : E1000_SWFW_PHY0_SM; - mask |= E1000_SWFW_CSR_SM; - return e1000_acquire_swfw_sync_80003es2lan(hw, mask); } @@ -330,8 +330,7 @@ * e1000_release_phy_80003es2lan - Release rights to access PHY * @hw: pointer to the HW structure * - * A wrapper to release access rights to the correct PHY. This is a - * function pointer entry point called by the api module. + * A wrapper to release access rights to the correct PHY. **/ static void e1000_release_phy_80003es2lan(struct e1000_hw *hw) { @@ -340,7 +339,41 @@ DEBUGFUNC("e1000_release_phy_80003es2lan"); mask = hw->bus.func ? E1000_SWFW_PHY1_SM : E1000_SWFW_PHY0_SM; - mask |= E1000_SWFW_CSR_SM; + e1000_release_swfw_sync_80003es2lan(hw, mask); +} + + +/** + * e1000_acquire_mac_csr_80003es2lan - Acquire rights to access Kumeran register + * @hw: pointer to the HW structure + * + * Acquire the semaphore to access the Kumeran interface. + * + **/ +static s32 e1000_acquire_mac_csr_80003es2lan(struct e1000_hw *hw) +{ + u16 mask; + + DEBUGFUNC("e1000_acquire_mac_csr_80003es2lan"); + + mask = E1000_SWFW_CSR_SM; + + return e1000_acquire_swfw_sync_80003es2lan(hw, mask); +} + +/** + * e1000_release_mac_csr_80003es2lan - Release rights to access Kumeran Register + * @hw: pointer to the HW structure + * + * Release the semaphore used to access the Kumeran interface + **/ +static void e1000_release_mac_csr_80003es2lan(struct e1000_hw *hw) +{ + u16 mask; + + DEBUGFUNC("e1000_release_mac_csr_80003es2lan"); + + mask = E1000_SWFW_CSR_SM; e1000_release_swfw_sync_80003es2lan(hw, mask); } @@ -349,8 +382,7 @@ * e1000_acquire_nvm_80003es2lan - Acquire rights to access NVM * @hw: pointer to the HW structure * - * Acquire the semaphore to access the EEPROM. This is a function - * pointer entry point called by the api module. + * Acquire the semaphore to access the EEPROM. **/ static s32 e1000_acquire_nvm_80003es2lan(struct e1000_hw *hw) { @@ -375,8 +407,7 @@ * e1000_release_nvm_80003es2lan - Relinquish rights to access NVM * @hw: pointer to the HW structure * - * Release the semaphore used to access the EEPROM. This is a - * function pointer entry point called by the api module. + * Release the semaphore used to access the EEPROM. **/ static void e1000_release_nvm_80003es2lan(struct e1000_hw *hw) { @@ -400,7 +431,7 @@ u32 swmask = mask; u32 fwmask = mask << 16; s32 ret_val = E1000_SUCCESS; - s32 i = 0, timeout = 200; + s32 i = 0, timeout = 50; DEBUGFUNC("e1000_acquire_swfw_sync_80003es2lan"); @@ -452,8 +483,8 @@ DEBUGFUNC("e1000_release_swfw_sync_80003es2lan"); - while (e1000_get_hw_semaphore_generic(hw) != E1000_SUCCESS); - /* Empty */ + while (e1000_get_hw_semaphore_generic(hw) != E1000_SUCCESS) + ; /* Empty */ swfw_sync = E1000_READ_REG(hw, E1000_SW_FW_SYNC); swfw_sync &= ~mask; @@ -468,8 +499,7 @@ * @offset: offset of the register to read * @data: pointer to the data returned from the operation * - * Read the GG82563 PHY register. This is a function pointer entry - * point called by the api module. + * Read the GG82563 PHY register. **/ static s32 e1000_read_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw, u32 offset, u16 *data) @@ -520,9 +550,8 @@ usec_delay(200); - ret_val = e1000_read_phy_reg_mdic(hw, - MAX_PHY_REG_ADDRESS & offset, - data); + ret_val = e1000_read_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset, + data); usec_delay(200); e1000_release_phy_80003es2lan(hw); @@ -537,8 +566,7 @@ * @offset: offset of the register to read * @data: value to write to the register * - * Write to the GG82563 PHY register. This is a function pointer entry - * point called by the api module. + * Write to the GG82563 PHY register. **/ static s32 e1000_write_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw, u32 offset, u16 data) @@ -590,8 +618,7 @@ usec_delay(200); - ret_val = e1000_write_phy_reg_mdic(hw, - MAX_PHY_REG_ADDRESS & offset, + ret_val = e1000_write_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset, data); usec_delay(200); @@ -608,8 +635,7 @@ * @words: number of words to write * @data: buffer of data to write to the NVM * - * Write "words" of data to the ESB2 NVM. This is a function - * pointer entry point called by the api module. + * Write "words" of data to the ESB2 NVM. **/ static s32 e1000_write_nvm_80003es2lan(struct e1000_hw *hw, u16 offset, u16 words, u16 *data) @@ -775,10 +801,17 @@ goto out; index = phy_data & GG82563_DSPD_CABLE_LENGTH; - phy->min_cable_length = e1000_gg82563_cable_length_table[index]; - phy->max_cable_length = e1000_gg82563_cable_length_table[index+5]; + + if (index < GG82563_CABLE_LENGTH_TABLE_SIZE + 5) { + phy->min_cable_length = e1000_gg82563_cable_length_table[index]; + phy->max_cable_length = + e1000_gg82563_cable_length_table[index+5]; - phy->cable_length = (phy->min_cable_length + phy->max_cable_length) / 2; + phy->cable_length = (phy->min_cable_length + + phy->max_cable_length) / 2; + } else { + ret_val = E1000_ERR_PHY; + } out: return ret_val; @@ -791,7 +824,6 @@ * @duplex: pointer to duplex buffer * * Retrieve the current speed and duplex configuration. - * This is a function pointer entry point called by the api module. **/ static s32 e1000_get_link_up_info_80003es2lan(struct e1000_hw *hw, u16 *speed, u16 *duplex) @@ -804,20 +836,13 @@ ret_val = e1000_get_speed_and_duplex_copper_generic(hw, speed, duplex); - if (ret_val) - goto out; - if (*speed == SPEED_1000) - ret_val = e1000_cfg_kmrn_1000_80003es2lan(hw); - else - ret_val = e1000_cfg_kmrn_10_100_80003es2lan(hw, - *duplex); + hw->phy.ops.cfg_on_link_up(hw); } else { ret_val = e1000_get_speed_and_duplex_fiber_serdes_generic(hw, speed, duplex); } -out: return ret_val; } @@ -826,7 +851,6 @@ * @hw: pointer to the HW structure * * Perform a global reset to the ESB2 controller. - * This is a function pointer entry point called by the api module. **/ static s32 e1000_reset_hw_80003es2lan(struct e1000_hw *hw) { @@ -840,9 +864,8 @@ * on the last TLP read/write transaction when MAC is reset. */ ret_val = e1000_disable_pcie_master_generic(hw); - if (ret_val) { + if (ret_val) DEBUGOUT("PCI-E Master disable polling has failed.\n"); - } DEBUGOUT("Masking off all interrupts\n"); E1000_WRITE_REG(hw, E1000_IMC, 0xffffffff); @@ -855,8 +878,10 @@ ctrl = E1000_READ_REG(hw, E1000_CTRL); + ret_val = e1000_acquire_phy_80003es2lan(hw); DEBUGOUT("Issuing a global reset to MAC\n"); E1000_WRITE_REG(hw, E1000_CTRL, ctrl | E1000_CTRL_RST); + e1000_release_phy_80003es2lan(hw); ret_val = e1000_get_auto_rd_done_generic(hw); if (ret_val) @@ -878,7 +903,6 @@ * @hw: pointer to the HW structure * * Initialize the hw bits, LED, VFTA, MTA, link and hw counters. - * This is a function pointer entry point called by the api module. **/ static s32 e1000_init_hw_80003es2lan(struct e1000_hw *hw) { @@ -969,9 +993,6 @@ DEBUGFUNC("e1000_initialize_hw_bits_80003es2lan"); - if (hw->mac.disable_hw_init_bits) - goto out; - /* Transmit Descriptor Control 0 */ reg = E1000_READ_REG(hw, E1000_TXDCTL(0)); reg |= (1 << 22); @@ -997,7 +1018,6 @@ reg |= (1 << 28); E1000_WRITE_REG(hw, E1000_TARC(1), reg); -out: return; } @@ -1012,8 +1032,7 @@ struct e1000_phy_info *phy = &hw->phy; s32 ret_val; u32 ctrl_ext; - u32 i = 0; - u16 data, data2; + u16 data; DEBUGFUNC("e1000_copper_link_setup_gg82563_80003es2lan"); @@ -1084,20 +1103,20 @@ } /* Bypass Rx and Tx FIFO's */ - ret_val = e1000_write_kmrn_reg_generic(hw, + ret_val = e1000_write_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_OFFSET_FIFO_CTRL, E1000_KMRNCTRLSTA_FIFO_CTRL_RX_BYPASS | E1000_KMRNCTRLSTA_FIFO_CTRL_TX_BYPASS); if (ret_val) goto out; - ret_val = e1000_read_kmrn_reg_generic(hw, + ret_val = e1000_read_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_OFFSET_MAC2PHY_OPMODE, &data); if (ret_val) goto out; data |= E1000_KMRNCTRLSTA_OPMODE_E_IDLE; - ret_val = e1000_write_kmrn_reg_generic(hw, + ret_val = e1000_write_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_OFFSET_MAC2PHY_OPMODE, data); if (ret_val) @@ -1129,30 +1148,20 @@ /* Enable Electrical Idle on the PHY */ data |= GG82563_PMCR_ENABLE_ELECTRICAL_IDLE; ret_val = hw->phy.ops.write_reg(hw, - GG82563_PHY_PWR_MGMT_CTRL, - data); + GG82563_PHY_PWR_MGMT_CTRL, + data); if (ret_val) goto out; - - do { - ret_val = hw->phy.ops.read_reg(hw, - GG82563_PHY_KMRN_MODE_CTRL, - &data); + ret_val = hw->phy.ops.read_reg(hw, + GG82563_PHY_KMRN_MODE_CTRL, + &data); if (ret_val) goto out; - ret_val = hw->phy.ops.read_reg(hw, - GG82563_PHY_KMRN_MODE_CTRL, - &data2); - if (ret_val) - goto out; - i++; - } while ((data != data2) && (i < GG82563_MAX_KMRN_RETRY)); - data &= ~GG82563_KMCR_PASS_FALSE_CARRIER; ret_val = hw->phy.ops.write_reg(hw, - GG82563_PHY_KMRN_MODE_CTRL, - data); + GG82563_PHY_KMRN_MODE_CTRL, + data); if (ret_val) goto out; @@ -1185,7 +1194,7 @@ static s32 e1000_setup_copper_link_80003es2lan(struct e1000_hw *hw) { u32 ctrl; - s32 ret_val; + s32 ret_val; u16 reg_data; DEBUGFUNC("e1000_setup_copper_link_80003es2lan"); @@ -1200,26 +1209,26 @@ * iteration and increase the max iterations when * polling the phy; this fixes erroneous timeouts at 10Mbps. */ - ret_val = e1000_write_kmrn_reg_generic(hw, GG82563_REG(0x34, 4), - 0xFFFF); + ret_val = e1000_write_kmrn_reg_80003es2lan(hw, GG82563_REG(0x34, 4), + 0xFFFF); if (ret_val) goto out; - ret_val = e1000_read_kmrn_reg_generic(hw, GG82563_REG(0x34, 9), - ®_data); + ret_val = e1000_read_kmrn_reg_80003es2lan(hw, GG82563_REG(0x34, 9), + ®_data); if (ret_val) goto out; reg_data |= 0x3F; - ret_val = e1000_write_kmrn_reg_generic(hw, GG82563_REG(0x34, 9), - reg_data); + ret_val = e1000_write_kmrn_reg_80003es2lan(hw, GG82563_REG(0x34, 9), + reg_data); if (ret_val) goto out; - ret_val = e1000_read_kmrn_reg_generic(hw, + ret_val = e1000_read_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_OFFSET_INB_CTRL, ®_data); if (ret_val) goto out; reg_data |= E1000_KMRNCTRLSTA_INB_CTRL_DIS_PADDING; - ret_val = e1000_write_kmrn_reg_generic(hw, + ret_val = e1000_write_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_OFFSET_INB_CTRL, reg_data); if (ret_val) @@ -1236,6 +1245,40 @@ } /** + * e1000_cfg_on_link_up_80003es2lan - es2 link configuration after link-up + * @hw: pointer to the HW structure + * @duplex: current duplex setting + * + * Configure the KMRN interface by applying last minute quirks for + * 10/100 operation. + **/ +static s32 e1000_cfg_on_link_up_80003es2lan(struct e1000_hw *hw) +{ + s32 ret_val = E1000_SUCCESS; + u16 speed; + u16 duplex; + + DEBUGFUNC("e1000_configure_on_link_up"); + + if (hw->phy.media_type == e1000_media_type_copper) { + + ret_val = e1000_get_speed_and_duplex_copper_generic(hw, + &speed, + &duplex); + if (ret_val) + goto out; + + if (speed == SPEED_1000) + ret_val = e1000_cfg_kmrn_1000_80003es2lan(hw); + else + ret_val = e1000_cfg_kmrn_10_100_80003es2lan(hw, duplex); + } + +out: + return ret_val; +} + +/** * e1000_cfg_kmrn_10_100_80003es2lan - Apply "quirks" for 10/100 operation * @hw: pointer to the HW structure * @duplex: current duplex setting @@ -1253,7 +1296,7 @@ DEBUGFUNC("e1000_configure_kmrn_for_10_100"); reg_data = E1000_KMRNCTRLSTA_HD_CTRL_10_100_DEFAULT; - ret_val = e1000_write_kmrn_reg_generic(hw, + ret_val = e1000_write_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_OFFSET_HD_CTRL, reg_data); if (ret_val) @@ -1268,12 +1311,12 @@ do { ret_val = hw->phy.ops.read_reg(hw, GG82563_PHY_KMRN_MODE_CTRL, - ®_data); + ®_data); if (ret_val) goto out; ret_val = hw->phy.ops.read_reg(hw, GG82563_PHY_KMRN_MODE_CTRL, - ®_data2); + ®_data2); if (ret_val) goto out; i++; @@ -1307,7 +1350,7 @@ DEBUGFUNC("e1000_configure_kmrn_for_1000"); reg_data = E1000_KMRNCTRLSTA_HD_CTRL_1000_DEFAULT; - ret_val = e1000_write_kmrn_reg_generic(hw, + ret_val = e1000_write_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_OFFSET_HD_CTRL, reg_data); if (ret_val) @@ -1322,12 +1365,12 @@ do { ret_val = hw->phy.ops.read_reg(hw, GG82563_PHY_KMRN_MODE_CTRL, - ®_data); + ®_data); if (ret_val) goto out; ret_val = hw->phy.ops.read_reg(hw, GG82563_PHY_KMRN_MODE_CTRL, - ®_data2); + ®_data2); if (ret_val) goto out; i++; @@ -1341,6 +1384,75 @@ } /** + * e1000_read_kmrn_reg_80003es2lan - Read kumeran register + * @hw: pointer to the HW structure + * @offset: register offset to be read + * @data: pointer to the read data + * + * Acquire semaphore, then read the PHY register at offset + * using the kumeran interface. The information retrieved is stored in data. + * Release the semaphore before exiting. + **/ +s32 e1000_read_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset, u16 *data) +{ + u32 kmrnctrlsta; + s32 ret_val = E1000_SUCCESS; + + DEBUGFUNC("e1000_read_kmrn_reg_80003es2lan"); + + ret_val = e1000_acquire_mac_csr_80003es2lan(hw); + if (ret_val) + goto out; + + kmrnctrlsta = ((offset << E1000_KMRNCTRLSTA_OFFSET_SHIFT) & + E1000_KMRNCTRLSTA_OFFSET) | E1000_KMRNCTRLSTA_REN; + E1000_WRITE_REG(hw, E1000_KMRNCTRLSTA, kmrnctrlsta); + + usec_delay(2); + + kmrnctrlsta = E1000_READ_REG(hw, E1000_KMRNCTRLSTA); + *data = (u16)kmrnctrlsta; + + e1000_release_mac_csr_80003es2lan(hw); + +out: + return ret_val; +} + +/** + * e1000_write_kmrn_reg_80003es2lan - Write kumeran register + * @hw: pointer to the HW structure + * @offset: register offset to write to + * @data: data to write at register offset + * + * Acquire semaphore, then write the data to PHY register + * at the offset using the kumeran interface. Release semaphore + * before exiting. + **/ +s32 e1000_write_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset, u16 data) +{ + u32 kmrnctrlsta; + s32 ret_val = E1000_SUCCESS; + + DEBUGFUNC("e1000_write_kmrn_reg_80003es2lan"); + + ret_val = e1000_acquire_mac_csr_80003es2lan(hw); + if (ret_val) + goto out; + + kmrnctrlsta = ((offset << E1000_KMRNCTRLSTA_OFFSET_SHIFT) & + E1000_KMRNCTRLSTA_OFFSET) | data; + E1000_WRITE_REG(hw, E1000_KMRNCTRLSTA, kmrnctrlsta); + + usec_delay(2); + + e1000_release_mac_csr_80003es2lan(hw); + +out: + return ret_val; +} + +/** * e1000_read_mac_addr_80003es2lan - Read device MAC address * @hw: pointer to the HW structure **/ @@ -1380,44 +1492,42 @@ **/ static void e1000_clear_hw_cntrs_80003es2lan(struct e1000_hw *hw) { - volatile u32 temp; - DEBUGFUNC("e1000_clear_hw_cntrs_80003es2lan"); e1000_clear_hw_cntrs_base_generic(hw); - temp = E1000_READ_REG(hw, E1000_PRC64); - temp = E1000_READ_REG(hw, E1000_PRC127); - temp = E1000_READ_REG(hw, E1000_PRC255); - temp = E1000_READ_REG(hw, E1000_PRC511); - temp = E1000_READ_REG(hw, E1000_PRC1023); - temp = E1000_READ_REG(hw, E1000_PRC1522); - temp = E1000_READ_REG(hw, E1000_PTC64); - temp = E1000_READ_REG(hw, E1000_PTC127); - temp = E1000_READ_REG(hw, E1000_PTC255); - temp = E1000_READ_REG(hw, E1000_PTC511); - temp = E1000_READ_REG(hw, E1000_PTC1023); - temp = E1000_READ_REG(hw, E1000_PTC1522); + E1000_READ_REG(hw, E1000_PRC64); + E1000_READ_REG(hw, E1000_PRC127); + E1000_READ_REG(hw, E1000_PRC255); + E1000_READ_REG(hw, E1000_PRC511); + E1000_READ_REG(hw, E1000_PRC1023); + E1000_READ_REG(hw, E1000_PRC1522); + E1000_READ_REG(hw, E1000_PTC64); + E1000_READ_REG(hw, E1000_PTC127); + E1000_READ_REG(hw, E1000_PTC255); + E1000_READ_REG(hw, E1000_PTC511); + E1000_READ_REG(hw, E1000_PTC1023); + E1000_READ_REG(hw, E1000_PTC1522); - temp = E1000_READ_REG(hw, E1000_ALGNERRC); - temp = E1000_READ_REG(hw, E1000_RXERRC); - temp = E1000_READ_REG(hw, E1000_TNCRS); - temp = E1000_READ_REG(hw, E1000_CEXTERR); - temp = E1000_READ_REG(hw, E1000_TSCTC); - temp = E1000_READ_REG(hw, E1000_TSCTFC); + E1000_READ_REG(hw, E1000_ALGNERRC); + E1000_READ_REG(hw, E1000_RXERRC); + E1000_READ_REG(hw, E1000_TNCRS); + E1000_READ_REG(hw, E1000_CEXTERR); + E1000_READ_REG(hw, E1000_TSCTC); + E1000_READ_REG(hw, E1000_TSCTFC); - temp = E1000_READ_REG(hw, E1000_MGTPRC); - temp = E1000_READ_REG(hw, E1000_MGTPDC); - temp = E1000_READ_REG(hw, E1000_MGTPTC); + E1000_READ_REG(hw, E1000_MGTPRC); + E1000_READ_REG(hw, E1000_MGTPDC); + E1000_READ_REG(hw, E1000_MGTPTC); - temp = E1000_READ_REG(hw, E1000_IAC); - temp = E1000_READ_REG(hw, E1000_ICRXOC); + E1000_READ_REG(hw, E1000_IAC); + E1000_READ_REG(hw, E1000_ICRXOC); - temp = E1000_READ_REG(hw, E1000_ICRXPTC); - temp = E1000_READ_REG(hw, E1000_ICRXATC); - temp = E1000_READ_REG(hw, E1000_ICTXPTC); - temp = E1000_READ_REG(hw, E1000_ICTXATC); - temp = E1000_READ_REG(hw, E1000_ICTXQEC); - temp = E1000_READ_REG(hw, E1000_ICTXQMTC); - temp = E1000_READ_REG(hw, E1000_ICRXDMTC); + E1000_READ_REG(hw, E1000_ICRXPTC); + E1000_READ_REG(hw, E1000_ICRXATC); + E1000_READ_REG(hw, E1000_ICTXPTC); + E1000_READ_REG(hw, E1000_ICTXATC); + E1000_READ_REG(hw, E1000_ICTXQEC); + E1000_READ_REG(hw, E1000_ICTXQMTC); + E1000_READ_REG(hw, E1000_ICRXDMTC); } ==== //depot/projects/vimage-commit/src/sys/dev/e1000/e1000_82540.c#3 (text+ko) ==== @@ -30,13 +30,17 @@ POSSIBILITY OF SUCH DAMAGE. ******************************************************************************/ -/*$FreeBSD: src/sys/dev/e1000/e1000_82540.c,v 1.1 2008/07/30 21:56:53 jfv Exp $*/ +/*$FreeBSD: src/sys/dev/e1000/e1000_82540.c,v 1.2 2008/11/26 23:57:23 jfv Exp $*/ -/* e1000_82540 - * e1000_82545 - * e1000_82546 - * e1000_82545_rev_3 - * e1000_82546_rev_3 +/* >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Nov 28 07:18:34 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 062A31065676; Fri, 28 Nov 2008 07:18:34 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A57001065674 for ; Fri, 28 Nov 2008 07:18:33 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8D6ED8FC16 for ; Fri, 28 Nov 2008 07:18:33 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAS7IXFn081996 for ; Fri, 28 Nov 2008 07:18:33 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAS7IXjU081994 for perforce@freebsd.org; Fri, 28 Nov 2008 07:18:33 GMT (envelope-from zec@tel.fer.hr) Date: Fri, 28 Nov 2008 07:18:33 GMT Message-Id: <200811280718.mAS7IXjU081994@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153685 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, 28 Nov 2008 07:18:34 -0000 http://perforce.freebsd.org/chv.cgi?CH=153685 Change 153685 by zec@zec_tca51 on 2008/11/28 07:18:14 IFC @ 153681 Affected files ... .. //depot/projects/vimage/src/sys/amd64/include/pmc_mdep.h#6 integrate .. //depot/projects/vimage/src/sys/boot/arm/uboot/Makefile#3 integrate .. //depot/projects/vimage/src/sys/conf/files.amd64#15 integrate .. //depot/projects/vimage/src/sys/conf/files.i386#22 integrate .. //depot/projects/vimage/src/sys/dev/aac/aac_pci.c#9 integrate .. //depot/projects/vimage/src/sys/dev/ata/ata-queue.c#6 integrate .. //depot/projects/vimage/src/sys/dev/e1000/e1000_80003es2lan.c#2 integrate .. //depot/projects/vimage/src/sys/dev/e1000/e1000_82540.c#2 integrate .. //depot/projects/vimage/src/sys/dev/e1000/e1000_82541.c#2 integrate .. //depot/projects/vimage/src/sys/dev/e1000/e1000_82542.c#2 integrate .. //depot/projects/vimage/src/sys/dev/e1000/e1000_82543.c#2 integrate .. //depot/projects/vimage/src/sys/dev/e1000/e1000_82571.c#2 integrate .. //depot/projects/vimage/src/sys/dev/e1000/e1000_82575.c#2 integrate .. //depot/projects/vimage/src/sys/dev/e1000/e1000_82575.h#2 integrate .. //depot/projects/vimage/src/sys/dev/e1000/e1000_api.c#2 integrate .. //depot/projects/vimage/src/sys/dev/e1000/e1000_api.h#2 integrate .. //depot/projects/vimage/src/sys/dev/e1000/e1000_defines.h#2 integrate .. //depot/projects/vimage/src/sys/dev/e1000/e1000_hw.h#2 integrate .. //depot/projects/vimage/src/sys/dev/e1000/e1000_ich8lan.c#2 integrate .. //depot/projects/vimage/src/sys/dev/e1000/e1000_ich8lan.h#2 integrate .. //depot/projects/vimage/src/sys/dev/e1000/e1000_mac.c#2 integrate .. //depot/projects/vimage/src/sys/dev/e1000/e1000_mac.h#2 integrate .. //depot/projects/vimage/src/sys/dev/e1000/e1000_manage.c#2 integrate .. //depot/projects/vimage/src/sys/dev/e1000/e1000_nvm.c#2 integrate .. //depot/projects/vimage/src/sys/dev/e1000/e1000_osdep.c#2 integrate .. //depot/projects/vimage/src/sys/dev/e1000/e1000_osdep.h#2 integrate .. //depot/projects/vimage/src/sys/dev/e1000/e1000_phy.c#2 integrate .. //depot/projects/vimage/src/sys/dev/e1000/e1000_phy.h#2 integrate .. //depot/projects/vimage/src/sys/dev/e1000/e1000_regs.h#2 integrate .. //depot/projects/vimage/src/sys/dev/e1000/if_em.c#3 integrate .. //depot/projects/vimage/src/sys/dev/e1000/if_em.h#2 integrate .. //depot/projects/vimage/src/sys/dev/e1000/if_igb.c#4 integrate .. //depot/projects/vimage/src/sys/dev/fxp/if_fxp.c#8 integrate .. //depot/projects/vimage/src/sys/dev/fxp/if_fxpreg.h#4 integrate .. //depot/projects/vimage/src/sys/dev/fxp/if_fxpvar.h#4 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_core.c#1 branch .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_core.h#1 branch .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_intel.c#3 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_logging.c#7 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_mod.c#12 integrate .. //depot/projects/vimage/src/sys/dev/hwpmc/pmc_events.h#6 integrate .. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe.h#6 integrate .. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe_82598.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe_api.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe_api.h#5 integrate .. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe_common.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe_common.h#5 integrate .. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe_osdep.h#4 integrate .. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe_phy.c#5 integrate .. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe_phy.h#5 integrate .. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe_type.h#5 integrate .. //depot/projects/vimage/src/sys/fs/cd9660/cd9660_node.c#5 integrate .. //depot/projects/vimage/src/sys/i386/include/pmc_mdep.h#5 integrate .. //depot/projects/vimage/src/sys/kern/kern_conf.c#17 integrate .. //depot/projects/vimage/src/sys/kern/kern_lockf.c#8 integrate .. //depot/projects/vimage/src/sys/modules/hwpmc/Makefile#4 integrate .. //depot/projects/vimage/src/sys/netinet/in_pcb.c#42 integrate .. //depot/projects/vimage/src/sys/netinet/ip_output.c#23 integrate .. //depot/projects/vimage/src/sys/netinet/sctp_pcb.c#32 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_output.c#27 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_timewait.c#23 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_usrreq.c#27 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_pcb.c#27 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_pcb.h#6 integrate .. //depot/projects/vimage/src/sys/netinet6/raw_ip6.c#31 integrate .. //depot/projects/vimage/src/sys/netinet6/udp6_usrreq.c#35 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec.c#33 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec.h#12 integrate .. //depot/projects/vimage/src/sys/netipsec/ipsec6.h#5 integrate .. //depot/projects/vimage/src/sys/sys/param.h#33 integrate .. //depot/projects/vimage/src/sys/sys/pmc.h#7 integrate .. //depot/projects/vimage/src/sys/sys/pmclog.h#3 integrate Differences ... ==== //depot/projects/vimage/src/sys/amd64/include/pmc_mdep.h#6 (text+ko) ==== @@ -27,7 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/include/pmc_mdep.h,v 1.7 2008/11/09 17:37:54 jkoshy Exp $ + * $FreeBSD: src/sys/amd64/include/pmc_mdep.h,v 1.8 2008/11/27 09:00:47 jkoshy Exp $ */ /* Machine dependent interfaces */ @@ -40,6 +40,7 @@ #endif #include +#include #include #include @@ -51,8 +52,8 @@ #define PMC_MDEP_CLASS_INDEX_TSC 0 #define PMC_MDEP_CLASS_INDEX_K8 1 #define PMC_MDEP_CLASS_INDEX_P4 1 -#define PMC_MDEP_CLASS_INDEX_IAF 1 -#define PMC_MDEP_CLASS_INDEX_IAP 2 +#define PMC_MDEP_CLASS_INDEX_IAP 1 +#define PMC_MDEP_CLASS_INDEX_IAF 2 /* * On the amd64 platform we support the following PMCs. @@ -66,6 +67,8 @@ union pmc_md_op_pmcallocate { struct pmc_md_amd_op_pmcallocate pm_amd; + struct pmc_md_iaf_op_pmcallocate pm_iaf; + struct pmc_md_iap_op_pmcallocate pm_iap; struct pmc_md_p4_op_pmcallocate pm_p4; uint64_t __pad[4]; }; @@ -78,6 +81,8 @@ union pmc_md_pmc { struct pmc_md_amd_pmc pm_amd; + struct pmc_md_iaf_pmc pm_iaf; + struct pmc_md_iap_pmc pm_iap; struct pmc_md_p4_pmc pm_p4; }; ==== //depot/projects/vimage/src/sys/boot/arm/uboot/Makefile#3 (text+ko) ==== @@ -1,10 +1,9 @@ -# $FreeBSD: src/sys/boot/arm/uboot/Makefile,v 1.2 2008/11/19 17:34:28 raj Exp $ +# $FreeBSD: src/sys/boot/arm/uboot/Makefile,v 1.3 2008/11/27 16:53:01 raj Exp $ PROG= ubldr NEWVERSWHAT= "U-Boot loader" ${MACHINE_ARCH} BINDIR?= /boot INSTALLFLAGS= -b -NO_MAN= WARNS?= 1 # Architecture-specific loader code @@ -61,7 +60,7 @@ CFLAGS+= -I${.CURDIR}/../../common CFLAGS+= -I. -CLEANFILES+= vers.c ${PROG}.help +CLEANFILES+= vers.c loader.help CFLAGS+= -ffreestanding @@ -86,11 +85,11 @@ vers.c: ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/version ${NEWVERSWHAT} -${PROG}.help: help.common help.uboot +loader.help: help.common help.uboot cat ${.ALLSRC} | \ awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET} .PATH: ${.CURDIR}/../../forth -FILES= ${PROG}.help +FILES= loader.help .include ==== //depot/projects/vimage/src/sys/conf/files.amd64#15 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.amd64,v 1.124 2008/11/09 17:37:54 jkoshy Exp $ +# $FreeBSD: src/sys/conf/files.amd64,v 1.125 2008/11/27 09:00:47 jkoshy Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -189,6 +189,7 @@ dev/hptrr/hptrr_config.c optional hptrr dev/hwpmc/hwpmc_amd.c optional hwpmc dev/hwpmc/hwpmc_intel.c optional hwpmc +dev/hwpmc/hwpmc_core.c optional hwpmc dev/hwpmc/hwpmc_piv.c optional hwpmc dev/hwpmc/hwpmc_tsc.c optional hwpmc dev/hwpmc/hwpmc_x86.c optional hwpmc ==== //depot/projects/vimage/src/sys/conf/files.i386#22 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.609 2008/11/09 17:37:54 jkoshy Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.610 2008/11/27 09:00:47 jkoshy Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -187,6 +187,7 @@ dev/hptrr/hptrr_config.c optional hptrr dev/hwpmc/hwpmc_amd.c optional hwpmc dev/hwpmc/hwpmc_intel.c optional hwpmc +dev/hwpmc/hwpmc_core.c optional hwpmc dev/hwpmc/hwpmc_pentium.c optional hwpmc dev/hwpmc/hwpmc_piv.c optional hwpmc dev/hwpmc/hwpmc_ppro.c optional hwpmc ==== //depot/projects/vimage/src/sys/dev/aac/aac_pci.c#9 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.69 2008/09/12 18:15:12 emaste Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.70 2008/11/27 20:26:02 emaste Exp $"); /* * PCI bus interface and resource allocation. @@ -168,8 +168,6 @@ "ICP ICP9014RO SCSI RAID"}, {0x9005, 0x0285, 0x9005, 0x0294, AAC_HWIF_I960RX, 0, "Adaptec SATA RAID 2026ZCR"}, - {0x9005, 0x0285, 0x103c, 0x3227, AAC_HWIF_I960RX, 0, - "Adaptec SATA RAID 2610SA"}, {0x9005, 0x0285, 0x9005, 0x0296, AAC_HWIF_I960RX, 0, "Adaptec SCSI RAID 2240S"}, {0x9005, 0x0285, 0x9005, 0x0297, AAC_HWIF_I960RX, 0, ==== //depot/projects/vimage/src/sys/dev/ata/ata-queue.c#6 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.74 2008/10/27 09:26:24 sos Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.75 2008/11/27 03:37:46 peter Exp $"); #include "opt_ata.h" #include @@ -357,7 +357,7 @@ "\6MEDIA_CHANGED\5NID_NOT_FOUND" "\4MEDIA_CHANGE_REQEST" "\3ABORTED\2NO_MEDIA\1ILLEGAL_LENGTH"); - if ((request->flags & ATA_R_DMA) && + if ((request->flags & ATA_R_DMA) && request->dma && (request->dma->status & ATA_BMSTAT_ERROR)) printf(" dma=0x%02x", request->dma->status); if (!(request->flags & (ATA_R_ATAPI | ATA_R_CONTROL))) ==== //depot/projects/vimage/src/sys/dev/e1000/e1000_80003es2lan.c#2 (text+ko) ==== @@ -30,9 +30,11 @@ POSSIBILITY OF SUCH DAMAGE. ******************************************************************************/ -/*$FreeBSD: src/sys/dev/e1000/e1000_80003es2lan.c,v 1.1 2008/07/30 21:56:53 jfv Exp $*/ +/*$FreeBSD: src/sys/dev/e1000/e1000_80003es2lan.c,v 1.2 2008/11/26 23:57:23 jfv Exp $*/ -/* e1000_80003es2lan +/* + * 80003ES2LAN Gigabit Ethernet Controller (Copper) + * 80003ES2LAN Gigabit Ethernet Controller (Serdes) */ #include "e1000_api.h" @@ -41,7 +43,9 @@ static s32 e1000_init_nvm_params_80003es2lan(struct e1000_hw *hw); static s32 e1000_init_mac_params_80003es2lan(struct e1000_hw *hw); static s32 e1000_acquire_phy_80003es2lan(struct e1000_hw *hw); +static s32 e1000_acquire_mac_csr_80003es2lan(struct e1000_hw *hw); static void e1000_release_phy_80003es2lan(struct e1000_hw *hw); +static void e1000_release_mac_csr_80003es2lan(struct e1000_hw *hw); static s32 e1000_acquire_nvm_80003es2lan(struct e1000_hw *hw); static void e1000_release_nvm_80003es2lan(struct e1000_hw *hw); static s32 e1000_read_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw, @@ -64,6 +68,11 @@ static s32 e1000_acquire_swfw_sync_80003es2lan(struct e1000_hw *hw, u16 mask); static s32 e1000_cfg_kmrn_10_100_80003es2lan(struct e1000_hw *hw, u16 duplex); static s32 e1000_cfg_kmrn_1000_80003es2lan(struct e1000_hw *hw); +static s32 e1000_cfg_on_link_up_80003es2lan(struct e1000_hw *hw); +static s32 e1000_read_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset, + u16 *data); +static s32 e1000_write_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset, + u16 data); static s32 e1000_copper_link_setup_gg82563_80003es2lan(struct e1000_hw *hw); static void e1000_initialize_hw_bits_80003es2lan(struct e1000_hw *hw); static void e1000_release_swfw_sync_80003es2lan(struct e1000_hw *hw, u16 mask); @@ -84,8 +93,6 @@ /** * e1000_init_phy_params_80003es2lan - Init ESB2 PHY func ptrs. * @hw: pointer to the HW structure - * - * This is a function pointer entry point called by the api module. **/ static s32 e1000_init_phy_params_80003es2lan(struct e1000_hw *hw) { @@ -122,6 +129,8 @@ phy->ops.read_reg = e1000_read_phy_reg_gg82563_80003es2lan; phy->ops.write_reg = e1000_write_phy_reg_gg82563_80003es2lan; + phy->ops.cfg_on_link_up = e1000_cfg_on_link_up_80003es2lan; + /* This can only be done after all function pointers are setup. */ ret_val = e1000_get_phy_id(hw); @@ -138,8 +147,6 @@ /** * e1000_init_nvm_params_80003es2lan - Init ESB2 NVM func ptrs. * @hw: pointer to the HW structure - * - * This is a function pointer entry point called by the api module. **/ static s32 e1000_init_nvm_params_80003es2lan(struct e1000_hw *hw) { @@ -197,8 +204,6 @@ /** * e1000_init_mac_params_80003es2lan - Init ESB2 MAC func ptrs. * @hw: pointer to the HW structure - * - * This is a function pointer entry point called by the api module. **/ static s32 e1000_init_mac_params_80003es2lan(struct e1000_hw *hw) { @@ -280,8 +285,6 @@ /* turn on/off LED */ mac->ops.led_on = e1000_led_on_generic; mac->ops.led_off = e1000_led_off_generic; - /* remove device */ - mac->ops.remove_device = e1000_remove_device_generic; /* clear hardware counters */ mac->ops.clear_hw_cntrs = e1000_clear_hw_cntrs_80003es2lan; /* link info */ @@ -295,8 +298,7 @@ * e1000_init_function_pointers_80003es2lan - Init ESB2 func ptrs. * @hw: pointer to the HW structure * - * The only function explicitly called by the api module to initialize - * all function pointers and parameters. + * Called to initialize all function pointers and parameters. **/ void e1000_init_function_pointers_80003es2lan(struct e1000_hw *hw) { @@ -305,14 +307,14 @@ hw->mac.ops.init_params = e1000_init_mac_params_80003es2lan; hw->nvm.ops.init_params = e1000_init_nvm_params_80003es2lan; hw->phy.ops.init_params = e1000_init_phy_params_80003es2lan; + e1000_get_bus_info_pcie_generic(hw); } /** * e1000_acquire_phy_80003es2lan - Acquire rights to access PHY * @hw: pointer to the HW structure * - * A wrapper to acquire access rights to the correct PHY. This is a - * function pointer entry point called by the api module. + * A wrapper to acquire access rights to the correct PHY. **/ static s32 e1000_acquire_phy_80003es2lan(struct e1000_hw *hw) { @@ -321,8 +323,6 @@ DEBUGFUNC("e1000_acquire_phy_80003es2lan"); mask = hw->bus.func ? E1000_SWFW_PHY1_SM : E1000_SWFW_PHY0_SM; - mask |= E1000_SWFW_CSR_SM; - return e1000_acquire_swfw_sync_80003es2lan(hw, mask); } @@ -330,8 +330,7 @@ * e1000_release_phy_80003es2lan - Release rights to access PHY * @hw: pointer to the HW structure * - * A wrapper to release access rights to the correct PHY. This is a - * function pointer entry point called by the api module. + * A wrapper to release access rights to the correct PHY. **/ static void e1000_release_phy_80003es2lan(struct e1000_hw *hw) { @@ -340,7 +339,41 @@ DEBUGFUNC("e1000_release_phy_80003es2lan"); mask = hw->bus.func ? E1000_SWFW_PHY1_SM : E1000_SWFW_PHY0_SM; - mask |= E1000_SWFW_CSR_SM; + e1000_release_swfw_sync_80003es2lan(hw, mask); +} + + +/** + * e1000_acquire_mac_csr_80003es2lan - Acquire rights to access Kumeran register + * @hw: pointer to the HW structure + * + * Acquire the semaphore to access the Kumeran interface. + * + **/ +static s32 e1000_acquire_mac_csr_80003es2lan(struct e1000_hw *hw) +{ + u16 mask; + + DEBUGFUNC("e1000_acquire_mac_csr_80003es2lan"); + + mask = E1000_SWFW_CSR_SM; + + return e1000_acquire_swfw_sync_80003es2lan(hw, mask); +} + +/** + * e1000_release_mac_csr_80003es2lan - Release rights to access Kumeran Register + * @hw: pointer to the HW structure + * + * Release the semaphore used to access the Kumeran interface + **/ +static void e1000_release_mac_csr_80003es2lan(struct e1000_hw *hw) +{ + u16 mask; + + DEBUGFUNC("e1000_release_mac_csr_80003es2lan"); + + mask = E1000_SWFW_CSR_SM; e1000_release_swfw_sync_80003es2lan(hw, mask); } @@ -349,8 +382,7 @@ * e1000_acquire_nvm_80003es2lan - Acquire rights to access NVM * @hw: pointer to the HW structure * - * Acquire the semaphore to access the EEPROM. This is a function - * pointer entry point called by the api module. + * Acquire the semaphore to access the EEPROM. **/ static s32 e1000_acquire_nvm_80003es2lan(struct e1000_hw *hw) { @@ -375,8 +407,7 @@ * e1000_release_nvm_80003es2lan - Relinquish rights to access NVM * @hw: pointer to the HW structure * - * Release the semaphore used to access the EEPROM. This is a - * function pointer entry point called by the api module. + * Release the semaphore used to access the EEPROM. **/ static void e1000_release_nvm_80003es2lan(struct e1000_hw *hw) { @@ -400,7 +431,7 @@ u32 swmask = mask; u32 fwmask = mask << 16; s32 ret_val = E1000_SUCCESS; - s32 i = 0, timeout = 200; + s32 i = 0, timeout = 50; DEBUGFUNC("e1000_acquire_swfw_sync_80003es2lan"); @@ -452,8 +483,8 @@ DEBUGFUNC("e1000_release_swfw_sync_80003es2lan"); - while (e1000_get_hw_semaphore_generic(hw) != E1000_SUCCESS); - /* Empty */ + while (e1000_get_hw_semaphore_generic(hw) != E1000_SUCCESS) + ; /* Empty */ swfw_sync = E1000_READ_REG(hw, E1000_SW_FW_SYNC); swfw_sync &= ~mask; @@ -468,8 +499,7 @@ * @offset: offset of the register to read * @data: pointer to the data returned from the operation * - * Read the GG82563 PHY register. This is a function pointer entry - * point called by the api module. + * Read the GG82563 PHY register. **/ static s32 e1000_read_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw, u32 offset, u16 *data) @@ -520,9 +550,8 @@ usec_delay(200); - ret_val = e1000_read_phy_reg_mdic(hw, - MAX_PHY_REG_ADDRESS & offset, - data); + ret_val = e1000_read_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset, + data); usec_delay(200); e1000_release_phy_80003es2lan(hw); @@ -537,8 +566,7 @@ * @offset: offset of the register to read * @data: value to write to the register * - * Write to the GG82563 PHY register. This is a function pointer entry - * point called by the api module. + * Write to the GG82563 PHY register. **/ static s32 e1000_write_phy_reg_gg82563_80003es2lan(struct e1000_hw *hw, u32 offset, u16 data) @@ -590,8 +618,7 @@ usec_delay(200); - ret_val = e1000_write_phy_reg_mdic(hw, - MAX_PHY_REG_ADDRESS & offset, + ret_val = e1000_write_phy_reg_mdic(hw, MAX_PHY_REG_ADDRESS & offset, data); usec_delay(200); @@ -608,8 +635,7 @@ * @words: number of words to write * @data: buffer of data to write to the NVM * - * Write "words" of data to the ESB2 NVM. This is a function - * pointer entry point called by the api module. + * Write "words" of data to the ESB2 NVM. **/ static s32 e1000_write_nvm_80003es2lan(struct e1000_hw *hw, u16 offset, u16 words, u16 *data) @@ -775,10 +801,17 @@ goto out; index = phy_data & GG82563_DSPD_CABLE_LENGTH; - phy->min_cable_length = e1000_gg82563_cable_length_table[index]; - phy->max_cable_length = e1000_gg82563_cable_length_table[index+5]; + + if (index < GG82563_CABLE_LENGTH_TABLE_SIZE + 5) { + phy->min_cable_length = e1000_gg82563_cable_length_table[index]; + phy->max_cable_length = + e1000_gg82563_cable_length_table[index+5]; - phy->cable_length = (phy->min_cable_length + phy->max_cable_length) / 2; + phy->cable_length = (phy->min_cable_length + + phy->max_cable_length) / 2; + } else { + ret_val = E1000_ERR_PHY; + } out: return ret_val; @@ -791,7 +824,6 @@ * @duplex: pointer to duplex buffer * * Retrieve the current speed and duplex configuration. - * This is a function pointer entry point called by the api module. **/ static s32 e1000_get_link_up_info_80003es2lan(struct e1000_hw *hw, u16 *speed, u16 *duplex) @@ -804,20 +836,13 @@ ret_val = e1000_get_speed_and_duplex_copper_generic(hw, speed, duplex); - if (ret_val) - goto out; - if (*speed == SPEED_1000) - ret_val = e1000_cfg_kmrn_1000_80003es2lan(hw); - else - ret_val = e1000_cfg_kmrn_10_100_80003es2lan(hw, - *duplex); + hw->phy.ops.cfg_on_link_up(hw); } else { ret_val = e1000_get_speed_and_duplex_fiber_serdes_generic(hw, speed, duplex); } -out: return ret_val; } @@ -826,7 +851,6 @@ * @hw: pointer to the HW structure * * Perform a global reset to the ESB2 controller. - * This is a function pointer entry point called by the api module. **/ static s32 e1000_reset_hw_80003es2lan(struct e1000_hw *hw) { @@ -840,9 +864,8 @@ * on the last TLP read/write transaction when MAC is reset. */ ret_val = e1000_disable_pcie_master_generic(hw); - if (ret_val) { + if (ret_val) DEBUGOUT("PCI-E Master disable polling has failed.\n"); - } DEBUGOUT("Masking off all interrupts\n"); E1000_WRITE_REG(hw, E1000_IMC, 0xffffffff); @@ -855,8 +878,10 @@ ctrl = E1000_READ_REG(hw, E1000_CTRL); + ret_val = e1000_acquire_phy_80003es2lan(hw); DEBUGOUT("Issuing a global reset to MAC\n"); E1000_WRITE_REG(hw, E1000_CTRL, ctrl | E1000_CTRL_RST); + e1000_release_phy_80003es2lan(hw); ret_val = e1000_get_auto_rd_done_generic(hw); if (ret_val) @@ -878,7 +903,6 @@ * @hw: pointer to the HW structure * * Initialize the hw bits, LED, VFTA, MTA, link and hw counters. - * This is a function pointer entry point called by the api module. **/ static s32 e1000_init_hw_80003es2lan(struct e1000_hw *hw) { @@ -969,9 +993,6 @@ DEBUGFUNC("e1000_initialize_hw_bits_80003es2lan"); - if (hw->mac.disable_hw_init_bits) - goto out; - /* Transmit Descriptor Control 0 */ reg = E1000_READ_REG(hw, E1000_TXDCTL(0)); reg |= (1 << 22); @@ -997,7 +1018,6 @@ reg |= (1 << 28); E1000_WRITE_REG(hw, E1000_TARC(1), reg); -out: return; } @@ -1012,8 +1032,7 @@ struct e1000_phy_info *phy = &hw->phy; s32 ret_val; u32 ctrl_ext; - u32 i = 0; - u16 data, data2; + u16 data; DEBUGFUNC("e1000_copper_link_setup_gg82563_80003es2lan"); @@ -1084,20 +1103,20 @@ } /* Bypass Rx and Tx FIFO's */ - ret_val = e1000_write_kmrn_reg_generic(hw, + ret_val = e1000_write_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_OFFSET_FIFO_CTRL, E1000_KMRNCTRLSTA_FIFO_CTRL_RX_BYPASS | E1000_KMRNCTRLSTA_FIFO_CTRL_TX_BYPASS); if (ret_val) goto out; - ret_val = e1000_read_kmrn_reg_generic(hw, + ret_val = e1000_read_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_OFFSET_MAC2PHY_OPMODE, &data); if (ret_val) goto out; data |= E1000_KMRNCTRLSTA_OPMODE_E_IDLE; - ret_val = e1000_write_kmrn_reg_generic(hw, + ret_val = e1000_write_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_OFFSET_MAC2PHY_OPMODE, data); if (ret_val) @@ -1129,30 +1148,20 @@ /* Enable Electrical Idle on the PHY */ data |= GG82563_PMCR_ENABLE_ELECTRICAL_IDLE; ret_val = hw->phy.ops.write_reg(hw, - GG82563_PHY_PWR_MGMT_CTRL, - data); + GG82563_PHY_PWR_MGMT_CTRL, + data); if (ret_val) goto out; - - do { - ret_val = hw->phy.ops.read_reg(hw, - GG82563_PHY_KMRN_MODE_CTRL, - &data); + ret_val = hw->phy.ops.read_reg(hw, + GG82563_PHY_KMRN_MODE_CTRL, + &data); if (ret_val) goto out; - ret_val = hw->phy.ops.read_reg(hw, - GG82563_PHY_KMRN_MODE_CTRL, - &data2); - if (ret_val) - goto out; - i++; - } while ((data != data2) && (i < GG82563_MAX_KMRN_RETRY)); - data &= ~GG82563_KMCR_PASS_FALSE_CARRIER; ret_val = hw->phy.ops.write_reg(hw, - GG82563_PHY_KMRN_MODE_CTRL, - data); + GG82563_PHY_KMRN_MODE_CTRL, + data); if (ret_val) goto out; @@ -1185,7 +1194,7 @@ static s32 e1000_setup_copper_link_80003es2lan(struct e1000_hw *hw) { u32 ctrl; - s32 ret_val; + s32 ret_val; u16 reg_data; DEBUGFUNC("e1000_setup_copper_link_80003es2lan"); @@ -1200,26 +1209,26 @@ * iteration and increase the max iterations when * polling the phy; this fixes erroneous timeouts at 10Mbps. */ - ret_val = e1000_write_kmrn_reg_generic(hw, GG82563_REG(0x34, 4), - 0xFFFF); + ret_val = e1000_write_kmrn_reg_80003es2lan(hw, GG82563_REG(0x34, 4), + 0xFFFF); if (ret_val) goto out; - ret_val = e1000_read_kmrn_reg_generic(hw, GG82563_REG(0x34, 9), - ®_data); + ret_val = e1000_read_kmrn_reg_80003es2lan(hw, GG82563_REG(0x34, 9), + ®_data); if (ret_val) goto out; reg_data |= 0x3F; - ret_val = e1000_write_kmrn_reg_generic(hw, GG82563_REG(0x34, 9), - reg_data); + ret_val = e1000_write_kmrn_reg_80003es2lan(hw, GG82563_REG(0x34, 9), + reg_data); if (ret_val) goto out; - ret_val = e1000_read_kmrn_reg_generic(hw, + ret_val = e1000_read_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_OFFSET_INB_CTRL, ®_data); if (ret_val) goto out; reg_data |= E1000_KMRNCTRLSTA_INB_CTRL_DIS_PADDING; - ret_val = e1000_write_kmrn_reg_generic(hw, + ret_val = e1000_write_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_OFFSET_INB_CTRL, reg_data); if (ret_val) @@ -1236,6 +1245,40 @@ } /** + * e1000_cfg_on_link_up_80003es2lan - es2 link configuration after link-up + * @hw: pointer to the HW structure + * @duplex: current duplex setting + * + * Configure the KMRN interface by applying last minute quirks for + * 10/100 operation. + **/ +static s32 e1000_cfg_on_link_up_80003es2lan(struct e1000_hw *hw) +{ + s32 ret_val = E1000_SUCCESS; + u16 speed; + u16 duplex; + + DEBUGFUNC("e1000_configure_on_link_up"); + + if (hw->phy.media_type == e1000_media_type_copper) { + + ret_val = e1000_get_speed_and_duplex_copper_generic(hw, + &speed, + &duplex); + if (ret_val) + goto out; + + if (speed == SPEED_1000) + ret_val = e1000_cfg_kmrn_1000_80003es2lan(hw); + else + ret_val = e1000_cfg_kmrn_10_100_80003es2lan(hw, duplex); + } + +out: + return ret_val; +} + +/** * e1000_cfg_kmrn_10_100_80003es2lan - Apply "quirks" for 10/100 operation * @hw: pointer to the HW structure * @duplex: current duplex setting @@ -1253,7 +1296,7 @@ DEBUGFUNC("e1000_configure_kmrn_for_10_100"); reg_data = E1000_KMRNCTRLSTA_HD_CTRL_10_100_DEFAULT; - ret_val = e1000_write_kmrn_reg_generic(hw, + ret_val = e1000_write_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_OFFSET_HD_CTRL, reg_data); if (ret_val) @@ -1268,12 +1311,12 @@ do { ret_val = hw->phy.ops.read_reg(hw, GG82563_PHY_KMRN_MODE_CTRL, - ®_data); + ®_data); if (ret_val) goto out; ret_val = hw->phy.ops.read_reg(hw, GG82563_PHY_KMRN_MODE_CTRL, - ®_data2); + ®_data2); if (ret_val) goto out; i++; @@ -1307,7 +1350,7 @@ DEBUGFUNC("e1000_configure_kmrn_for_1000"); reg_data = E1000_KMRNCTRLSTA_HD_CTRL_1000_DEFAULT; - ret_val = e1000_write_kmrn_reg_generic(hw, + ret_val = e1000_write_kmrn_reg_80003es2lan(hw, E1000_KMRNCTRLSTA_OFFSET_HD_CTRL, reg_data); if (ret_val) @@ -1322,12 +1365,12 @@ do { ret_val = hw->phy.ops.read_reg(hw, GG82563_PHY_KMRN_MODE_CTRL, - ®_data); + ®_data); if (ret_val) goto out; ret_val = hw->phy.ops.read_reg(hw, GG82563_PHY_KMRN_MODE_CTRL, - ®_data2); + ®_data2); if (ret_val) goto out; i++; @@ -1341,6 +1384,75 @@ } /** + * e1000_read_kmrn_reg_80003es2lan - Read kumeran register + * @hw: pointer to the HW structure + * @offset: register offset to be read + * @data: pointer to the read data + * + * Acquire semaphore, then read the PHY register at offset + * using the kumeran interface. The information retrieved is stored in data. + * Release the semaphore before exiting. + **/ +s32 e1000_read_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset, u16 *data) +{ + u32 kmrnctrlsta; + s32 ret_val = E1000_SUCCESS; + + DEBUGFUNC("e1000_read_kmrn_reg_80003es2lan"); + + ret_val = e1000_acquire_mac_csr_80003es2lan(hw); + if (ret_val) + goto out; + + kmrnctrlsta = ((offset << E1000_KMRNCTRLSTA_OFFSET_SHIFT) & + E1000_KMRNCTRLSTA_OFFSET) | E1000_KMRNCTRLSTA_REN; + E1000_WRITE_REG(hw, E1000_KMRNCTRLSTA, kmrnctrlsta); + + usec_delay(2); + + kmrnctrlsta = E1000_READ_REG(hw, E1000_KMRNCTRLSTA); + *data = (u16)kmrnctrlsta; + + e1000_release_mac_csr_80003es2lan(hw); + +out: + return ret_val; +} + +/** + * e1000_write_kmrn_reg_80003es2lan - Write kumeran register + * @hw: pointer to the HW structure + * @offset: register offset to write to + * @data: data to write at register offset + * + * Acquire semaphore, then write the data to PHY register + * at the offset using the kumeran interface. Release semaphore + * before exiting. + **/ +s32 e1000_write_kmrn_reg_80003es2lan(struct e1000_hw *hw, u32 offset, u16 data) +{ + u32 kmrnctrlsta; + s32 ret_val = E1000_SUCCESS; + + DEBUGFUNC("e1000_write_kmrn_reg_80003es2lan"); + + ret_val = e1000_acquire_mac_csr_80003es2lan(hw); + if (ret_val) + goto out; + + kmrnctrlsta = ((offset << E1000_KMRNCTRLSTA_OFFSET_SHIFT) & + E1000_KMRNCTRLSTA_OFFSET) | data; + E1000_WRITE_REG(hw, E1000_KMRNCTRLSTA, kmrnctrlsta); + + usec_delay(2); + + e1000_release_mac_csr_80003es2lan(hw); + +out: + return ret_val; +} + +/** * e1000_read_mac_addr_80003es2lan - Read device MAC address * @hw: pointer to the HW structure **/ @@ -1380,44 +1492,42 @@ **/ static void e1000_clear_hw_cntrs_80003es2lan(struct e1000_hw *hw) { - volatile u32 temp; - DEBUGFUNC("e1000_clear_hw_cntrs_80003es2lan"); e1000_clear_hw_cntrs_base_generic(hw); - temp = E1000_READ_REG(hw, E1000_PRC64); - temp = E1000_READ_REG(hw, E1000_PRC127); - temp = E1000_READ_REG(hw, E1000_PRC255); - temp = E1000_READ_REG(hw, E1000_PRC511); - temp = E1000_READ_REG(hw, E1000_PRC1023); - temp = E1000_READ_REG(hw, E1000_PRC1522); - temp = E1000_READ_REG(hw, E1000_PTC64); - temp = E1000_READ_REG(hw, E1000_PTC127); - temp = E1000_READ_REG(hw, E1000_PTC255); - temp = E1000_READ_REG(hw, E1000_PTC511); - temp = E1000_READ_REG(hw, E1000_PTC1023); - temp = E1000_READ_REG(hw, E1000_PTC1522); + E1000_READ_REG(hw, E1000_PRC64); + E1000_READ_REG(hw, E1000_PRC127); + E1000_READ_REG(hw, E1000_PRC255); + E1000_READ_REG(hw, E1000_PRC511); + E1000_READ_REG(hw, E1000_PRC1023); + E1000_READ_REG(hw, E1000_PRC1522); + E1000_READ_REG(hw, E1000_PTC64); + E1000_READ_REG(hw, E1000_PTC127); + E1000_READ_REG(hw, E1000_PTC255); + E1000_READ_REG(hw, E1000_PTC511); + E1000_READ_REG(hw, E1000_PTC1023); + E1000_READ_REG(hw, E1000_PTC1522); - temp = E1000_READ_REG(hw, E1000_ALGNERRC); - temp = E1000_READ_REG(hw, E1000_RXERRC); - temp = E1000_READ_REG(hw, E1000_TNCRS); - temp = E1000_READ_REG(hw, E1000_CEXTERR); - temp = E1000_READ_REG(hw, E1000_TSCTC); - temp = E1000_READ_REG(hw, E1000_TSCTFC); + E1000_READ_REG(hw, E1000_ALGNERRC); + E1000_READ_REG(hw, E1000_RXERRC); + E1000_READ_REG(hw, E1000_TNCRS); + E1000_READ_REG(hw, E1000_CEXTERR); + E1000_READ_REG(hw, E1000_TSCTC); + E1000_READ_REG(hw, E1000_TSCTFC); - temp = E1000_READ_REG(hw, E1000_MGTPRC); - temp = E1000_READ_REG(hw, E1000_MGTPDC); - temp = E1000_READ_REG(hw, E1000_MGTPTC); + E1000_READ_REG(hw, E1000_MGTPRC); + E1000_READ_REG(hw, E1000_MGTPDC); + E1000_READ_REG(hw, E1000_MGTPTC); - temp = E1000_READ_REG(hw, E1000_IAC); - temp = E1000_READ_REG(hw, E1000_ICRXOC); + E1000_READ_REG(hw, E1000_IAC); + E1000_READ_REG(hw, E1000_ICRXOC); - temp = E1000_READ_REG(hw, E1000_ICRXPTC); - temp = E1000_READ_REG(hw, E1000_ICRXATC); - temp = E1000_READ_REG(hw, E1000_ICTXPTC); - temp = E1000_READ_REG(hw, E1000_ICTXATC); - temp = E1000_READ_REG(hw, E1000_ICTXQEC); - temp = E1000_READ_REG(hw, E1000_ICTXQMTC); - temp = E1000_READ_REG(hw, E1000_ICRXDMTC); + E1000_READ_REG(hw, E1000_ICRXPTC); + E1000_READ_REG(hw, E1000_ICRXATC); + E1000_READ_REG(hw, E1000_ICTXPTC); + E1000_READ_REG(hw, E1000_ICTXATC); + E1000_READ_REG(hw, E1000_ICTXQEC); + E1000_READ_REG(hw, E1000_ICTXQMTC); + E1000_READ_REG(hw, E1000_ICRXDMTC); } ==== //depot/projects/vimage/src/sys/dev/e1000/e1000_82540.c#2 (text+ko) ==== @@ -30,13 +30,17 @@ POSSIBILITY OF SUCH DAMAGE. ******************************************************************************/ -/*$FreeBSD: src/sys/dev/e1000/e1000_82540.c,v 1.1 2008/07/30 21:56:53 jfv Exp $*/ +/*$FreeBSD: src/sys/dev/e1000/e1000_82540.c,v 1.2 2008/11/26 23:57:23 jfv Exp $*/ -/* e1000_82540 - * e1000_82545 - * e1000_82546 - * e1000_82545_rev_3 - * e1000_82546_rev_3 +/* + * 82540EM Gigabit Ethernet Controller + * 82540EP Gigabit Ethernet Controller + * 82545EM Gigabit Ethernet Controller (Copper) + * 82545EM Gigabit Ethernet Controller (Fiber) + * 82545GM Gigabit Ethernet Controller + * 82546EB Gigabit Ethernet Controller (Copper) >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Fri Nov 28 09:24:41 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 537D11065675; Fri, 28 Nov 2008 09:24:41 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1624C106564A for ; Fri, 28 Nov 2008 09:24:41 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 062458FC20 for ; Fri, 28 Nov 2008 09:24:41 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAS9Oe8b003545 for ; Fri, 28 Nov 2008 09:24:40 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAS9Oehw003543 for perforce@freebsd.org; Fri, 28 Nov 2008 09:24:40 GMT (envelope-from zec@tel.fer.hr) Date: Fri, 28 Nov 2008 09:24:40 GMT Message-Id: <200811280924.mAS9Oehw003543@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153686 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, 28 Nov 2008 09:24:41 -0000 http://perforce.freebsd.org/chv.cgi?CH=153686 Change 153686 by zec@zec_tpx32 on 2008/11/28 09:24:03 Bump __FreeBSD_version Affected files ... .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#10 edit .. //depot/projects/vimage-commit2/src/sys/sys/param.h#19 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#10 (text+ko) ==== @@ -121,7 +121,7 @@ #endif extern int ip_optcopy __P((struct ip *, struct ip *)); -#if (__FreeBSD_version > 460000) && (__FreeBSD_version < 800000) +#if (__FreeBSD_version > 460000) && (__FreeBSD_version < 800056) extern int path_mtu_discovery; #endif ==== //depot/projects/vimage-commit2/src/sys/sys/param.h#19 (text+ko) ==== @@ -57,7 +57,7 @@ * is created, otherwise 1. */ #undef __FreeBSD_version -#define __FreeBSD_version 800055 /* Master, propagated to newvers */ +#define __FreeBSD_version 800056 /* Master, propagated to newvers */ #ifndef LOCORE #include From owner-p4-projects@FreeBSD.ORG Fri Nov 28 10:04:26 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 226611065675; Fri, 28 Nov 2008 10:04:26 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id D0223106564A for ; Fri, 28 Nov 2008 10:04:25 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C08078FC12 for ; Fri, 28 Nov 2008 10:04:25 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mASA4P78007263 for ; Fri, 28 Nov 2008 10:04:25 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mASA4PSU007261 for perforce@freebsd.org; Fri, 28 Nov 2008 10:04:25 GMT (envelope-from zec@tel.fer.hr) Date: Fri, 28 Nov 2008 10:04:25 GMT Message-Id: <200811281004.mASA4PSU007261@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153687 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, 28 Nov 2008 10:04:26 -0000 http://perforce.freebsd.org/chv.cgi?CH=153687 Change 153687 by zec@zec_tca51 on 2008/11/28 10:03:32 Revert __FreeBSD_version back to 800055. Clean up XXX comments and #if 0 blocks. Discussed with: bz Affected files ... .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#11 edit .. //depot/projects/vimage-commit2/src/sys/netinet/ip_var.h#9 edit .. //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#16 edit .. //depot/projects/vimage-commit2/src/sys/sys/param.h#20 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#11 (text+ko) ==== @@ -121,7 +121,7 @@ #endif extern int ip_optcopy __P((struct ip *, struct ip *)); -#if (__FreeBSD_version > 460000) && (__FreeBSD_version < 800056) +#if (__FreeBSD_version > 460000) && (__FreeBSD_version < 800055) extern int path_mtu_discovery; #endif ==== //depot/projects/vimage-commit2/src/sys/netinet/ip_var.h#9 (text+ko) ==== @@ -234,20 +234,6 @@ void in_delayed_cksum(struct mbuf *m); -#if 0 /* XXX moved to netinet/vinet.h */ -static __inline uint16_t ip_newid(void); -extern int ip_do_randomid; - -static __inline uint16_t -ip_newid(void) -{ - if (V_ip_do_randomid) - return ip_randomid(); - - return htons(V_ip_id++); -} -#endif - #endif /* _KERNEL */ #endif /* !_NETINET_IP_VAR_H_ */ ==== //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#16 (text+ko) ==== @@ -332,7 +332,6 @@ #define V_udpstat VNET_INET(udpstat) #define V_useloopback VNET_INET(useloopback) -/* XXX moved from netinet/ip_var.h */ static __inline uint16_t ip_newid(void); extern int ip_do_randomid; ==== //depot/projects/vimage-commit2/src/sys/sys/param.h#20 (text+ko) ==== @@ -57,7 +57,7 @@ * is created, otherwise 1. */ #undef __FreeBSD_version -#define __FreeBSD_version 800056 /* Master, propagated to newvers */ +#define __FreeBSD_version 800055 /* Master, propagated to newvers */ #ifndef LOCORE #include From owner-p4-projects@FreeBSD.ORG Fri Nov 28 10:11:33 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 677F81065672; Fri, 28 Nov 2008 10:11:33 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2BB8B106564A for ; Fri, 28 Nov 2008 10:11:33 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1C1AF8FC1B for ; Fri, 28 Nov 2008 10:11:33 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mASABWP3007904 for ; Fri, 28 Nov 2008 10:11:33 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mASABWDh007902 for perforce@freebsd.org; Fri, 28 Nov 2008 10:11:32 GMT (envelope-from zec@tel.fer.hr) Date: Fri, 28 Nov 2008 10:11:32 GMT Message-Id: <200811281011.mASABWDh007902@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153688 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, 28 Nov 2008 10:11:33 -0000 http://perforce.freebsd.org/chv.cgi?CH=153688 Change 153688 by zec@zec_tpx32 on 2008/11/28 10:11:28 SA_SIZE() is defined in net/route.h which is now implicitly #included, so no need to have our own version here (I hope so). Affected files ... .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#12 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#12 (text+ko) ==== @@ -447,10 +447,6 @@ caddr_t ptr; int buflen; -#if 0 /* XXX SA_SIZE(s) defined in net/route.h */ -#define SA_SIZE(s) ((s)->sa_lensa_len) -#endif - /* Determine size of response and allocate it */ buflen = 0; TAILQ_FOREACH(ifa, &ifp->if_addrhead, ifa_link) @@ -476,7 +472,6 @@ buflen -= len; } break; -#undef SA_SIZE } default: From owner-p4-projects@FreeBSD.ORG Fri Nov 28 11:13:36 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BCE811065677; Fri, 28 Nov 2008 11:13:36 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8149D1065675 for ; Fri, 28 Nov 2008 11:13:36 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 717C38FC12 for ; Fri, 28 Nov 2008 11:13:36 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mASBDaHV013644 for ; Fri, 28 Nov 2008 11:13:36 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mASBDZfc013641 for perforce@freebsd.org; Fri, 28 Nov 2008 11:13:35 GMT (envelope-from zec@tel.fer.hr) Date: Fri, 28 Nov 2008 11:13:35 GMT Message-Id: <200811281113.mASBDZfc013641@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153689 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, 28 Nov 2008 11:13:37 -0000 http://perforce.freebsd.org/chv.cgi?CH=153689 Change 153689 by zec@zec_tpx32 on 2008/11/28 11:13:13 Conditionally revert back a SYSCTL_DECL(_net_inet) line Affected files ... .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#3 edit Differences ... ==== //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/mlfk_ipl.c#3 (text+ko) ==== @@ -43,6 +43,9 @@ static int ipf_modload(void); static int ipf_modunload(void); +#if __FreeBSD_version < 800055 +SYSCTL_DECL(_net_inet); +#endif #define SYSCTL_IPF(parent, nbr, name, access, ptr, val, descr) \ SYSCTL_OID(parent, nbr, name, CTLTYPE_INT|access, \ ptr, val, sysctl_ipf_int, "I", descr); From owner-p4-projects@FreeBSD.ORG Fri Nov 28 12:35:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 9B56A1065675; Fri, 28 Nov 2008 12:35:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5F1F81065673 for ; Fri, 28 Nov 2008 12:35:02 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 5073C8FC12 for ; Fri, 28 Nov 2008 12:35:02 +0000 (UTC) (envelope-from zec@tel.fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mASCZ2hr020796 for ; Fri, 28 Nov 2008 12:35:02 GMT (envelope-from zec@tel.fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mASCZ2Qx020794 for perforce@freebsd.org; Fri, 28 Nov 2008 12:35:02 GMT (envelope-from zec@tel.fer.hr) Date: Fri, 28 Nov 2008 12:35:02 GMT Message-Id: <200811281235.mASCZ2Qx020794@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@tel.fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 153692 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, 28 Nov 2008 12:35:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=153692 Change 153692 by zec@zec_ref8-amd64 on 2008/11/28 12:34:44 IFC Affected files ... .. //depot/projects/vimage-commit2/src/sys/conf/files.pc98#6 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/conf/files.pc98#6 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801/PC-9821 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.368 2008/11/09 17:37:54 jkoshy Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.369 2008/11/28 12:23:02 bz Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -111,6 +111,7 @@ dev/fe/if_fe_cbus.c optional fe isa dev/hwpmc/hwpmc_amd.c optional hwpmc dev/hwpmc/hwpmc_intel.c optional hwpmc +dev/hwpmc/hwpmc_core.c optional hwpmc dev/hwpmc/hwpmc_pentium.c optional hwpmc dev/hwpmc/hwpmc_piv.c optional hwpmc dev/hwpmc/hwpmc_ppro.c optional hwpmc From owner-p4-projects@FreeBSD.ORG Fri Nov 28 18:07:52 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EDAAE106567C; Fri, 28 Nov 2008 18:07:51 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B20D0106567A for ; Fri, 28 Nov 2008 18:07:51 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A2F028FC1B for ; Fri, 28 Nov 2008 18:07:51 +0000 (UTC) (envelope-from hselasky@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mASI7pj4071782 for ; Fri, 28 Nov 2008 18:07:51 GMT (envelope-from hselasky@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mASI7pL5071780 for perforce@freebsd.org; Fri, 28 Nov 2008 18:07:51 GMT (envelope-from hselasky@FreeBSD.org) Date: Fri, 28 Nov 2008 18:07:51 GMT Message-Id: <200811281807.mASI7pL5071780@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 153699 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, 28 Nov 2008 18:07:52 -0000 http://perforce.freebsd.org/chv.cgi?CH=153699 Change 153699 by hselasky@hselasky_laptop001 on 2008/11/28 18:07:44 Fix errornous parsing of USB audio mixer data. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.c#21 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/sound/uaudio2.c#21 (text+ko) ==== @@ -2656,7 +2656,10 @@ DPRINTF("invalid Audio Control header\n"); goto done; } - wTotalLen = UGETW(cd->wTotalLength); + /* "wTotalLen" is allowed to be corrupt */ + wTotalLen = UGETW(acdp->wTotalLength) - acdp->bLength; + + /* get USB audio revision */ sc->sc_audio_rev = UGETW(acdp->bcdADC); DPRINTFN(3, "found AC header, vers=%03x, len=%d\n", From owner-p4-projects@FreeBSD.ORG Fri Nov 28 19:44:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id EFB57106567B; Fri, 28 Nov 2008 19:44:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B4147106564A for ; Fri, 28 Nov 2008 19:44:30 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id A0C2B8FC0A for ; Fri, 28 Nov 2008 19:44:30 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mASJiUYd080438 for ; Fri, 28 Nov 2008 19:44:30 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mASJiUw5080436 for perforce@freebsd.org; Fri, 28 Nov 2008 19:44:30 GMT (envelope-from sam@freebsd.org) Date: Fri, 28 Nov 2008 19:44:30 GMT Message-Id: <200811281944.mASJiUw5080436@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 153705 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, 28 Nov 2008 19:44:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=153705 Change 153705 by sam@sam_ebb on 2008/11/28 19:44:22 add link set glue Affected files ... .. //depot/projects/vap/sys/dev/ath/ah_osdep.h#6 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/ah_osdep.h#6 (text+ko) ==== @@ -33,13 +33,20 @@ /* * Atheros Hardware Access Layer (HAL) OS Dependent Definitions. */ +#include #include #include #include +#include #include /* + * Linker set writearounds for chip and RF backend registration. + */ +#define OS_DATA_SET(set, item) DATA_SET(set, item) + +/* * Delay n microseconds. */ extern void ath_hal_delay(int); From owner-p4-projects@FreeBSD.ORG Fri Nov 28 19:52:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 974FD1065673; Fri, 28 Nov 2008 19:52:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 5B34B1065670 for ; Fri, 28 Nov 2008 19:52:39 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 2E15B8FC12 for ; Fri, 28 Nov 2008 19:52:39 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mASJqdw8081075 for ; Fri, 28 Nov 2008 19:52:39 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mASJqdX8081073 for perforce@freebsd.org; Fri, 28 Nov 2008 19:52:39 GMT (envelope-from sam@freebsd.org) Date: Fri, 28 Nov 2008 19:52:39 GMT Message-Id: <200811281952.mASJqdX8081073@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 153707 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, 28 Nov 2008 19:52:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=153707 Change 153707 by sam@sam_ebb on 2008/11/28 19:52:24 oops, missed one Affected files ... .. //depot/projects/vap/sys/dev/ath/ah_osdep.h#7 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/ah_osdep.h#7 (text+ko) ==== @@ -45,6 +45,7 @@ * Linker set writearounds for chip and RF backend registration. */ #define OS_DATA_SET(set, item) DATA_SET(set, item) +#define OS_SET_DECLARE(set, ptype) SET_DECLARE(set, ptype) /* * Delay n microseconds. From owner-p4-projects@FreeBSD.ORG Fri Nov 28 20:10:58 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE5391065676; Fri, 28 Nov 2008 20:10:58 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8183F1065672 for ; Fri, 28 Nov 2008 20:10:58 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6BE4C8FC1B for ; Fri, 28 Nov 2008 20:10:58 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mASKAwoW083518 for ; Fri, 28 Nov 2008 20:10:58 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mASKAwxB083516 for perforce@freebsd.org; Fri, 28 Nov 2008 20:10:58 GMT (envelope-from sam@freebsd.org) Date: Fri, 28 Nov 2008 20:10:58 GMT Message-Id: <200811282010.mASKAwxB083516@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 153711 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, 28 Nov 2008 20:10:59 -0000 http://perforce.freebsd.org/chv.cgi?CH=153711 Change 153711 by sam@sam_ebb on 2008/11/28 20:10:57 Shift build to use ath hal source code; still needs work as we plan to move the hal code directory and we may want to move some explicit paths out of files. Note this requires you overlay contrib/dev/ath with code from projects/ath_hal. Affected files ... .. //depot/projects/vap/sys/conf/files#54 edit .. //depot/projects/vap/sys/conf/files.amd64#14 edit .. //depot/projects/vap/sys/conf/files.arm#9 edit .. //depot/projects/vap/sys/conf/files.i386#21 edit .. //depot/projects/vap/sys/conf/files.mips#5 edit .. //depot/projects/vap/sys/conf/files.pc98#15 edit .. //depot/projects/vap/sys/conf/files.powerpc#18 edit .. //depot/projects/vap/sys/conf/files.sparc64#13 edit .. //depot/projects/vap/sys/conf/kern.pre.mk#11 edit .. //depot/projects/vap/sys/conf/options#31 edit Differences ... ==== //depot/projects/vap/sys/conf/files#54 (text+ko) ==== @@ -501,6 +501,186 @@ dev/ata/atapi-fd.c optional atapifd dev/ata/atapi-tape.c optional atapist dev/ata/atapi-cam.c optional atapicam +# +contrib/dev/ath/ah.c optional ath_hal \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ah_eeprom_v1.c \ + optional ath_hal_ar5210 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ah_eeprom_v3.c \ + optional ath_hal_ar5211 | ath_hal_ar5212 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ah_eeprom_v14.c \ + optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ah_regdomain.c optional ath_hal \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5210/ar5210_attach.c optional ath_hal_ar5210 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5210/ar5210_beacon.c optional ath_hal_ar5210 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5210/ar5210_interrupts.c optional ath_hal_ar5210 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5210/ar5210_keycache.c optional ath_hal_ar5210 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5210/ar5210_misc.c optional ath_hal_ar5210 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5210/ar5210_phy.c optional ath_hal_ar5210 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5210/ar5210_power.c optional ath_hal_ar5210 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5210/ar5210_recv.c optional ath_hal_ar5210 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5210/ar5210_reset.c optional ath_hal_ar5210 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5210/ar5210_xmit.c optional ath_hal_ar5210 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5211/ar5211_attach.c optional ath_hal_ar5211 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5211/ar5211_beacon.c optional ath_hal_ar5211 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5211/ar5211_interrupts.c optional ath_hal_ar5211 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5211/ar5211_keycache.c optional ath_hal_ar5211 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5211/ar5211_misc.c optional ath_hal_ar5211 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5211/ar5211_phy.c optional ath_hal_ar5211 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5211/ar5211_power.c optional ath_hal_ar5211 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5211/ar5211_recv.c optional ath_hal_ar5211 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5211/ar5211_reset.c optional ath_hal_ar5211 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5211/ar5211_xmit.c optional ath_hal_ar5211 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5212/ar5212_ani.c \ + optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5212/ar5212_attach.c \ + optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5212/ar5212_beacon.c \ + optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5212/ar5212_eeprom.c \ + optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5212/ar5212_gpio.c \ + optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5212/ar5212_interrupts.c \ + optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5212/ar5212_keycache.c \ + optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5212/ar5212_misc.c \ + optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5212/ar5212_phy.c \ + optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5212/ar5212_power.c \ + optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5212/ar5212_recv.c \ + optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5212/ar5212_reset.c \ + optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5212/ar5212_rfgain.c \ + optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5212/ar5212_xmit.c \ + optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5212/ar2316.c \ + optional ath_hal_rf2316 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5212/ar2317.c \ + optional ath_hal_rf2317 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5212/ar2413.c \ + optional ath_hal_rf2413 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5212/ar2425.c \ + optional ath_hal_rf2425 | ath_hal_rf2417 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5212/ar5111.c \ + optional ath_hal_rf5111 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5212/ar5112.c \ + optional ath_hal_rf5112 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5212/ar5413.c \ + optional ath_hal_rf5413 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5416/ar2133.c \ + optional ath_hal_ar5416 | ath_hal_ar9160 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5416/ar5416_ani.c \ + optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5416/ar5416_attach.c \ + optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5416/ar5416_beacon.c \ + optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5416/ar5416_cal.c \ + optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5416/ar5416_cal_iq.c \ + optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5416/ar5416_cal_adcgain.c \ + optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5416/ar5416_cal_adcdc.c \ + optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5416/ar5416_eeprom.c \ + optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5416/ar5416_gpio.c \ + optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5416/ar5416_interrupts.c \ + optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5416/ar5416_keycache.c \ + optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5416/ar5416_misc.c \ + optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5416/ar5416_phy.c \ + optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5416/ar5416_power.c \ + optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5416/ar5416_recv.c \ + optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5416/ar5416_reset.c \ + optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5416/ar5416_xmit.c \ + optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5416/ar9160_attach.c \ + optional ath_hal_ar5416 | ath_hal_ar9160 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5416/ar9280.c \ + optional ath_hal_ar9280 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" +contrib/dev/ath/ar5416/ar9280_attach.c \ + optional ath_hal_ar9280 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" dev/ath/ah_osdep.c optional ath_hal \ compile-with "${NORMAL_C} -I$S/dev/ath" dev/ath/ath_rate/amrr/amrr.c optional ath_rate_amrr \ ==== //depot/projects/vap/sys/conf/files.amd64#14 (text+ko) ==== @@ -47,16 +47,6 @@ no-obj no-implicit-rule before-depend \ clean "ukbdmap.h" # -hal.o optional ath_hal \ - dependency "$S/contrib/dev/ath/public/x86_64-elf.hal.o.uu" \ - compile-with "uudecode < $S/contrib/dev/ath/public/x86_64-elf.hal.o.uu" \ - no-implicit-rule -opt_ah.h optional ath_hal \ - dependency "$S/contrib/dev/ath/public/x86_64-elf.opt_ah.h" \ - compile-with "rm -f opt_ah.h; cp $S/contrib/dev/ath/public/x86_64-elf.opt_ah.h opt_ah.h" \ - no-obj no-implicit-rule before-depend \ - clean "opt_ah.h" -# nvenetlib.o optional nve pci \ dependency "$S/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu" \ compile-with "uudecode $S/contrib/dev/nve/amd64/nvenetlib.o.bz2.uu ; bzip2 -df nvenetlib.o.bz2" \ ==== //depot/projects/vap/sys/conf/files.arm#9 (text+ko) ==== @@ -51,13 +51,6 @@ geom/geom_bsd_enc.c optional geom_bsd geom/geom_mbr.c optional geom_mbr geom/geom_mbr_enc.c optional geom_mbr -hal.o optional ath_hal \ - compile-with "ATH_HAL_CPU=`echo ${CONF_CFLAGS}|sed 's/.*-mcpu=\([a-zA-Z0-9]*\).*/\1/'`; ATH_ENDIAN=`if (echo ${CC}|grep mbig-endian>/dev/null); then echo be; else echo le; fi;`; uudecode < $S/contrib/dev/ath/public/$$ATH_HAL_CPU-$$ATH_ENDIAN-elf.hal.o.uu" \ - no-implicit-rule -opt_ah.h optional ath_hal \ - compile-with "ATH_HAL_CPU=`echo ${CONF_CFLAGS}|sed 's/.*-mcpu=\([a-zA-Z0-9]*\).*/\1/'`; ATH_ENDIAN=`if (echo ${CC}|grep mbig-endian>/dev/null); then echo be; else echo le; fi;`; rm -f opt_ah.h; cp $S/contrib/dev/ath/public/$$ATH_HAL_CPU-$$ATH_ENDIAN-elf.opt_ah.h opt_ah.h" \ - no-obj no-implicit-rule before-depend \ - clean "opt_ah.h" libkern/arm/divsi3.S standard libkern/arm/ffs.S standard libkern/arm/muldi3.c standard ==== //depot/projects/vap/sys/conf/files.i386#21 (text+ko) ==== @@ -46,16 +46,6 @@ no-obj no-implicit-rule before-depend \ clean "ukbdmap.h" # -hal.o optional ath_hal \ - dependency "$S/contrib/dev/ath/public/i386-elf.hal.o.uu" \ - compile-with "uudecode < $S/contrib/dev/ath/public/i386-elf.hal.o.uu" \ - no-implicit-rule -opt_ah.h optional ath_hal \ - dependency "$S/contrib/dev/ath/public/i386-elf.opt_ah.h" \ - compile-with "rm -f opt_ah.h; cp $S/contrib/dev/ath/public/i386-elf.opt_ah.h opt_ah.h" \ - no-obj no-implicit-rule before-depend \ - clean "opt_ah.h" -# nvenetlib.o optional nve pci \ dependency "$S/contrib/dev/nve/i386/nvenetlib.o.bz2.uu" \ compile-with "uudecode $S/contrib/dev/nve/i386/nvenetlib.o.bz2.uu ; bzip2 -df nvenetlib.o.bz2" \ ==== //depot/projects/vap/sys/conf/files.mips#5 (text+ko) ==== @@ -75,13 +75,6 @@ geom/geom_bsd_enc.c optional geom_bsd geom/geom_mbr.c optional geom_mbr geom/geom_mbr_enc.c optional geom_mbr -hal.o optional ath_hal \ - compile-with "ATH_HAL_CPU=mips; ATH_ENDIAN=`if ([ x${TARGET_BIG_ENDIAN} = x ]); then echo le; else echo be; fi;`; uudecode < $S/contrib/dev/ath/public/$$ATH_HAL_CPU-$$ATH_ENDIAN-elf.hal.o.uu" \ - no-implicit-rule -opt_ah.h optional ath_hal \ - compile-with "ATH_HAL_CPU=mips; ATH_ENDIAN=`if ([ x${TARGET_BIG_ENDIAN} = x ]); then echo le; else echo be; fi;`; rm -f opt_ah.h; cp $S/contrib/dev/ath/public/$$ATH_HAL_CPU-$$ATH_ENDIAN-elf.opt_ah.h opt_ah.h" \ - no-obj no-implicit-rule before-depend \ - clean "opt_ah.h" libkern/ashldi3.c standard libkern/ashrdi3.c standard libkern/divdi3.c standard ==== //depot/projects/vap/sys/conf/files.pc98#15 (text+ko) ==== @@ -38,16 +38,6 @@ no-obj no-implicit-rule before-depend \ clean "ukbdmap.h" # -hal.o optional ath_hal \ - dependency "$S/contrib/dev/ath/public/i386-elf.hal.o.uu" \ - compile-with "uudecode < $S/contrib/dev/ath/public/i386-elf.hal.o.uu" \ - no-implicit-rule -opt_ah.h optional ath_hal \ - dependency "$S/contrib/dev/ath/public/i386-elf.opt_ah.h" \ - compile-with "rm -f opt_ah.h; cp $S/contrib/dev/ath/public/i386-elf.opt_ah.h opt_ah.h" \ - no-obj no-implicit-rule before-depend \ - clean "opt_ah.h" -# compat/linprocfs/linprocfs.c optional linprocfs compat/linsysfs/linsysfs.c optional linsysfs compat/linux/linux_emul.c optional compat_linux ==== //depot/projects/vap/sys/conf/files.powerpc#18 (text+ko) ==== @@ -14,16 +14,6 @@ no-obj no-implicit-rule before-depend \ clean "font.h ${SC_DFLT_FONT}-8x14 ${SC_DFLT_FONT}-8x16 ${SC_DFLT_FONT}-8x8" # -hal.o optional ath_hal \ - dependency "$S/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu" \ - compile-with "uudecode < $S/contrib/dev/ath/public/powerpc-be-elf.hal.o.uu" \ - no-implicit-rule -opt_ah.h optional ath_hal \ - dependency "$S/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h" \ - compile-with "rm -f opt_ah.h; cp $S/contrib/dev/ath/public/powerpc-be-elf.opt_ah.h opt_ah.h" \ - no-obj no-implicit-rule before-depend \ - clean "opt_ah.h" -# crypto/blowfish/bf_enc.c optional crypto | ipsec crypto/des/des_enc.c optional crypto | ipsec | netsmb ==== //depot/projects/vap/sys/conf/files.sparc64#13 (text+ko) ==== @@ -22,16 +22,6 @@ no-obj no-implicit-rule before-depend \ clean "ukbdmap.h" # -hal.o optional ath_hal \ - dependency "$S/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu" \ - compile-with "uudecode < $S/contrib/dev/ath/public/sparc64-be-elf.hal.o.uu" \ - no-implicit-rule -opt_ah.h optional ath_hal \ - dependency "$S/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h" \ - compile-with "rm -f opt_ah.h; cp $S/contrib/dev/ath/public/sparc64-be-elf.opt_ah.h opt_ah.h" \ - no-obj no-implicit-rule before-depend \ - clean "opt_ah.h" -# crypto/blowfish/bf_enc.c optional crypto | ipsec crypto/des/des_enc.c optional crypto | ipsec | netsmb dev/atkbdc/atkbd.c optional atkbd atkbdc ==== //depot/projects/vap/sys/conf/kern.pre.mk#11 (text+ko) ==== @@ -67,7 +67,7 @@ INCLUDES+= -I$S/contrib/pf # ... and the same for Atheros HAL -INCLUDES+= -I$S/dev/ath +INCLUDES+= -I$S/dev/ath -I$S/contrib/dev/ath # ... and the same for the NgATM stuff INCLUDES+= -I$S/contrib/ngatm ==== //depot/projects/vap/sys/conf/options#31 (text+ko) ==== @@ -740,6 +740,26 @@ ATH_DIAGAPI opt_ath.h ATH_TX99_DIAG opt_ath.h +# options for the Atheros hal +AH_SUPPORT_AR5416 opt_ah.h +AH_SUPPORT_AR9280 opt_ah.h +AH_SUPPORT_AR9285 opt_ah.h +AH_SUPPORT_2316 opt_ah.h +AH_SUPPORT_2317 opt_ah.h + +AH_DEBUG opt_ah.h +AH_ASSERT opt_ah.h +AH_DEBUG_ALQ opt_ah.h +AH_REGOPS_FUNC opt_ah.h +AH_WRITE_REGDOMAIN opt_ah.h +AH_DEBUG_COUNTRY opt_ah.h +AH_DISABLE_WME opt_ah.h +AH_WRITE_EEPROM opt_ah.h +AH_PRIVATE_DIAG opt_ah.h +AH_NEED_DESC_SWAP opt_ah.h +AH_USE_INIPDGAIN opt_ah.h +AH_SUPPORT_11D opt_ah.h + # options for the Broadcom wireless driver BWI_DEBUG opt_bwi.h BWI_DEBUG_VERBOSE opt_bwi.h From owner-p4-projects@FreeBSD.ORG Fri Nov 28 22:24:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3D33D106567B; Fri, 28 Nov 2008 22:24:17 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 025BF1065679 for ; Fri, 28 Nov 2008 22:24:17 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C858E8FC14 for ; Fri, 28 Nov 2008 22:24:16 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mASMOG9V005301 for ; Fri, 28 Nov 2008 22:24:16 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mASMOGAG005299 for perforce@freebsd.org; Fri, 28 Nov 2008 22:24:16 GMT (envelope-from sam@freebsd.org) Date: Fri, 28 Nov 2008 22:24:16 GMT Message-Id: <200811282224.mASMOGAG005299@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 153717 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, 28 Nov 2008 22:24:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=153717 Change 153717 by sam@sam_ebb on 2008/11/28 22:23:49 add another linker set shim Affected files ... .. //depot/projects/vap/sys/dev/ath/ah_osdep.h#8 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/ah_osdep.h#8 (text+ko) ==== @@ -46,6 +46,7 @@ */ #define OS_DATA_SET(set, item) DATA_SET(set, item) #define OS_SET_DECLARE(set, ptype) SET_DECLARE(set, ptype) +#define OS_SET_FOREACH(pvar, set) SET_FOREACH(pvar, set) /* * Delay n microseconds. From owner-p4-projects@FreeBSD.ORG Fri Nov 28 22:28:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 61D1E1065672; Fri, 28 Nov 2008 22:28:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 26183106564A for ; Fri, 28 Nov 2008 22:28:21 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 10E368FC12 for ; Fri, 28 Nov 2008 22:28:21 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mASMSKM4005615 for ; Fri, 28 Nov 2008 22:28:20 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mASMSKgs005613 for perforce@freebsd.org; Fri, 28 Nov 2008 22:28:20 GMT (envelope-from sam@freebsd.org) Date: Fri, 28 Nov 2008 22:28:20 GMT Message-Id: <200811282228.mASMSKgs005613@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 153718 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, 28 Nov 2008 22:28:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=153718 Change 153718 by sam@sam_ebb on 2008/11/28 22:28:14 ath_hal_version and ath_hal_buildopts are gone; also now no reason to split driver and hal into separate modules Affected files ... .. //depot/projects/vap/sys/dev/ath/ah_osdep.c#7 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/ah_osdep.c#7 (text+ko) ==== @@ -90,9 +90,6 @@ TUNABLE_INT("hw.ath.hal.debug", &ath_hal_debug); #endif /* AH_DEBUG */ -SYSCTL_STRING(_hw_ath_hal, OID_AUTO, version, CTLFLAG_RD, ath_hal_version, 0, - "Atheros HAL version"); - /* NB: these are deprecated; they exist for now for compatibility */ int ath_hal_dma_beacon_response_time = 2; /* in TU's */ SYSCTL_INT(_hw_ath_hal, OID_AUTO, dma_brt, CTLFLAG_RW, @@ -415,37 +412,3 @@ { return memcpy(dst, src, n); } - -/* - * Module glue. - */ - -static int -ath_hal_modevent(module_t mod, int type, void *unused) -{ - const char *sep; - int i; - - switch (type) { - case MOD_LOAD: - printf("ath_hal: %s (", ath_hal_version); - sep = ""; - for (i = 0; ath_hal_buildopts[i] != NULL; i++) { - printf("%s%s", sep, ath_hal_buildopts[i]); - sep = ", "; - } - printf(")\n"); - return 0; - case MOD_UNLOAD: - return 0; - } - return EINVAL; -} - -static moduledata_t ath_hal_mod = { - "ath_hal", - ath_hal_modevent, - 0 -}; -DECLARE_MODULE(ath_hal, ath_hal_mod, SI_SUB_DRIVERS, SI_ORDER_ANY); -MODULE_VERSION(ath_hal, 1); From owner-p4-projects@FreeBSD.ORG Fri Nov 28 23:03:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B3CFA1065675; Fri, 28 Nov 2008 23:03:57 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 77CD1106564A for ; Fri, 28 Nov 2008 23:03:57 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 457EC8FC1D for ; Fri, 28 Nov 2008 23:03:57 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mASN3vdN009549 for ; Fri, 28 Nov 2008 23:03:57 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mASN3vpS009547 for perforce@freebsd.org; Fri, 28 Nov 2008 23:03:57 GMT (envelope-from sam@freebsd.org) Date: Fri, 28 Nov 2008 23:03:57 GMT Message-Id: <200811282303.mASN3vpS009547@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 153720 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, 28 Nov 2008 23:03:58 -0000 http://perforce.freebsd.org/chv.cgi?CH=153720 Change 153720 by sam@sam_ebb on 2008/11/28 23:03:38 AH_DISABLE_WME is no more Affected files ... .. //depot/projects/vap/sys/conf/options#32 edit Differences ... ==== //depot/projects/vap/sys/conf/options#32 (text+ko) ==== @@ -753,7 +753,6 @@ AH_REGOPS_FUNC opt_ah.h AH_WRITE_REGDOMAIN opt_ah.h AH_DEBUG_COUNTRY opt_ah.h -AH_DISABLE_WME opt_ah.h AH_WRITE_EEPROM opt_ah.h AH_PRIVATE_DIAG opt_ah.h AH_NEED_DESC_SWAP opt_ah.h From owner-p4-projects@FreeBSD.ORG Fri Nov 28 23:06:00 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E71BD1065676; Fri, 28 Nov 2008 23:05:59 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AAEC8106564A for ; Fri, 28 Nov 2008 23:05:59 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 93E5B8FC19 for ; Fri, 28 Nov 2008 23:05:59 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mASN5xTf009758 for ; Fri, 28 Nov 2008 23:05:59 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mASN5xAV009756 for perforce@freebsd.org; Fri, 28 Nov 2008 23:05:59 GMT (envelope-from sam@freebsd.org) Date: Fri, 28 Nov 2008 23:05:59 GMT Message-Id: <200811282305.mASN5xAV009756@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 153721 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, 28 Nov 2008 23:06:00 -0000 http://perforce.freebsd.org/chv.cgi?CH=153721 Change 153721 by sam@sam_ebb on 2008/11/28 23:05:03 remove ath_hal, the hal is now part of ath Affected files ... .. //depot/projects/vap/sys/conf/files#55 edit .. //depot/projects/vap/sys/modules/Makefile#44 edit .. //depot/projects/vap/sys/modules/ath_hal/Makefile#5 delete Differences ... ==== //depot/projects/vap/sys/conf/files#55 (text+ko) ==== @@ -502,186 +502,172 @@ dev/ata/atapi-tape.c optional atapist dev/ata/atapi-cam.c optional atapicam # -contrib/dev/ath/ah.c optional ath_hal \ +contrib/dev/ath/ah.c optional ath \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" -contrib/dev/ath/ah_eeprom_v1.c \ - optional ath_hal_ar5210 \ +contrib/dev/ath/ah_eeprom_v1.c optional ath_ar5210 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" -contrib/dev/ath/ah_eeprom_v3.c \ - optional ath_hal_ar5211 | ath_hal_ar5212 \ +contrib/dev/ath/ah_eeprom_v3.c optional ath_ar5211 | ath_ar5212 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" -contrib/dev/ath/ah_eeprom_v14.c \ - optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ +contrib/dev/ath/ah_eeprom_v14.c optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" -contrib/dev/ath/ah_regdomain.c optional ath_hal \ +contrib/dev/ath/ah_regdomain.c optional ath \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" -contrib/dev/ath/ar5210/ar5210_attach.c optional ath_hal_ar5210 \ +contrib/dev/ath/ar5210/ar5210_attach.c optional ath_ar5210 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" -contrib/dev/ath/ar5210/ar5210_beacon.c optional ath_hal_ar5210 \ +contrib/dev/ath/ar5210/ar5210_beacon.c optional ath_ar5210 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" -contrib/dev/ath/ar5210/ar5210_interrupts.c optional ath_hal_ar5210 \ +contrib/dev/ath/ar5210/ar5210_interrupts.c optional ath_ar5210 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" -contrib/dev/ath/ar5210/ar5210_keycache.c optional ath_hal_ar5210 \ +contrib/dev/ath/ar5210/ar5210_keycache.c optional ath_ar5210 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" -contrib/dev/ath/ar5210/ar5210_misc.c optional ath_hal_ar5210 \ +contrib/dev/ath/ar5210/ar5210_misc.c optional ath_ar5210 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" -contrib/dev/ath/ar5210/ar5210_phy.c optional ath_hal_ar5210 \ +contrib/dev/ath/ar5210/ar5210_phy.c optional ath_ar5210 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" -contrib/dev/ath/ar5210/ar5210_power.c optional ath_hal_ar5210 \ +contrib/dev/ath/ar5210/ar5210_power.c optional ath_ar5210 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" -contrib/dev/ath/ar5210/ar5210_recv.c optional ath_hal_ar5210 \ +contrib/dev/ath/ar5210/ar5210_recv.c optional ath_ar5210 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" -contrib/dev/ath/ar5210/ar5210_reset.c optional ath_hal_ar5210 \ +contrib/dev/ath/ar5210/ar5210_reset.c optional ath_ar5210 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" -contrib/dev/ath/ar5210/ar5210_xmit.c optional ath_hal_ar5210 \ +contrib/dev/ath/ar5210/ar5210_xmit.c optional ath_ar5210 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" -contrib/dev/ath/ar5211/ar5211_attach.c optional ath_hal_ar5211 \ +contrib/dev/ath/ar5211/ar5211_attach.c optional ath_ar5211 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" -contrib/dev/ath/ar5211/ar5211_beacon.c optional ath_hal_ar5211 \ +contrib/dev/ath/ar5211/ar5211_beacon.c optional ath_ar5211 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" -contrib/dev/ath/ar5211/ar5211_interrupts.c optional ath_hal_ar5211 \ +contrib/dev/ath/ar5211/ar5211_interrupts.c optional ath_ar5211 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" -contrib/dev/ath/ar5211/ar5211_keycache.c optional ath_hal_ar5211 \ +contrib/dev/ath/ar5211/ar5211_keycache.c optional ath_ar5211 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" -contrib/dev/ath/ar5211/ar5211_misc.c optional ath_hal_ar5211 \ +contrib/dev/ath/ar5211/ar5211_misc.c optional ath_ar5211 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" -contrib/dev/ath/ar5211/ar5211_phy.c optional ath_hal_ar5211 \ +contrib/dev/ath/ar5211/ar5211_phy.c optional ath_ar5211 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" -contrib/dev/ath/ar5211/ar5211_power.c optional ath_hal_ar5211 \ +contrib/dev/ath/ar5211/ar5211_power.c optional ath_ar5211 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" -contrib/dev/ath/ar5211/ar5211_recv.c optional ath_hal_ar5211 \ +contrib/dev/ath/ar5211/ar5211_recv.c optional ath_ar5211 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" -contrib/dev/ath/ar5211/ar5211_reset.c optional ath_hal_ar5211 \ +contrib/dev/ath/ar5211/ar5211_reset.c optional ath_ar5211 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" -contrib/dev/ath/ar5211/ar5211_xmit.c optional ath_hal_ar5211 \ +contrib/dev/ath/ar5211/ar5211_xmit.c optional ath_ar5211 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" contrib/dev/ath/ar5212/ar5212_ani.c \ - optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" contrib/dev/ath/ar5212/ar5212_attach.c \ - optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" contrib/dev/ath/ar5212/ar5212_beacon.c \ - optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" contrib/dev/ath/ar5212/ar5212_eeprom.c \ - optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" contrib/dev/ath/ar5212/ar5212_gpio.c \ - optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" contrib/dev/ath/ar5212/ar5212_interrupts.c \ - optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" contrib/dev/ath/ar5212/ar5212_keycache.c \ - optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" contrib/dev/ath/ar5212/ar5212_misc.c \ - optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" contrib/dev/ath/ar5212/ar5212_phy.c \ - optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" contrib/dev/ath/ar5212/ar5212_power.c \ - optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" contrib/dev/ath/ar5212/ar5212_recv.c \ - optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" contrib/dev/ath/ar5212/ar5212_reset.c \ - optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" contrib/dev/ath/ar5212/ar5212_rfgain.c \ - optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" contrib/dev/ath/ar5212/ar5212_xmit.c \ - optional ath_hal_ar5212 | ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" -contrib/dev/ath/ar5212/ar2316.c \ - optional ath_hal_rf2316 \ +contrib/dev/ath/ar5212/ar2316.c optional ath_rf2316 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" -contrib/dev/ath/ar5212/ar2317.c \ - optional ath_hal_rf2317 \ +contrib/dev/ath/ar5212/ar2317.c optional ath_rf2317 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" -contrib/dev/ath/ar5212/ar2413.c \ - optional ath_hal_rf2413 \ +contrib/dev/ath/ar5212/ar2413.c optional ath_rf2413 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" -contrib/dev/ath/ar5212/ar2425.c \ - optional ath_hal_rf2425 | ath_hal_rf2417 \ +contrib/dev/ath/ar5212/ar2425.c optional ath_rf2425 | ath_rf2417 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" -contrib/dev/ath/ar5212/ar5111.c \ - optional ath_hal_rf5111 \ +contrib/dev/ath/ar5212/ar5111.c optional ath_rf5111 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" -contrib/dev/ath/ar5212/ar5112.c \ - optional ath_hal_rf5112 \ +contrib/dev/ath/ar5212/ar5112.c optional ath_rf5112 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" -contrib/dev/ath/ar5212/ar5413.c \ - optional ath_hal_rf5413 \ +contrib/dev/ath/ar5212/ar5413.c optional ath_rf5413 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" -contrib/dev/ath/ar5416/ar2133.c \ - optional ath_hal_ar5416 | ath_hal_ar9160 \ +contrib/dev/ath/ar5416/ar2133.c optional ath_ar5416 | ath_ar9160 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" contrib/dev/ath/ar5416/ar5416_ani.c \ - optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" contrib/dev/ath/ar5416/ar5416_attach.c \ - optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" contrib/dev/ath/ar5416/ar5416_beacon.c \ - optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" contrib/dev/ath/ar5416/ar5416_cal.c \ - optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" contrib/dev/ath/ar5416/ar5416_cal_iq.c \ - optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" contrib/dev/ath/ar5416/ar5416_cal_adcgain.c \ - optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" contrib/dev/ath/ar5416/ar5416_cal_adcdc.c \ - optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" contrib/dev/ath/ar5416/ar5416_eeprom.c \ - optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" contrib/dev/ath/ar5416/ar5416_gpio.c \ - optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" contrib/dev/ath/ar5416/ar5416_interrupts.c \ - optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" contrib/dev/ath/ar5416/ar5416_keycache.c \ - optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" contrib/dev/ath/ar5416/ar5416_misc.c \ - optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" contrib/dev/ath/ar5416/ar5416_phy.c \ - optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" contrib/dev/ath/ar5416/ar5416_power.c \ - optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" contrib/dev/ath/ar5416/ar5416_recv.c \ - optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" contrib/dev/ath/ar5416/ar5416_reset.c \ - optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" contrib/dev/ath/ar5416/ar5416_xmit.c \ - optional ath_hal_ar5416 | ath_hal_ar9160 | ath_hal_ar9280 \ + optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" -contrib/dev/ath/ar5416/ar9160_attach.c \ - optional ath_hal_ar5416 | ath_hal_ar9160 \ +contrib/dev/ath/ar5416/ar9160_attach.c optional ath_ar5416 | ath_ar9160 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" -contrib/dev/ath/ar5416/ar9280.c \ - optional ath_hal_ar9280 \ +contrib/dev/ath/ar5416/ar9280.c optional ath_ar9280 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" -contrib/dev/ath/ar5416/ar9280_attach.c \ - optional ath_hal_ar9280 \ +contrib/dev/ath/ar5416/ar9280_attach.c optional ath_ar9280 \ compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" -dev/ath/ah_osdep.c optional ath_hal \ +dev/ath/ah_osdep.c optional ath \ compile-with "${NORMAL_C} -I$S/dev/ath" dev/ath/ath_rate/amrr/amrr.c optional ath_rate_amrr \ compile-with "${NORMAL_C} -I$S/dev/ath" ==== //depot/projects/vap/sys/modules/Makefile#44 (text+ko) ==== @@ -28,11 +28,10 @@ ${_asmc} \ ${_asr} \ ata \ - ${_ath} \ - ${_ath_hal} \ - ${_ath_rate_amrr} \ - ${_ath_rate_onoe} \ - ${_ath_rate_sample} \ + ath \ + ath_rate_amrr \ + ath_rate_onoe \ + ath_rate_sample \ aue \ ${_auxio} \ axe \ @@ -383,11 +382,6 @@ _apm= apm _ar= ar _arcnet= arcnet -_ath= ath -_ath_hal= ath_hal -_ath_rate_amrr= ath_rate_amrr -_ath_rate_onoe= ath_rate_onoe -_ath_rate_sample=ath_rate_sample _bktr= bktr _cardbus= cardbus _cbb= cbb @@ -520,11 +514,6 @@ _an= an _arcmsr= arcmsr _asmc= asmc -_ath= ath -_ath_hal= ath_hal -_ath_rate_amrr= ath_rate_amrr -_ath_rate_onoe= ath_rate_onoe -_ath_rate_sample=ath_rate_sample _cardbus= cardbus _cbb= cbb _cmx= cmx @@ -632,11 +621,6 @@ .if ${MACHINE_ARCH} == "powerpc" _an= an -_ath= ath -_ath_hal= ath_hal -_ath_rate_amrr= ath_rate_amrr -_ath_rate_onoe= ath_rate_onoe -_ath_rate_sample=ath_rate_sample _bm= bm _nvram= powermac_nvram _smbfs= smbfs @@ -644,11 +628,6 @@ .endif .if ${MACHINE_ARCH} == "sparc64" -_ath= ath -_ath_hal= ath_hal -_ath_rate_amrr= ath_rate_amrr -_ath_rate_onoe= ath_rate_onoe -_ath_rate_sample=ath_rate_sample _auxio= auxio _em= em _i2c= i2c From owner-p4-projects@FreeBSD.ORG Fri Nov 28 23:26:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 85ACF1065680; Fri, 28 Nov 2008 23:26:20 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 49F0D106567E for ; Fri, 28 Nov 2008 23:26:20 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 32E548FC21 for ; Fri, 28 Nov 2008 23:26:20 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mASNQKhs011476 for ; Fri, 28 Nov 2008 23:26:20 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mASNQKoL011474 for perforce@freebsd.org; Fri, 28 Nov 2008 23:26:20 GMT (envelope-from sam@freebsd.org) Date: Fri, 28 Nov 2008 23:26:20 GMT Message-Id: <200811282326.mASNQKoL011474@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 153723 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, 28 Nov 2008 23:26:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=153723 Change 153723 by sam@sam_ebb on 2008/11/28 23:25:39 move hal from contrib/dev/ath to dev/ath/ath_hal; if you're playing along move the symlink to projects/ath_hal Affected files ... .. //depot/projects/vap/sys/conf/files#56 edit .. //depot/projects/vap/sys/conf/kern.pre.mk#12 edit Differences ... ==== //depot/projects/vap/sys/conf/files#56 (text+ko) ==== @@ -503,170 +503,170 @@ dev/ata/atapi-cam.c optional atapicam # contrib/dev/ath/ah.c optional ath \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ah_eeprom_v1.c optional ath_ar5210 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ah_eeprom_v3.c optional ath_ar5211 | ath_ar5212 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ah_eeprom_v14.c optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ah_regdomain.c optional ath \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5210/ar5210_attach.c optional ath_ar5210 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5210/ar5210_beacon.c optional ath_ar5210 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5210/ar5210_interrupts.c optional ath_ar5210 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5210/ar5210_keycache.c optional ath_ar5210 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5210/ar5210_misc.c optional ath_ar5210 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5210/ar5210_phy.c optional ath_ar5210 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5210/ar5210_power.c optional ath_ar5210 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5210/ar5210_recv.c optional ath_ar5210 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5210/ar5210_reset.c optional ath_ar5210 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5210/ar5210_xmit.c optional ath_ar5210 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5211/ar5211_attach.c optional ath_ar5211 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5211/ar5211_beacon.c optional ath_ar5211 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5211/ar5211_interrupts.c optional ath_ar5211 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5211/ar5211_keycache.c optional ath_ar5211 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5211/ar5211_misc.c optional ath_ar5211 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5211/ar5211_phy.c optional ath_ar5211 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5211/ar5211_power.c optional ath_ar5211 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5211/ar5211_recv.c optional ath_ar5211 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5211/ar5211_reset.c optional ath_ar5211 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5211/ar5211_xmit.c optional ath_ar5211 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar5212_ani.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar5212_attach.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar5212_beacon.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar5212_eeprom.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar5212_gpio.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar5212_interrupts.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar5212_keycache.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar5212_misc.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar5212_phy.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar5212_power.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar5212_recv.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar5212_reset.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar5212_rfgain.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar5212_xmit.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar2316.c optional ath_rf2316 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar2317.c optional ath_rf2317 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar2413.c optional ath_rf2413 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar2425.c optional ath_rf2425 | ath_rf2417 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar5111.c optional ath_rf5111 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar5112.c optional ath_rf5112 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5212/ar5413.c optional ath_rf5413 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar2133.c optional ath_ar5416 | ath_ar9160 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar5416_ani.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar5416_attach.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar5416_beacon.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar5416_cal.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar5416_cal_iq.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar5416_cal_adcgain.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar5416_cal_adcdc.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar5416_eeprom.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar5416_gpio.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar5416_interrupts.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar5416_keycache.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar5416_misc.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar5416_phy.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar5416_power.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar5416_recv.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar5416_reset.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar5416_xmit.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar9160_attach.c optional ath_ar5416 | ath_ar9160 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar9280.c optional ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" contrib/dev/ath/ar5416/ar9280_attach.c optional ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath -I$S/contrib/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath" dev/ath/ah_osdep.c optional ath \ compile-with "${NORMAL_C} -I$S/dev/ath" dev/ath/ath_rate/amrr/amrr.c optional ath_rate_amrr \ ==== //depot/projects/vap/sys/conf/kern.pre.mk#12 (text+ko) ==== @@ -66,8 +66,8 @@ # ... and the same for pf INCLUDES+= -I$S/contrib/pf -# ... and the same for Atheros HAL -INCLUDES+= -I$S/dev/ath -I$S/contrib/dev/ath +# ... and the same for ath +INCLUDES+= -I$S/dev/ath -I$S/dev/ath/ath_hal # ... and the same for the NgATM stuff INCLUDES+= -I$S/contrib/ngatm From owner-p4-projects@FreeBSD.ORG Fri Nov 28 23:29:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BE1E61065676; Fri, 28 Nov 2008 23:29:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8216F1065675 for ; Fri, 28 Nov 2008 23:29:23 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6BB088FC0C for ; Fri, 28 Nov 2008 23:29:23 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mASNTNB1011691 for ; Fri, 28 Nov 2008 23:29:23 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mASNTNLr011689 for perforce@freebsd.org; Fri, 28 Nov 2008 23:29:23 GMT (envelope-from sam@freebsd.org) Date: Fri, 28 Nov 2008 23:29:23 GMT Message-Id: <200811282329.mASNTNLr011689@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 153724 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, 28 Nov 2008 23:29:24 -0000 http://perforce.freebsd.org/chv.cgi?CH=153724 Change 153724 by sam@sam_ebb on 2008/11/28 23:29:19 contrib/dev/ath -> dev/ath/ath_hal Affected files ... .. //depot/projects/vap/sys/dev/ath/ah_osdep.c#8 edit .. //depot/projects/vap/sys/dev/ath/if_ath.c#126 edit .. //depot/projects/vap/sys/dev/ath/if_ath_pci.c#8 edit .. //depot/projects/vap/sys/dev/ath/if_athvar.h#39 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/ah_osdep.c#8 (text+ko) ==== @@ -43,7 +43,7 @@ #include /* XXX for ether_sprintf */ -#include +#include /* * WiSoC boards overload the bus tag with information about the @@ -192,7 +192,7 @@ */ #include #include -#include +#include static struct alq *ath_hal_alq; static int ath_hal_alq_emitdev; /* need to emit DEVICE record */ ==== //depot/projects/vap/sys/dev/ath/if_ath.c#126 (text+ko) ==== @@ -77,8 +77,7 @@ #endif #include -#include -#include /* XXX for softled */ +#include /* XXX for softled */ #ifdef ATH_TX99_DIAG #include ==== //depot/projects/vap/sys/dev/ath/if_ath_pci.c#8 (text+ko) ==== @@ -56,7 +56,6 @@ #include #include -#include #include #include ==== //depot/projects/vap/sys/dev/ath/if_athvar.h#39 (text+ko) ==== @@ -35,8 +35,8 @@ #ifndef _DEV_ATH_ATHVAR_H #define _DEV_ATH_ATHVAR_H -#include -#include +#include +#include #include #include #include From owner-p4-projects@FreeBSD.ORG Sat Nov 29 02:55:39 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 3DCC21065673; Sat, 29 Nov 2008 02:55:39 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F3AD81065670 for ; Sat, 29 Nov 2008 02:55:38 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D8F7A8FC0A for ; Sat, 29 Nov 2008 02:55:38 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAT2tcvS041703 for ; Sat, 29 Nov 2008 02:55:38 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAT2tZtD041701 for perforce@freebsd.org; Sat, 29 Nov 2008 02:55:35 GMT (envelope-from peter-gmail@wemm.org) Date: Sat, 29 Nov 2008 02:55:35 GMT Message-Id: <200811290255.mAT2tZtD041701@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 153733 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, 29 Nov 2008 02:55:39 -0000 http://perforce.freebsd.org/chv.cgi?CH=153733 Change 153733 by peter@peter_overcee on 2008/11/29 02:55:19 IFC @153732 Affected files ... .. //depot/projects/hammer/COPYRIGHT#7 integrate .. //depot/projects/hammer/Makefile#52 integrate .. //depot/projects/hammer/Makefile.inc1#142 integrate .. //depot/projects/hammer/UPDATING#125 integrate .. //depot/projects/hammer/bin/df/df.1#13 integrate .. //depot/projects/hammer/bin/df/df.c#25 integrate .. //depot/projects/hammer/bin/ps/print.c#20 integrate .. //depot/projects/hammer/bin/sh/eval.c#17 integrate .. //depot/projects/hammer/bin/sh/exec.c#10 integrate .. //depot/projects/hammer/cddl/compat/opensolaris/include/libshare.h#1 branch .. //depot/projects/hammer/cddl/compat/opensolaris/include/mnttab.h#3 integrate .. //depot/projects/hammer/cddl/compat/opensolaris/misc/deviceid.c#2 integrate .. //depot/projects/hammer/cddl/compat/opensolaris/misc/mnttab.c#2 integrate .. //depot/projects/hammer/cddl/compat/opensolaris/misc/zmount.c#2 integrate .. //depot/projects/hammer/cddl/compat/opensolaris/misc/zone.c#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zdb/zdb.8#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zdb/zdb.c#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zfs/zfs.8#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zinject/translate.c#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zinject/zinject.c#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zinject/zinject.h#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zpool/zpool.8#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zpool/zpool_iter.c#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zpool/zpool_util.c#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/cmd/ztest/ztest.c#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/head/assert.h#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/head/libintl.h#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/head/synch.h#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/head/thread.h#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.h#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libuutil/common/libuutil.h#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libuutil/common/uu_avl.c#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libuutil/common/uu_list.c#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#1 branch .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#4 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#2 integrate .. //depot/projects/hammer/cddl/contrib/opensolaris/lib/libzpool/common/util.c#2 integrate .. //depot/projects/hammer/cddl/lib/libzfs/Makefile#4 integrate .. //depot/projects/hammer/cddl/lib/libzpool/Makefile#5 integrate .. //depot/projects/hammer/cddl/sbin/zpool/Makefile#5 integrate .. //depot/projects/hammer/cddl/usr.bin/Makefile#7 integrate .. //depot/projects/hammer/cddl/usr.bin/zinject/Makefile#1 branch .. //depot/projects/hammer/cddl/usr.bin/ztest/Makefile#5 integrate .. //depot/projects/hammer/cddl/usr.sbin/zdb/Makefile#5 integrate .. //depot/projects/hammer/contrib/gdb/gdb/arm-tdep.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ANNOUNCE#3 integrate .. //depot/projects/hammer/contrib/ncurses/FREEBSD-upgrade#5 integrate .. //depot/projects/hammer/contrib/ncurses/FREEBSD-vendor#4 delete .. //depot/projects/hammer/contrib/ncurses/INSTALL#5 integrate .. //depot/projects/hammer/contrib/ncurses/MANIFEST#5 integrate .. //depot/projects/hammer/contrib/ncurses/NEWS#6 integrate .. //depot/projects/hammer/contrib/ncurses/TO-DO#4 integrate .. //depot/projects/hammer/contrib/ncurses/aclocal.m4#5 integrate .. //depot/projects/hammer/contrib/ncurses/announce.html.in#3 integrate .. //depot/projects/hammer/contrib/ncurses/config.guess#5 integrate .. //depot/projects/hammer/contrib/ncurses/config.sub#5 integrate .. //depot/projects/hammer/contrib/ncurses/configure#5 integrate .. //depot/projects/hammer/contrib/ncurses/configure.in#5 integrate .. //depot/projects/hammer/contrib/ncurses/dist.mk#6 integrate .. //depot/projects/hammer/contrib/ncurses/doc/html/announce.html#3 integrate .. //depot/projects/hammer/contrib/ncurses/form/form.priv.h#3 integrate .. //depot/projects/hammer/contrib/ncurses/form/frm_def.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/form/frm_driver.c#5 integrate .. //depot/projects/hammer/contrib/ncurses/form/frm_req_name.c#3 integrate .. //depot/projects/hammer/contrib/ncurses/include/MKterm.h.awk.in#4 integrate .. //depot/projects/hammer/contrib/ncurses/include/capdefaults.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/include/curses.h.in#6 integrate .. //depot/projects/hammer/contrib/ncurses/include/curses.tail#4 integrate .. //depot/projects/hammer/contrib/ncurses/include/nc_alloc.h#4 integrate .. //depot/projects/hammer/contrib/ncurses/include/nc_panel.h#2 integrate .. //depot/projects/hammer/contrib/ncurses/include/ncurses_defs#5 integrate .. //depot/projects/hammer/contrib/ncurses/include/term_entry.h#3 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_getcchar.3x#4 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_memleaks.3x#1 branch .. //depot/projects/hammer/contrib/ncurses/man/curs_terminfo.3x#4 integrate .. //depot/projects/hammer/contrib/ncurses/man/curs_util.3x#4 integrate .. //depot/projects/hammer/contrib/ncurses/man/form.3x#4 integrate .. //depot/projects/hammer/contrib/ncurses/man/form_driver.3x#4 integrate .. //depot/projects/hammer/contrib/ncurses/man/form_field_buffer.3x#3 integrate .. //depot/projects/hammer/contrib/ncurses/man/man_db.renames#5 integrate .. //depot/projects/hammer/contrib/ncurses/man/menu_attributes.3x#3 integrate .. //depot/projects/hammer/contrib/ncurses/man/menu_driver.3x#4 integrate .. //depot/projects/hammer/contrib/ncurses/man/menu_pattern.3x#3 integrate .. //depot/projects/hammer/contrib/ncurses/man/ncurses.3x#4 integrate .. //depot/projects/hammer/contrib/ncurses/menu/m_driver.c#3 integrate .. //depot/projects/hammer/contrib/ncurses/menu/m_req_name.c#3 integrate .. //depot/projects/hammer/contrib/ncurses/misc/ncu-indent#2 integrate .. //depot/projects/hammer/contrib/ncurses/misc/ncurses.supp#1 branch .. //depot/projects/hammer/contrib/ncurses/misc/terminfo.src#6 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/MKkeyname.awk#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/MKlib_gen.sh#5 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/MKunctrl.awk#5 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_addch.c#5 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_delwin.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_freeall.c#5 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_getch.c#6 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_getstr.c#3 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_initscr.c#5 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_mouse.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_newterm.c#6 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_newwin.c#6 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_overlay.c#5 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_restart.c#5 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_screen.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_set_term.c#6 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_slk.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_slkrefr.c#3 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_ungetch.c#5 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/lib_window.c#5 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/resizeterm.c#6 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/tries.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/use_window.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/base/wresize.c#5 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/curses.priv.h#7 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/fifo_defs.h#3 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/llib-lncurses#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/llib-lncursest#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/llib-lncursesw#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/MKcodes.awk#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/MKnames.awk#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/alloc_entry.c#3 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/alloc_ttype.c#3 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/captoinfo.c#3 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/comp_expand.c#3 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/comp_hash.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/comp_parse.c#5 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/comp_scan.c#3 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/entries.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/home_terminfo.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/init_keytry.c#5 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/lib_acs.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/lib_baudrate.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/lib_cur_term.c#3 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/lib_data.c#6 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/lib_options.c#5 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/lib_raw.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/lib_setup.c#6 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/lib_termcap.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/lib_tgoto.c#3 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/lib_tparm.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/lib_tputs.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#5 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/make_keys.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/name_match.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/parse_entry.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/read_entry.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/use_screen.c#3 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tinfo/write_entry.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/trace/lib_trace.c#5 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/trace/lib_traceatr.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/trace/lib_tracebits.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/trace/lib_tracechr.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/trace/lib_tracedmp.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/trace/lib_tracemse.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/trace/trace_buf.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/trace/trace_tries.c#3 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/trace/varargs.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/trace/visbuf.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tty/hardscroll.c#3 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tty/lib_mvcur.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tty/lib_twait.c#5 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/tty/tty_update.c#5 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/widechar/charable.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/widechar/lib_get_wch.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/widechar/lib_get_wstr.c#3 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/widechar/lib_key_name.c#2 integrate .. //depot/projects/hammer/contrib/ncurses/ncurses/widechar/lib_unget_wch.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/panel/p_new.c#3 integrate .. //depot/projects/hammer/contrib/ncurses/panel/panel.priv.h#3 integrate .. //depot/projects/hammer/contrib/ncurses/progs/MKtermsort.sh#3 integrate .. //depot/projects/hammer/contrib/ncurses/progs/Makefile.in#4 integrate .. //depot/projects/hammer/contrib/ncurses/progs/dump_entry.c#5 integrate .. //depot/projects/hammer/contrib/ncurses/progs/dump_entry.h#3 integrate .. //depot/projects/hammer/contrib/ncurses/progs/infocmp.c#5 integrate .. //depot/projects/hammer/contrib/ncurses/progs/progs.priv.h#4 integrate .. //depot/projects/hammer/contrib/ncurses/progs/tic.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/progs/toe.c#5 integrate .. //depot/projects/hammer/contrib/ncurses/progs/tput.c#4 integrate .. //depot/projects/hammer/contrib/ncurses/progs/tset.c#4 integrate .. //depot/projects/hammer/contrib/sendmail/src/sendmail.h#15 integrate .. //depot/projects/hammer/contrib/telnet/telnetd/ext.h#2 integrate .. //depot/projects/hammer/contrib/telnet/telnetd/sys_term.c#2 integrate .. //depot/projects/hammer/etc/mtree/BSD.include.dist#53 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/Makefile#4 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/gdbserver/Makefile#2 integrate .. //depot/projects/hammer/gnu/usr.bin/gdb/gdbserver/fbsd-arm-low.c#1 branch .. //depot/projects/hammer/gnu/usr.bin/gdb/gdbserver/reg-arm.c#1 branch .. //depot/projects/hammer/include/Makefile#77 integrate .. //depot/projects/hammer/include/utmp.h#2 integrate .. //depot/projects/hammer/lib/Makefile#74 integrate .. //depot/projects/hammer/lib/libarchive/test/test_acl_freebsd.c#2 integrate .. //depot/projects/hammer/lib/libc/gen/Symbol.map#12 integrate .. //depot/projects/hammer/lib/libc/gen/dlfcn.c#8 integrate .. //depot/projects/hammer/lib/libc/gen/getvfsbyname.3#6 integrate .. //depot/projects/hammer/lib/libc/i386/sys/pipe.S#4 integrate .. //depot/projects/hammer/lib/libc/i386/sys/reboot.S#4 integrate .. //depot/projects/hammer/lib/libc/i386/sys/setlogin.S#4 integrate .. //depot/projects/hammer/lib/libc/sys/pipe.2#6 integrate .. //depot/projects/hammer/lib/libpmc/libpmc.c#12 integrate .. //depot/projects/hammer/lib/libpmc/libpmcinternal.h#1 branch .. //depot/projects/hammer/lib/libpmc/pmc.3#19 integrate .. //depot/projects/hammer/lib/libpmc/pmc.atom.3#2 integrate .. //depot/projects/hammer/lib/libpmc/pmc.core.3#2 integrate .. //depot/projects/hammer/lib/libpmc/pmc.core2.3#2 integrate .. //depot/projects/hammer/lib/libpmc/pmc.iaf.3#2 integrate .. //depot/projects/hammer/lib/libpmc/pmclog.c#6 integrate .. //depot/projects/hammer/lib/libstand/nfs.c#5 integrate .. //depot/projects/hammer/lib/libstand/printf.c#8 integrate .. //depot/projects/hammer/lib/libthr/thread/thr_fork.c#6 integrate .. //depot/projects/hammer/lib/libusb20/libusb20.3#2 integrate .. //depot/projects/hammer/lib/libusb20/libusb20.c#2 integrate .. //depot/projects/hammer/lib/libusb20/libusb20.h#2 integrate .. //depot/projects/hammer/lib/libusb20/libusb20_compat01.c#2 integrate .. //depot/projects/hammer/lib/libusb20/libusb20_compat01.h#2 integrate .. //depot/projects/hammer/lib/libusb20/libusb20_desc.c#2 integrate .. //depot/projects/hammer/lib/libusb20/libusb20_desc.h#2 integrate .. //depot/projects/hammer/lib/libusb20/libusb20_ugen20.c#2 integrate .. //depot/projects/hammer/lib/libutil/Makefile#20 integrate .. //depot/projects/hammer/lib/libutil/gr_util.c#2 integrate .. //depot/projects/hammer/lib/libutil/realhostname.c#7 integrate .. //depot/projects/hammer/lib/ncurses/ncurses/Makefile#10 integrate .. //depot/projects/hammer/lib/ncurses/ncurses/ncurses_cfg.h#6 integrate .. //depot/projects/hammer/libexec/rtld-elf/Symbol.map#4 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld.c#44 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld_lock.c#7 integrate .. //depot/projects/hammer/libexec/rtld-elf/rtld_lock.h#4 integrate .. //depot/projects/hammer/libexec/telnetd/Makefile#10 integrate .. //depot/projects/hammer/release/Makefile#103 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/article.sgml#14 integrate .. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/article.sgml#38 integrate .. //depot/projects/hammer/sbin/geom/class/part/Makefile#2 integrate .. //depot/projects/hammer/sbin/geom/class/part/geom_part.c#7 integrate .. //depot/projects/hammer/sbin/geom/class/part/gpart.8#5 integrate .. //depot/projects/hammer/sbin/iscontrol/auth_subr.c#2 integrate .. //depot/projects/hammer/sbin/iscontrol/config.c#2 integrate .. //depot/projects/hammer/sbin/iscontrol/fsm.c#2 integrate .. //depot/projects/hammer/sbin/iscontrol/iscontrol.8#2 integrate .. //depot/projects/hammer/sbin/iscontrol/iscontrol.c#2 integrate .. //depot/projects/hammer/sbin/iscontrol/iscontrol.h#2 integrate .. //depot/projects/hammer/sbin/iscontrol/iscsi.conf.5#2 integrate .. //depot/projects/hammer/sbin/iscontrol/login.c#2 integrate .. //depot/projects/hammer/sbin/iscontrol/misc.c#3 integrate .. //depot/projects/hammer/sbin/iscontrol/pdu.c#2 integrate .. //depot/projects/hammer/sbin/mount_msdosfs/mount_msdosfs.c#15 integrate .. //depot/projects/hammer/sbin/newfs_msdos/newfs_msdos.c#8 integrate .. //depot/projects/hammer/share/man/man4/Makefile#112 integrate .. //depot/projects/hammer/share/man/man4/ale.4#1 branch .. //depot/projects/hammer/share/man/man4/altq.4#20 integrate .. //depot/projects/hammer/share/man/man4/man4.arm/Makefile#2 integrate .. //depot/projects/hammer/share/man/man4/man4.arm/mge.4#1 branch .. //depot/projects/hammer/share/man/man4/miibus.4#17 integrate .. //depot/projects/hammer/share/man/man4/vlan.4#22 integrate .. //depot/projects/hammer/share/man/man5/fstab.5#6 integrate .. //depot/projects/hammer/share/man/man7/hier.7#37 integrate .. //depot/projects/hammer/share/man/man9/Makefile#89 integrate .. //depot/projects/hammer/share/man/man9/VFS_SET.9#9 integrate .. //depot/projects/hammer/share/man/man9/bus_dma.9#30 integrate .. //depot/projects/hammer/share/man/man9/devfs_set_cdevpriv.9#2 integrate .. //depot/projects/hammer/share/man/man9/style.9#30 integrate .. //depot/projects/hammer/share/man/man9/vfs_mountedon.9#4 delete .. //depot/projects/hammer/share/man/man9/vn_fullpath.9#4 integrate .. //depot/projects/hammer/share/misc/bsd-family-tree#46 integrate .. //depot/projects/hammer/share/misc/committers-src.dot#17 integrate .. //depot/projects/hammer/share/mk/bsd.libnames.mk#41 integrate .. //depot/projects/hammer/sys/amd64/amd64/amd64_mem.c#12 integrate .. //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#38 integrate .. //depot/projects/hammer/sys/amd64/amd64/identcpu.c#63 integrate .. //depot/projects/hammer/sys/amd64/amd64/initcpu.c#19 integrate .. //depot/projects/hammer/sys/amd64/amd64/local_apic.c#83 integrate .. //depot/projects/hammer/sys/amd64/amd64/mp_machdep.c#135 integrate .. //depot/projects/hammer/sys/amd64/amd64/msi.c#6 integrate .. //depot/projects/hammer/sys/amd64/conf/GENERIC#115 integrate .. //depot/projects/hammer/sys/amd64/include/atomic.h#27 integrate .. //depot/projects/hammer/sys/amd64/include/cputypes.h#12 integrate .. //depot/projects/hammer/sys/amd64/include/md_var.h#42 integrate .. //depot/projects/hammer/sys/amd64/include/pmc_mdep.h#7 integrate .. //depot/projects/hammer/sys/amd64/include/specialreg.h#32 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux.h#10 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_machdep.c#25 integrate .. //depot/projects/hammer/sys/amd64/linux32/linux32_sysvec.c#25 integrate .. //depot/projects/hammer/sys/arm/arm/elf_machdep.c#10 integrate .. //depot/projects/hammer/sys/arm/at91/at91.c#11 integrate .. //depot/projects/hammer/sys/arm/at91/at91_machdep.c#1 branch .. //depot/projects/hammer/sys/arm/at91/at91_mci.c#9 integrate .. //depot/projects/hammer/sys/arm/at91/at91_mcireg.h#3 integrate .. //depot/projects/hammer/sys/arm/at91/at91_pdcreg.h#2 integrate .. //depot/projects/hammer/sys/arm/at91/at91_pio.c#6 integrate .. //depot/projects/hammer/sys/arm/at91/at91_pioreg.h#3 integrate .. //depot/projects/hammer/sys/arm/at91/at91_piovar.h#4 integrate .. //depot/projects/hammer/sys/arm/at91/at91_pmc.c#7 integrate .. //depot/projects/hammer/sys/arm/at91/at91_pmcreg.h#2 integrate .. //depot/projects/hammer/sys/arm/at91/at91_pmcvar.h#2 integrate .. //depot/projects/hammer/sys/arm/at91/at91_rtc.c#4 integrate .. //depot/projects/hammer/sys/arm/at91/at91_rtcreg.h#3 integrate .. //depot/projects/hammer/sys/arm/at91/at91_spi.c#5 integrate .. //depot/projects/hammer/sys/arm/at91/at91_spireg.h#3 integrate .. //depot/projects/hammer/sys/arm/at91/at91_ssc.c#5 integrate .. //depot/projects/hammer/sys/arm/at91/at91_sscreg.h#3 integrate .. //depot/projects/hammer/sys/arm/at91/at91_st.c#7 integrate .. //depot/projects/hammer/sys/arm/at91/at91_streg.h#2 integrate .. //depot/projects/hammer/sys/arm/at91/at91_twi.c#9 integrate .. //depot/projects/hammer/sys/arm/at91/at91_twiio.h#2 integrate .. //depot/projects/hammer/sys/arm/at91/at91_twireg.h#3 integrate .. //depot/projects/hammer/sys/arm/at91/at91_usartreg.h#3 integrate .. //depot/projects/hammer/sys/arm/at91/at91board.h#1 branch .. //depot/projects/hammer/sys/arm/at91/at91rm92reg.h#7 integrate .. //depot/projects/hammer/sys/arm/at91/at91var.h#2 integrate .. //depot/projects/hammer/sys/arm/at91/board_bwct.c#1 branch .. //depot/projects/hammer/sys/arm/at91/board_hl200.c#1 branch .. //depot/projects/hammer/sys/arm/at91/board_kb920x.c#1 branch .. //depot/projects/hammer/sys/arm/at91/board_tsc4370.c#1 branch .. //depot/projects/hammer/sys/arm/at91/files.at91#6 integrate .. //depot/projects/hammer/sys/arm/at91/files.kb920x#2 delete .. //depot/projects/hammer/sys/arm/at91/if_ate.c#15 integrate .. //depot/projects/hammer/sys/arm/at91/if_atereg.h#4 integrate .. //depot/projects/hammer/sys/arm/at91/kb920x_machdep.c#14 delete .. //depot/projects/hammer/sys/arm/at91/ohci_atmelarm.c#5 integrate .. //depot/projects/hammer/sys/arm/at91/std.at91#4 integrate .. //depot/projects/hammer/sys/arm/at91/std.bwct#1 branch .. //depot/projects/hammer/sys/arm/at91/std.hl200#1 branch .. //depot/projects/hammer/sys/arm/at91/std.kb920x#4 integrate .. //depot/projects/hammer/sys/arm/at91/std.tsc4370#1 branch .. //depot/projects/hammer/sys/arm/at91/uart_bus_at91usart.c#3 integrate .. //depot/projects/hammer/sys/arm/at91/uart_cpu_at91rm9200usart.c#6 integrate .. //depot/projects/hammer/sys/arm/at91/uart_dev_at91usart.c#12 integrate .. //depot/projects/hammer/sys/arm/conf/BWCT#6 integrate .. //depot/projects/hammer/sys/arm/conf/DB-78XXX#2 integrate .. //depot/projects/hammer/sys/arm/conf/DB-88F5XXX#2 integrate .. //depot/projects/hammer/sys/arm/conf/DB-88F6XXX#2 integrate .. //depot/projects/hammer/sys/arm/conf/HL200#6 integrate .. //depot/projects/hammer/sys/arm/include/atomic.h#21 integrate .. //depot/projects/hammer/sys/arm/mv/common.c#2 integrate .. //depot/projects/hammer/sys/arm/mv/discovery/db78xxx.c#2 integrate .. //depot/projects/hammer/sys/arm/mv/discovery/discovery.c#2 integrate .. //depot/projects/hammer/sys/arm/mv/files.mv#2 integrate .. //depot/projects/hammer/sys/arm/mv/kirkwood/db88f6xxx.c#2 integrate .. //depot/projects/hammer/sys/arm/mv/kirkwood/kirkwood.c#2 integrate .. //depot/projects/hammer/sys/arm/mv/mv_pci.c#1 branch .. //depot/projects/hammer/sys/arm/mv/mvreg.h#2 integrate .. //depot/projects/hammer/sys/arm/mv/mvvar.h#2 integrate .. //depot/projects/hammer/sys/arm/mv/obio.c#2 integrate .. //depot/projects/hammer/sys/arm/mv/orion/db88f5xxx.c#2 integrate .. //depot/projects/hammer/sys/arm/mv/orion/orion.c#2 integrate .. //depot/projects/hammer/sys/boot/Makefile#24 integrate .. //depot/projects/hammer/sys/boot/arm/uboot/Makefile#2 integrate .. //depot/projects/hammer/sys/boot/arm/uboot/conf.c#2 integrate .. //depot/projects/hammer/sys/boot/arm/uboot/version#2 integrate .. //depot/projects/hammer/sys/boot/common/bootstrap.h#10 integrate .. //depot/projects/hammer/sys/boot/common/interp.c#3 integrate .. //depot/projects/hammer/sys/boot/forth/loader.conf#44 integrate .. //depot/projects/hammer/sys/boot/i386/Makefile#8 integrate .. //depot/projects/hammer/sys/boot/i386/boot0/boot0.S#11 integrate .. //depot/projects/hammer/sys/boot/i386/gptzfsboot/Makefile#1 branch .. //depot/projects/hammer/sys/boot/i386/libi386/biosdisk.c#16 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/bootinfo32.c#10 integrate .. //depot/projects/hammer/sys/boot/i386/libi386/devicename.c#7 integrate .. //depot/projects/hammer/sys/boot/i386/loader/Makefile#17 integrate .. //depot/projects/hammer/sys/boot/i386/loader/conf.c#10 integrate .. //depot/projects/hammer/sys/boot/i386/loader/main.c#17 integrate .. //depot/projects/hammer/sys/boot/i386/zfsboot/Makefile#1 branch .. //depot/projects/hammer/sys/boot/i386/zfsboot/zfsboot.c#1 branch .. //depot/projects/hammer/sys/boot/i386/zfsboot/zfsldr.S#1 branch .. //depot/projects/hammer/sys/boot/uboot/lib/devicename.c#3 integrate .. //depot/projects/hammer/sys/boot/uboot/lib/disk.c#3 integrate .. //depot/projects/hammer/sys/boot/uboot/lib/glue.c#5 integrate .. //depot/projects/hammer/sys/boot/uboot/lib/glue.h#5 integrate .. //depot/projects/hammer/sys/boot/uboot/lib/libuboot.h#3 integrate .. //depot/projects/hammer/sys/boot/uboot/lib/net.c#5 integrate .. //depot/projects/hammer/sys/boot/zfs/Makefile#1 branch .. //depot/projects/hammer/sys/boot/zfs/zfs.c#1 branch .. //depot/projects/hammer/sys/boot/zfs/zfsimpl.c#1 branch .. //depot/projects/hammer/sys/bsm/audit_internal.h#7 integrate .. //depot/projects/hammer/sys/bsm/audit_record.h#8 integrate .. //depot/projects/hammer/sys/cddl/boot/zfs/README#1 branch .. //depot/projects/hammer/sys/cddl/boot/zfs/fletcher.c#1 branch .. //depot/projects/hammer/sys/cddl/boot/zfs/lzjb.c#1 branch .. //depot/projects/hammer/sys/cddl/boot/zfs/sha256.c#1 branch .. //depot/projects/hammer/sys/cddl/boot/zfs/zfsimpl.h#1 branch .. //depot/projects/hammer/sys/cddl/boot/zfs/zfssubr.c#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#3 integrate .. //depot/projects/hammer/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#4 integrate .. //depot/projects/hammer/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#3 integrate .. //depot/projects/hammer/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#2 integrate .. //depot/projects/hammer/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#3 integrate .. //depot/projects/hammer/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#4 integrate .. //depot/projects/hammer/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#2 integrate .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/acl.h#3 delete .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/atomic.h#4 integrate .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/callb.h#3 delete .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/cred.h#2 integrate .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/dnlc.h#2 integrate .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/file.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/kidmap.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/kmem.h#3 integrate .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/misc.h#2 integrate .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/mntent.h#3 integrate .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/param.h#2 integrate .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/pathname.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/policy.h#3 integrate .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/proc.h#2 integrate .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/refstr.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/sid.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/sig.h#1 branch .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/sunddi.h#2 integrate .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/sysmacros.h#3 integrate .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/time.h#2 integrate .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/types.h#3 integrate .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/uio.h#3 integrate .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/vfs.h#2 integrate .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/vnode.h#2 integrate .. //depot/projects/hammer/sys/cddl/compat/opensolaris/sys/zone.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/common/avl/avl.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/common/unicode/u8_textprep.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/common/zfs/zprop_common.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/Makefile.files#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#3 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#3 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#3 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#3 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deleg.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#3 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/rrwlock.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_boot.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_fuid.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#3 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/unique.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#3 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#3 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#5 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#6 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#6 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/os/callb.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/os/list.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/cred.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/extdirent.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/fm/protocol.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/fm/util.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/idmap.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#4 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/list.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/synch.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/eventdefs.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h#2 integrate .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/u8_textprep.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/u8_textprep_data.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#1 branch .. //depot/projects/hammer/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c#2 integrate .. //depot/projects/hammer/sys/cddl/dev/cyclic/cyclic.c#2 integrate .. //depot/projects/hammer/sys/cddl/dev/dtrace/i386/dtrace_subr.c#2 integrate .. //depot/projects/hammer/sys/compat/ia32/ia32_sysvec.c#23 integrate .. //depot/projects/hammer/sys/compat/linux/linux_futex.c#9 integrate .. //depot/projects/hammer/sys/compat/linux/linux_ipc.c#18 integrate .. //depot/projects/hammer/sys/compat/svr4/svr4_sysvec.c#22 integrate .. //depot/projects/hammer/sys/conf/NOTES#154 integrate .. //depot/projects/hammer/sys/conf/files#191 integrate .. //depot/projects/hammer/sys/conf/files.amd64#108 integrate .. //depot/projects/hammer/sys/conf/files.i386#99 integrate .. //depot/projects/hammer/sys/conf/files.pc98#73 integrate .. //depot/projects/hammer/sys/conf/options#135 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#11 integrate .. //depot/projects/hammer/sys/contrib/ipfilter/netinet/mlfk_ipl.c#12 integrate .. //depot/projects/hammer/sys/crypto/via/padlock.c#9 integrate .. //depot/projects/hammer/sys/dev/aac/aac_pci.c#35 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi.c#87 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_hpet.c#11 integrate .. //depot/projects/hammer/sys/dev/acpica/acpi_pcib.c#30 integrate .. //depot/projects/hammer/sys/dev/adb/adb_bus.c#3 integrate .. //depot/projects/hammer/sys/dev/ale/if_ale.c#1 branch .. //depot/projects/hammer/sys/dev/ale/if_alereg.h#1 branch .. //depot/projects/hammer/sys/dev/ale/if_alevar.h#1 branch .. //depot/projects/hammer/sys/dev/ata/ata-pci.h#58 integrate .. //depot/projects/hammer/sys/dev/ata/ata-queue.c#41 integrate .. //depot/projects/hammer/sys/dev/ata/chipsets/ata-marvell.c#2 integrate .. //depot/projects/hammer/sys/dev/ath/if_ath.c#64 integrate .. //depot/projects/hammer/sys/dev/ath/if_athvar.h#35 integrate .. //depot/projects/hammer/sys/dev/bce/if_bce.c#17 integrate .. //depot/projects/hammer/sys/dev/bce/if_bcereg.h#13 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbus.c#28 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbus_cis.c#23 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbus_device.c#2 integrate .. //depot/projects/hammer/sys/dev/cardbus/cardbusvar.h#9 integrate .. //depot/projects/hammer/sys/dev/coretemp/coretemp.c#7 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_ael1002.c#9 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_common.h#11 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_ctl_defs.h#5 integrate .. //depot/projects/hammer/sys/dev/cxgb/common/cxgb_t3_hw.c#12 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_adapter.h#22 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_config.h#9 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_main.c#28 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_multiq.c#5 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_osdep.h#15 integrate .. //depot/projects/hammer/sys/dev/cxgb/cxgb_sge.c#25 integrate .. //depot/projects/hammer/sys/dev/cxgb/sys/cxgb_support.c#8 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#3 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#13 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_tom.c#8 integrate .. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#6 integrate .. //depot/projects/hammer/sys/dev/dcons/dcons_crom.c#9 integrate .. //depot/projects/hammer/sys/dev/dcons/dcons_os.c#17 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_80003es2lan.c#2 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_82540.c#2 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_82541.c#2 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_82542.c#2 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_82543.c#2 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_82571.c#2 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_82575.c#2 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_82575.h#2 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_api.c#2 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_api.h#2 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_defines.h#2 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_hw.h#2 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_ich8lan.c#2 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_ich8lan.h#2 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_mac.c#2 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_mac.h#2 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_manage.c#2 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_nvm.c#2 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_osdep.c#2 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_osdep.h#2 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_phy.c#2 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_phy.h#2 integrate .. //depot/projects/hammer/sys/dev/e1000/e1000_regs.h#2 integrate .. //depot/projects/hammer/sys/dev/e1000/if_em.c#3 integrate .. //depot/projects/hammer/sys/dev/e1000/if_em.h#2 integrate .. //depot/projects/hammer/sys/dev/e1000/if_igb.c#4 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc.c#34 integrate .. //depot/projects/hammer/sys/dev/fdc/fdc_pccard.c#10 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxp.c#66 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxpreg.h#12 integrate .. //depot/projects/hammer/sys/dev/fxp/if_fxpvar.h#17 integrate .. //depot/projects/hammer/sys/dev/glxsb/glxsb.c#2 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_amd.c#15 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_arm.c#3 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_core.c#1 branch .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_core.h#1 branch .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_ia64.c#3 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_intel.c#5 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_logging.c#12 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_mod.c#27 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_piv.c#15 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_powerpc.c#3 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_ppro.c#11 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_sparc64.c#3 integrate .. //depot/projects/hammer/sys/dev/hwpmc/hwpmc_x86.c#11 integrate .. //depot/projects/hammer/sys/dev/hwpmc/pmc_events.h#4 integrate .. //depot/projects/hammer/sys/dev/if_ndis/if_ndis.c#66 integrate .. //depot/projects/hammer/sys/dev/ipmi/ipmi.c#7 integrate .. //depot/projects/hammer/sys/dev/iscsi/initiator/isc_cam.c#3 integrate .. //depot/projects/hammer/sys/dev/iscsi/initiator/isc_sm.c#3 integrate .. //depot/projects/hammer/sys/dev/iscsi/initiator/isc_soc.c#5 integrate .. //depot/projects/hammer/sys/dev/iscsi/initiator/isc_subr.c#2 integrate .. //depot/projects/hammer/sys/dev/iscsi/initiator/iscsi.c#4 integrate .. //depot/projects/hammer/sys/dev/iscsi/initiator/iscsi.h#2 integrate .. //depot/projects/hammer/sys/dev/iscsi/initiator/iscsi_subr.c#2 integrate .. //depot/projects/hammer/sys/dev/iscsi/initiator/iscsivar.h#2 integrate .. //depot/projects/hammer/sys/dev/ispfw/ispfw.c#11 integrate .. //depot/projects/hammer/sys/dev/ixgbe/ixgbe.c#5 integrate .. //depot/projects/hammer/sys/dev/ixgbe/ixgbe.h#6 integrate .. //depot/projects/hammer/sys/dev/ixgbe/ixgbe_82598.c#5 integrate .. //depot/projects/hammer/sys/dev/ixgbe/ixgbe_api.c#5 integrate .. //depot/projects/hammer/sys/dev/ixgbe/ixgbe_api.h#5 integrate .. //depot/projects/hammer/sys/dev/ixgbe/ixgbe_common.c#5 integrate .. //depot/projects/hammer/sys/dev/ixgbe/ixgbe_common.h#5 integrate .. //depot/projects/hammer/sys/dev/ixgbe/ixgbe_osdep.h#4 integrate .. //depot/projects/hammer/sys/dev/ixgbe/ixgbe_phy.c#5 integrate .. //depot/projects/hammer/sys/dev/ixgbe/ixgbe_phy.h#5 integrate .. //depot/projects/hammer/sys/dev/ixgbe/ixgbe_type.h#5 integrate .. //depot/projects/hammer/sys/dev/mfi/mfi.c#18 integrate .. //depot/projects/hammer/sys/dev/mfi/mfi_disk.c#6 integrate .. //depot/projects/hammer/sys/dev/mfi/mfi_ioctl.h#7 integrate .. //depot/projects/hammer/sys/dev/mfi/mfi_pci.c#8 integrate .. //depot/projects/hammer/sys/dev/mfi/mfireg.h#8 integrate .. //depot/projects/hammer/sys/dev/mfi/mfivar.h#7 integrate .. //depot/projects/hammer/sys/dev/mii/truephy.c#2 integrate .. //depot/projects/hammer/sys/dev/mmc/mmcsd.c#8 integrate .. //depot/projects/hammer/sys/dev/msk/if_msk.c#14 integrate .. //depot/projects/hammer/sys/dev/mxge/if_mxge.c#17 integrate .. //depot/projects/hammer/sys/dev/mxge/if_mxge_var.h#11 integrate .. //depot/projects/hammer/sys/dev/nmdm/nmdm.c#27 integrate .. //depot/projects/hammer/sys/dev/nxge/xge-osdep.h#3 integrate .. //depot/projects/hammer/sys/dev/patm/if_patm_intr.c#8 integrate .. //depot/projects/hammer/sys/dev/pci/pci.c#69 integrate .. //depot/projects/hammer/sys/dev/ppbus/if_plip.c#20 integrate .. //depot/projects/hammer/sys/dev/ppbus/immio.c#5 integrate .. //depot/projects/hammer/sys/dev/ppbus/lpbb.c#7 integrate .. //depot/projects/hammer/sys/dev/ppbus/lpt.c#18 integrate .. //depot/projects/hammer/sys/dev/ppbus/lpt.h#2 integrate .. //depot/projects/hammer/sys/dev/ppbus/pcfclock.c#13 integrate .. //depot/projects/hammer/sys/dev/ppbus/ppb_1284.c#3 integrate .. //depot/projects/hammer/sys/dev/ppbus/ppb_base.c#4 integrate .. //depot/projects/hammer/sys/dev/ppbus/ppb_msq.c#4 integrate .. //depot/projects/hammer/sys/dev/ppbus/ppbconf.c#9 integrate .. //depot/projects/hammer/sys/dev/ppbus/ppbconf.h#6 integrate .. //depot/projects/hammer/sys/dev/ppbus/ppi.c#15 integrate .. //depot/projects/hammer/sys/dev/ppbus/ppi.h#2 integrate .. //depot/projects/hammer/sys/dev/ppbus/pps.c#17 integrate .. //depot/projects/hammer/sys/dev/ppbus/vpo.c#12 integrate .. //depot/projects/hammer/sys/dev/ppbus/vpoio.c#6 integrate .. //depot/projects/hammer/sys/dev/ppbus/vpoio.h#3 integrate .. //depot/projects/hammer/sys/dev/ppc/ppc.c#16 integrate .. //depot/projects/hammer/sys/dev/ppc/ppc_acpi.c#4 integrate .. //depot/projects/hammer/sys/dev/random/randomdev.c#23 integrate .. //depot/projects/hammer/sys/dev/random/randomdev_soft.c#17 integrate .. //depot/projects/hammer/sys/dev/sio/sio_pci.c#13 integrate .. //depot/projects/hammer/sys/dev/sio/sio_puc.c#10 integrate .. //depot/projects/hammer/sys/dev/sound/pci/hda/hdac.c#24 integrate .. //depot/projects/hammer/sys/dev/sound/pci/hda/hdac_private.h#8 integrate .. //depot/projects/hammer/sys/dev/syscons/syscons.c#49 integrate .. //depot/projects/hammer/sys/dev/uart/uart_dev_quicc.c#2 integrate .. //depot/projects/hammer/sys/dev/usb/if_aue.c#37 integrate .. //depot/projects/hammer/sys/dev/usb/if_zyd.c#17 integrate .. //depot/projects/hammer/sys/dev/usb/if_zydreg.h#6 integrate .. //depot/projects/hammer/sys/dev/usb/rio500_usb.h#4 integrate .. //depot/projects/hammer/sys/dev/usb/u3g.c#3 integrate .. //depot/projects/hammer/sys/dev/usb/ugen.c#33 integrate .. //depot/projects/hammer/sys/dev/usb/usb.h#11 integrate .. //depot/projects/hammer/sys/dev/usb/usb_quirks.c#26 integrate .. //depot/projects/hammer/sys/dev/usb/usb_subr.c#34 integrate .. //depot/projects/hammer/sys/dev/usb/usbdevs#113 integrate .. //depot/projects/hammer/sys/dev/usb/usbdi.c#21 integrate .. //depot/projects/hammer/sys/dev/usb/usbdi.h#16 integrate .. //depot/projects/hammer/sys/dev/usb2/bluetooth/ng_ubt2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/ehci2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/ehci2.h#2 integrate .. //depot/projects/hammer/sys/dev/usb2/controller/uss820dci_pccard.c#2 delete .. //depot/projects/hammer/sys/dev/usb2/core/usb2_busdma.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_core.h#2 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_dev.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_dev.h#2 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_device.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_generic.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_generic.h#2 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_hub.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_msctest.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_msctest.h#2 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_request.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usb2_util.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/core/usbdevs#2 delete .. //depot/projects/hammer/sys/dev/usb2/ethernet/if_aue2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/image/uscanner2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/include/Makefile#2 integrate .. //depot/projects/hammer/sys/dev/usb2/include/urio2_ioctl.h#2 delete .. //depot/projects/hammer/sys/dev/usb2/include/usb2_devid.h#2 integrate .. //depot/projects/hammer/sys/dev/usb2/include/usb2_devtable.h#2 integrate .. //depot/projects/hammer/sys/dev/usb2/include/usb2_ioctl.h#2 integrate .. //depot/projects/hammer/sys/dev/usb2/include/usb2_standard.h#2 integrate .. //depot/projects/hammer/sys/dev/usb2/quirk/usb2_quirk.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/serial/u3g2.c#1 branch .. //depot/projects/hammer/sys/dev/usb2/serial/ubsa2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/serial/ugensa2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/sound/uaudio2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/storage/umass2.c#2 integrate .. //depot/projects/hammer/sys/dev/usb2/storage/urio2.c#2 integrate .. //depot/projects/hammer/sys/dev/vge/if_vge.c#20 integrate .. //depot/projects/hammer/sys/dev/vr/if_vr.c#3 integrate .. //depot/projects/hammer/sys/fs/cd9660/cd9660_bmap.c#3 integrate .. //depot/projects/hammer/sys/fs/cd9660/cd9660_node.c#4 integrate .. //depot/projects/hammer/sys/fs/cd9660/cd9660_node.h#3 integrate .. //depot/projects/hammer/sys/fs/cd9660/cd9660_rrip.c#6 integrate .. //depot/projects/hammer/sys/fs/cd9660/cd9660_vfsops.c#9 integrate .. //depot/projects/hammer/sys/fs/cd9660/cd9660_vnops.c#7 integrate .. //depot/projects/hammer/sys/fs/nullfs/null_vnops.c#35 integrate .. //depot/projects/hammer/sys/fs/unionfs/union.h#13 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_subr.c#34 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vfsops.c#29 integrate .. //depot/projects/hammer/sys/fs/unionfs/union_vnops.c#40 integrate .. //depot/projects/hammer/sys/geom/geom_ccd.c#11 integrate .. //depot/projects/hammer/sys/geom/part/g_part_bsd.c#9 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum.c#18 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_list.c#4 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_move.c#3 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_rename.c#3 integrate .. //depot/projects/hammer/sys/geom/vinum/geom_vinum_rm.c#13 integrate .. //depot/projects/hammer/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h#4 integrate .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_dfrag.c#3 integrate .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_inode.c#4 integrate .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_inode.h#3 integrate .. //depot/projects/hammer/sys/gnu/fs/xfs/xfs_vnodeops.c#4 integrate .. //depot/projects/hammer/sys/i386/conf/GENERIC#74 integrate .. //depot/projects/hammer/sys/i386/conf/XEN#4 integrate .. //depot/projects/hammer/sys/i386/cpufreq/est.c#14 integrate .. //depot/projects/hammer/sys/i386/cpufreq/p4tcc.c#6 integrate .. //depot/projects/hammer/sys/i386/cpufreq/powernow.c#7 integrate .. //depot/projects/hammer/sys/i386/i386/elf_machdep.c#17 integrate .. //depot/projects/hammer/sys/i386/i386/i686_mem.c#11 integrate .. //depot/projects/hammer/sys/i386/i386/identcpu.c#47 integrate .. //depot/projects/hammer/sys/i386/i386/initcpu.c#21 integrate .. //depot/projects/hammer/sys/i386/i386/intr_machdep.c#29 integrate .. //depot/projects/hammer/sys/i386/i386/k6_mem.c#6 integrate .. //depot/projects/hammer/sys/i386/i386/local_apic.c#40 integrate .. //depot/projects/hammer/sys/i386/i386/longrun.c#4 integrate .. //depot/projects/hammer/sys/i386/i386/mp_machdep.c#78 integrate .. //depot/projects/hammer/sys/i386/i386/msi.c#6 integrate .. //depot/projects/hammer/sys/i386/ibcs2/ibcs2_sysvec.c#11 integrate .. //depot/projects/hammer/sys/i386/include/atomic.h#15 integrate .. //depot/projects/hammer/sys/i386/include/cputypes.h#5 integrate .. //depot/projects/hammer/sys/i386/include/md_var.h#22 integrate .. //depot/projects/hammer/sys/i386/include/pmc_mdep.h#8 integrate .. //depot/projects/hammer/sys/i386/include/specialreg.h#21 integrate .. //depot/projects/hammer/sys/i386/include/xen/xen-os.h#3 integrate .. //depot/projects/hammer/sys/i386/linux/linux.h#13 integrate .. //depot/projects/hammer/sys/i386/linux/linux_machdep.c#30 integrate .. //depot/projects/hammer/sys/i386/linux/linux_sysvec.c#36 integrate .. //depot/projects/hammer/sys/ia64/ia64/elf_machdep.c#24 integrate .. //depot/projects/hammer/sys/ia64/include/atomic.h#9 integrate .. //depot/projects/hammer/sys/isa/isa_common.c#20 integrate .. //depot/projects/hammer/sys/isa/isa_common.h#7 integrate .. //depot/projects/hammer/sys/isa/isahint.c#7 integrate .. //depot/projects/hammer/sys/isa/isavar.h#10 integrate .. //depot/projects/hammer/sys/kern/bus_if.m#12 integrate .. //depot/projects/hammer/sys/kern/imgact_aout.c#21 integrate .. //depot/projects/hammer/sys/kern/kern_conf.c#55 integrate .. //depot/projects/hammer/sys/kern/kern_jail.c#35 integrate .. //depot/projects/hammer/sys/kern/kern_lockf.c#23 integrate .. //depot/projects/hammer/sys/kern/kern_osd.c#1 branch .. //depot/projects/hammer/sys/kern/kern_poll.c#22 integrate .. //depot/projects/hammer/sys/kern/kern_proc.c#77 integrate .. //depot/projects/hammer/sys/kern/kern_shutdown.c#57 integrate .. //depot/projects/hammer/sys/kern/kern_sysctl.c#35 integrate .. //depot/projects/hammer/sys/kern/kern_thr.c#45 integrate .. //depot/projects/hammer/sys/kern/kern_thread.c#112 integrate .. //depot/projects/hammer/sys/kern/sched_ule.c#100 integrate .. //depot/projects/hammer/sys/kern/subr_bufring.c#1 branch .. //depot/projects/hammer/sys/kern/subr_bus.c#64 integrate .. //depot/projects/hammer/sys/kern/subr_firmware.c#8 integrate .. //depot/projects/hammer/sys/kern/subr_prf.c#29 integrate .. //depot/projects/hammer/sys/kern/sys_pipe.c#41 integrate .. //depot/projects/hammer/sys/kern/tty_ttydisc.c#4 integrate .. //depot/projects/hammer/sys/kern/uipc_mqueue.c#20 integrate .. //depot/projects/hammer/sys/kern/uipc_socket.c#88 integrate .. //depot/projects/hammer/sys/kern/vfs_cache.c#34 integrate .. //depot/projects/hammer/sys/kern/vfs_export.c#22 integrate .. //depot/projects/hammer/sys/kern/vfs_lookup.c#40 integrate .. //depot/projects/hammer/sys/kern/vfs_subr.c#137 integrate .. //depot/projects/hammer/sys/kern/vfs_vnops.c#61 integrate .. //depot/projects/hammer/sys/kgssapi/gsstest.c#2 integrate .. //depot/projects/hammer/sys/mips/mips/elf_machdep.c#3 integrate .. //depot/projects/hammer/sys/modules/Makefile#135 integrate .. //depot/projects/hammer/sys/modules/ale/Makefile#1 branch .. //depot/projects/hammer/sys/modules/cxgb/cxgb/Makefile#10 integrate .. //depot/projects/hammer/sys/modules/cxgb/iw_cxgb/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/cxgb/toecore/Makefile#3 integrate .. //depot/projects/hammer/sys/modules/em/Makefile#11 integrate .. //depot/projects/hammer/sys/modules/hwpmc/Makefile#6 integrate .. //depot/projects/hammer/sys/modules/igb/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/nfsserver/Makefile#5 integrate .. //depot/projects/hammer/sys/modules/uart/Makefile#12 integrate .. //depot/projects/hammer/sys/modules/usb2/Makefile#2 integrate .. //depot/projects/hammer/sys/modules/zfs/Makefile#11 integrate .. //depot/projects/hammer/sys/net/bpf.c#66 integrate .. //depot/projects/hammer/sys/net/if.c#82 integrate .. //depot/projects/hammer/sys/net/if_ethersubr.c#76 integrate .. //depot/projects/hammer/sys/net/if_fddisubr.c#26 integrate .. //depot/projects/hammer/sys/net/if_fwsubr.c#23 integrate .. //depot/projects/hammer/sys/net/if_gif.c#34 integrate .. //depot/projects/hammer/sys/net/if_lagg.c#18 integrate .. //depot/projects/hammer/sys/net/if_loop.c#39 integrate .. //depot/projects/hammer/sys/net/if_tun.c#37 integrate .. //depot/projects/hammer/sys/net/if_var.h#51 integrate .. //depot/projects/hammer/sys/net/if_vlan.c#46 integrate .. //depot/projects/hammer/sys/net/radix_mpath.c#6 integrate .. //depot/projects/hammer/sys/net/raw_cb.c#17 integrate .. //depot/projects/hammer/sys/net/route.c#40 integrate .. //depot/projects/hammer/sys/net/vnet.h#2 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_hostap.c#6 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_output.c#40 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_var.h#38 integrate .. //depot/projects/hammer/sys/net80211/ieee80211_wds.c#5 integrate .. //depot/projects/hammer/sys/netgraph/netgraph.h#38 integrate .. //depot/projects/hammer/sys/netgraph/ng_base.c#65 integrate .. //depot/projects/hammer/sys/netgraph/ng_eiface.c#29 integrate .. //depot/projects/hammer/sys/netgraph/ng_iface.c#28 integrate .. //depot/projects/hammer/sys/netgraph/ng_l2tp.c#18 integrate .. //depot/projects/hammer/sys/netgraph/ng_socket.c#30 integrate .. //depot/projects/hammer/sys/netinet/if_ether.c#51 integrate .. //depot/projects/hammer/sys/netinet/igmp.c#18 integrate .. //depot/projects/hammer/sys/netinet/in.c#33 integrate .. //depot/projects/hammer/sys/netinet/in_gif.c#23 integrate .. //depot/projects/hammer/sys/netinet/in_mcast.c#8 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.c#63 integrate .. //depot/projects/hammer/sys/netinet/in_pcb.h#45 integrate .. //depot/projects/hammer/sys/netinet/in_proto.c#26 integrate .. //depot/projects/hammer/sys/netinet/in_rmx.c#20 integrate .. //depot/projects/hammer/sys/netinet/in_var.h#18 integrate .. //depot/projects/hammer/sys/netinet/ip_divert.c#46 integrate .. //depot/projects/hammer/sys/netinet/ip_fastfwd.c#36 integrate .. //depot/projects/hammer/sys/netinet/ip_fw_pfil.c#21 integrate .. //depot/projects/hammer/sys/netinet/ip_icmp.c#43 integrate .. //depot/projects/hammer/sys/netinet/ip_icmp.h#9 integrate .. //depot/projects/hammer/sys/netinet/ip_id.c#10 integrate .. //depot/projects/hammer/sys/netinet/ip_input.c#77 integrate .. //depot/projects/hammer/sys/netinet/ip_output.c#73 integrate .. //depot/projects/hammer/sys/netinet/ip_var.h#32 integrate .. //depot/projects/hammer/sys/netinet/raw_ip.c#58 integrate .. //depot/projects/hammer/sys/netinet/sctp_constants.h#20 integrate .. //depot/projects/hammer/sys/netinet/sctp_indata.c#24 integrate .. //depot/projects/hammer/sys/netinet/sctp_input.c#22 integrate .. //depot/projects/hammer/sys/netinet/sctp_pcb.c#25 integrate .. //depot/projects/hammer/sys/netinet/sctp_pcb.h#18 integrate .. //depot/projects/hammer/sys/netinet/sctputil.c#31 integrate .. //depot/projects/hammer/sys/netinet/tcp_hostcache.c#17 integrate .. //depot/projects/hammer/sys/netinet/tcp_hostcache.h#1 branch .. //depot/projects/hammer/sys/netinet/tcp_input.c#91 integrate .. //depot/projects/hammer/sys/netinet/tcp_output.c#55 integrate .. //depot/projects/hammer/sys/netinet/tcp_reass.c#6 integrate .. //depot/projects/hammer/sys/netinet/tcp_sack.c#32 integrate .. //depot/projects/hammer/sys/netinet/tcp_subr.c#88 integrate .. //depot/projects/hammer/sys/netinet/tcp_syncache.c#66 integrate .. //depot/projects/hammer/sys/netinet/tcp_timewait.c#7 integrate .. //depot/projects/hammer/sys/netinet/tcp_usrreq.c#60 integrate .. //depot/projects/hammer/sys/netinet/tcp_var.h#57 integrate .. //depot/projects/hammer/sys/netinet/udp_usrreq.c#61 integrate .. //depot/projects/hammer/sys/netinet/vinet.h#2 integrate .. //depot/projects/hammer/sys/netinet6/frag6.c#17 integrate .. //depot/projects/hammer/sys/netinet6/icmp6.c#39 integrate .. //depot/projects/hammer/sys/netinet6/in6_ifattach.c#27 integrate .. //depot/projects/hammer/sys/netinet6/in6_pcb.c#41 integrate .. //depot/projects/hammer/sys/netinet6/in6_pcb.h#14 integrate .. //depot/projects/hammer/sys/netinet6/in6_proto.c#25 integrate .. //depot/projects/hammer/sys/netinet6/in6_rmx.c#18 integrate .. //depot/projects/hammer/sys/netinet6/in6_src.c#32 integrate .. //depot/projects/hammer/sys/netinet6/ip6_forward.c#24 integrate .. //depot/projects/hammer/sys/netinet6/ip6_input.c#39 integrate .. //depot/projects/hammer/sys/netinet6/ip6_mroute.c#26 integrate .. //depot/projects/hammer/sys/netinet6/mld6.c#26 integrate .. //depot/projects/hammer/sys/netinet6/nd6.c#39 integrate .. //depot/projects/hammer/sys/netinet6/nd6_nbr.c#29 integrate .. //depot/projects/hammer/sys/netinet6/nd6_rtr.c#22 integrate .. //depot/projects/hammer/sys/netinet6/raw_ip6.c#41 integrate .. //depot/projects/hammer/sys/netinet6/scope6.c#13 integrate .. //depot/projects/hammer/sys/netinet6/udp6_usrreq.c#43 integrate .. //depot/projects/hammer/sys/netinet6/vinet6.h#2 integrate .. //depot/projects/hammer/sys/netipsec/ipsec.c#26 integrate .. //depot/projects/hammer/sys/netipsec/ipsec.h#18 integrate .. //depot/projects/hammer/sys/netipsec/ipsec6.h#6 integrate .. //depot/projects/hammer/sys/netipsec/key.c#25 integrate .. //depot/projects/hammer/sys/netipsec/keysock.c#20 integrate .. //depot/projects/hammer/sys/netipsec/keysock.h#4 integrate .. //depot/projects/hammer/sys/netipsec/vipsec.h#2 integrate .. //depot/projects/hammer/sys/netipsec/xform_ah.c#17 integrate .. //depot/projects/hammer/sys/netipsec/xform_esp.c#18 integrate .. //depot/projects/hammer/sys/netipsec/xform_ipcomp.c#14 integrate .. //depot/projects/hammer/sys/netipsec/xform_ipip.c#17 integrate .. //depot/projects/hammer/sys/nfsclient/nfs.h#25 integrate .. //depot/projects/hammer/sys/nfsserver/nfs.h#17 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Nov 29 03:21:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id BF1651065673; Sat, 29 Nov 2008 03:21:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7994D106564A for ; Sat, 29 Nov 2008 03:21:05 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6111C8FC1F for ; Sat, 29 Nov 2008 03:21:05 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAT3L5aA044700 for ; Sat, 29 Nov 2008 03:21:05 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAT3L5G7044698 for perforce@freebsd.org; Sat, 29 Nov 2008 03:21:05 GMT (envelope-from peter-gmail@wemm.org) Date: Sat, 29 Nov 2008 03:21:05 GMT Message-Id: <200811290321.mAT3L5G7044698@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 153734 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, 29 Nov 2008 03:21:06 -0000 http://perforce.freebsd.org/chv.cgi?CH=153734 Change 153734 by peter@peter_overcee on 2008/11/29 03:20:07 Get rid of getosreldate() hackery. Affected files ... .. //depot/projects/hammer/include/Makefile#78 edit Differences ... ==== //depot/projects/hammer/include/Makefile#78 (text+ko) ==== @@ -107,16 +107,7 @@ echo "#else" >> osreldate.h; \ echo "#undef __FreeBSD_version" >> osreldate.h; \ echo "#define __FreeBSD_version $$RELDATE" >> osreldate.h; \ - echo "#ifdef __STDC__" >> osreldate.h; \ - echo "#ifndef _OSRELDATE_H" >> osreldate.h; \ - echo "#define _OSRELDATE_H" >> osreldate.h; \ - echo "#include " >> osreldate.h; \ - echo "__BEGIN_DECLS" >> osreldate.h; \ - echo "extern int getosreldate(void);" >> osreldate.h; \ - echo "__END_DECLS" >> osreldate.h; \ - echo "#endif /* _OSRELDATE_H */" >> osreldate.h; \ - echo "#endif /* __STDC__ */" >> osreldate.h; \ - echo "#endif /* _KERNEL */" >> osreldate.h + echo "#endif" >> osreldate.h .for i in ${LHDRS} INCSLINKS+= sys/$i ${INCLUDEDIR}/$i From owner-p4-projects@FreeBSD.ORG Sat Nov 29 03:28:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id F309D1065672; Sat, 29 Nov 2008 03:28:12 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B794F1065670 for ; Sat, 29 Nov 2008 03:28:12 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9EE808FC0A for ; Sat, 29 Nov 2008 03:28:12 +0000 (UTC) (envelope-from peter-gmail@wemm.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAT3SCde045269 for ; Sat, 29 Nov 2008 03:28:12 GMT (envelope-from peter-gmail@wemm.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAT3SCh6045267 for perforce@freebsd.org; Sat, 29 Nov 2008 03:28:12 GMT (envelope-from peter-gmail@wemm.org) Date: Sat, 29 Nov 2008 03:28:12 GMT Message-Id: <200811290328.mAT3SCh6045267@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to peter-gmail@wemm.org using -f From: Peter Wemm To: Perforce Change Reviews Cc: Subject: PERFORCE change 153736 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, 29 Nov 2008 03:28:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=153736 Change 153736 by peter@peter_overcee on 2008/11/29 03:27:40 GRRRR! Affected files ... .. //depot/projects/hammer/sys/sys/module.h#6 edit Differences ... ==== //depot/projects/hammer/sys/sys/module.h#6 (text+ko) ==== @@ -126,7 +126,7 @@ #define MODULE_KERNEL_MAXVER (roundup(__FreeBSD_version, 100000) - 1) #define DECLARE_MODULE(name, data, sub, order) \ - MODULE_DEPEND(name, kernel, __FreeBSD_version, \ + MODULE_DEPEND(name, kernel, 1, \ __FreeBSD_version, MODULE_KERNEL_MAXVER); \ MODULE_METADATA(_md_##name, MDT_MODULE, &data, #name); \ SYSINIT(name##module, sub, order, module_register_init, &data); \ From owner-p4-projects@FreeBSD.ORG Sat Nov 29 07:05:56 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED63A1065676; Sat, 29 Nov 2008 07:05:55 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B11461065672 for ; Sat, 29 Nov 2008 07:05:55 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 942FB8FC12 for ; Sat, 29 Nov 2008 07:05:55 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAT75tgt079265 for ; Sat, 29 Nov 2008 07:05:55 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAT75tSd079263 for perforce@freebsd.org; Sat, 29 Nov 2008 07:05:55 GMT (envelope-from sam@freebsd.org) Date: Sat, 29 Nov 2008 07:05:55 GMT Message-Id: <200811290705.mAT75tSd079263@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 153743 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, 29 Nov 2008 07:05:56 -0000 http://perforce.freebsd.org/chv.cgi?CH=153743 Change 153743 by sam@sam_ebb on 2008/11/29 07:05:15 o fixup hal path o add include for ether_sprintf somehow now required o remove ath_hal module dependency Affected files ... .. //depot/projects/vap/sys/dev/ath/ath_rate/sample/sample.c#25 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/ath_rate/sample/sample.c#25 (text+ko) ==== @@ -62,6 +62,7 @@ #include #include #include +#include /* XXX for ether_sprintf */ #include @@ -74,7 +75,7 @@ #include #include -#include +#include /* * This file is an implementation of the SampleRate algorithm @@ -1014,5 +1015,4 @@ }; DECLARE_MODULE(ath_rate, sample_mod, SI_SUB_DRIVERS, SI_ORDER_FIRST); MODULE_VERSION(ath_rate, 1); -MODULE_DEPEND(ath_rate, ath_hal, 1, 1, 1); /* Atheros HAL */ MODULE_DEPEND(ath_rate, wlan, 1, 1, 1); From owner-p4-projects@FreeBSD.ORG Sat Nov 29 07:06:57 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id DB3801065678; Sat, 29 Nov 2008 07:06:56 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9FC571065673 for ; Sat, 29 Nov 2008 07:06:56 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 862EA8FC17 for ; Sat, 29 Nov 2008 07:06:56 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAT76u9d079346 for ; Sat, 29 Nov 2008 07:06:56 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAT76uxa079344 for perforce@freebsd.org; Sat, 29 Nov 2008 07:06:56 GMT (envelope-from sam@freebsd.org) Date: Sat, 29 Nov 2008 07:06:56 GMT Message-Id: <200811290706.mAT76uxa079344@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 153744 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, 29 Nov 2008 07:06:57 -0000 http://perforce.freebsd.org/chv.cgi?CH=153744 Change 153744 by sam@sam_ebb on 2008/11/29 07:06:45 don't need module dependency any more Affected files ... .. //depot/projects/vap/sys/dev/ath/if_ath_pci.c#9 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/if_ath_pci.c#9 (text+ko) ==== @@ -253,6 +253,5 @@ DRIVER_MODULE(if_ath, pci, ath_pci_driver, ath_devclass, 0, 0); DRIVER_MODULE(if_ath, cardbus, ath_pci_driver, ath_devclass, 0, 0); MODULE_VERSION(if_ath, 1); -MODULE_DEPEND(if_ath, ath_hal, 1, 1, 1); /* Atheros HAL */ MODULE_DEPEND(if_ath, wlan, 1, 1, 1); /* 802.11 media layer */ MODULE_DEPEND(if_ath, ath_rate, 1, 1, 1); /* rate control algorithm */ From owner-p4-projects@FreeBSD.ORG Sat Nov 29 07:12:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4F8D01065675; Sat, 29 Nov 2008 07:12:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 13ADC106564A for ; Sat, 29 Nov 2008 07:12:02 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D4C978FC08 for ; Sat, 29 Nov 2008 07:12:01 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAT7C1Dl079733 for ; Sat, 29 Nov 2008 07:12:01 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAT7C1OX079731 for perforce@freebsd.org; Sat, 29 Nov 2008 07:12:01 GMT (envelope-from sam@freebsd.org) Date: Sat, 29 Nov 2008 07:12:01 GMT Message-Id: <200811290712.mAT7C1OX079731@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 153745 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, 29 Nov 2008 07:12:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=153745 Change 153745 by sam@sam_ebb on 2008/11/29 07:11:23 find hal in the new place Affected files ... .. //depot/projects/vap/tools/tools/ath/athstats/Makefile#6 edit Differences ... ==== //depot/projects/vap/tools/tools/ath/athstats/Makefile#6 (text+ko) ==== @@ -15,9 +15,9 @@ CFLAGS+=-DATH_SUPPORT_ANI CFLAGS+=-I${.CURDIR} -CFLAGS+=-I${SRCDIR}/sys/contrib/dev/ath CFLAGS+=-I${SRCDIR}/sys/net80211 CFLAGS+=-I${SRCDIR}/sys/dev/ath +CFLAGS+=-I${SRCDIR}/sys/dev/ath/ath_hal athstats.o: opt_ah.h ah_osdep.h From owner-p4-projects@FreeBSD.ORG Sat Nov 29 07:20:11 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C5F6D1065677; Sat, 29 Nov 2008 07:20:10 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8A9ED1065673 for ; Sat, 29 Nov 2008 07:20:10 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 70D448FC14 for ; Sat, 29 Nov 2008 07:20:10 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAT7KAcB080322 for ; Sat, 29 Nov 2008 07:20:10 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAT7KAZj080320 for perforce@freebsd.org; Sat, 29 Nov 2008 07:20:10 GMT (envelope-from sam@freebsd.org) Date: Sat, 29 Nov 2008 07:20:10 GMT Message-Id: <200811290720.mAT7KAZj080320@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 153746 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, 29 Nov 2008 07:20:11 -0000 http://perforce.freebsd.org/chv.cgi?CH=153746 Change 153746 by sam@sam_ebb on 2008/11/29 07:19:17 more hal pathnames Affected files ... .. //depot/projects/vap/sys/dev/ath/ath_rate/amrr/amrr.c#13 edit .. //depot/projects/vap/sys/dev/ath/ath_rate/onoe/onoe.c#16 edit Differences ... ==== //depot/projects/vap/sys/dev/ath/ath_rate/amrr/amrr.c#13 (text+ko) ==== @@ -78,7 +78,7 @@ #include #include -#include +#include static int ath_rateinterval = 1000; /* rate ctl interval (ms) */ static int ath_rate_max_success_threshold = 10; ==== //depot/projects/vap/sys/dev/ath/ath_rate/onoe/onoe.c#16 (text+ko) ==== @@ -67,7 +67,7 @@ #include #include -#include +#include /* * Default parameters for the rate control algorithm. These are From owner-p4-projects@FreeBSD.ORG Sat Nov 29 07:29:20 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id ED05C1065679; Sat, 29 Nov 2008 07:29:19 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B17D6106564A for ; Sat, 29 Nov 2008 07:29:19 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 97E028FC0C for ; Sat, 29 Nov 2008 07:29:19 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAT7TJnw080979 for ; Sat, 29 Nov 2008 07:29:19 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAT7TJWT080977 for perforce@freebsd.org; Sat, 29 Nov 2008 07:29:19 GMT (envelope-from sam@freebsd.org) Date: Sat, 29 Nov 2008 07:29:19 GMT Message-Id: <200811290729.mAT7TJWT080977@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 153747 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, 29 Nov 2008 07:29:20 -0000 http://perforce.freebsd.org/chv.cgi?CH=153747 Change 153747 by sam@sam_ebb on 2008/11/29 07:29:13 sym doesn't work on arm; make it arch-dependent Affected files ... .. //depot/projects/vap/sys/modules/Makefile#45 edit Differences ... ==== //depot/projects/vap/sys/modules/Makefile#45 (text+ko) ==== @@ -265,7 +265,7 @@ ${_stg} \ stge \ ${_streams} \ - sym \ + ${_sym} \ ${_syscons} \ sysvipc \ ti \ @@ -446,6 +446,7 @@ _sr= sr _stg= stg _streams= streams +_sym= sym _tmpfs= tmpfs _upgt= upgt _wi= wi @@ -571,6 +572,7 @@ _sound= sound _speaker= speaker _sppp= sppp +_sym= sym _tmpfs= tmpfs _twa= twa _upgt= upgt @@ -615,6 +617,7 @@ _sppp= sppp #_sr= sr not 64bit clean _streams= streams +_sym= sym _wi= wi _xe= xe .endif @@ -624,6 +627,7 @@ _bm= bm _nvram= powermac_nvram _smbfs= smbfs +_sym= sym _upgt= upgt .endif @@ -633,6 +637,7 @@ _i2c= i2c _igb= igb _sound= sound +_sym= sym _upgt= upgt .if ${MK_ZFS} != "no" || defined(ALL_MODULES) _zfs= zfs From owner-p4-projects@FreeBSD.ORG Sat Nov 29 07:30:21 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 23A801065673; Sat, 29 Nov 2008 07:30:21 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DBEAD1065670 for ; Sat, 29 Nov 2008 07:30:20 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id C0C5C8FC08 for ; Sat, 29 Nov 2008 07:30:20 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAT7UKWF081088 for ; Sat, 29 Nov 2008 07:30:20 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAT7UKuu081086 for perforce@freebsd.org; Sat, 29 Nov 2008 07:30:20 GMT (envelope-from sam@freebsd.org) Date: Sat, 29 Nov 2008 07:30:20 GMT Message-Id: <200811290730.mAT7UKuu081086@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 153748 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, 29 Nov 2008 07:30:21 -0000 http://perforce.freebsd.org/chv.cgi?CH=153748 Change 153748 by sam@sam_ebb on 2008/11/29 07:29:48 fixup for hal source; also fix some copyrights while were're at it Affected files ... .. //depot/projects/vap/sys/modules/ath/Makefile#5 edit .. //depot/projects/vap/sys/modules/ath_rate_amrr/Makefile#9 edit .. //depot/projects/vap/sys/modules/ath_rate_onoe/Makefile#9 edit .. //depot/projects/vap/sys/modules/ath_rate_sample/Makefile#10 edit Differences ... ==== //depot/projects/vap/sys/modules/ath/Makefile#5 (text+ko) ==== @@ -1,5 +1,5 @@ # -# Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting +# Copyright (c) 2002-2008 Sam Leffler, Errno Consulting # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -12,13 +12,6 @@ # similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any # redistribution must be conditioned upon including a substantially # similar Disclaimer requirement for further binary redistribution. -# 3. Neither the names of the above-listed copyright holders nor the names -# of any contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# Alternatively, this software may be distributed under the terms of the -# GNU General Public License ("GPL") version 2 as published by the Free -# Software Foundation. # # NO WARRANTY # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS @@ -36,30 +29,50 @@ # $FreeBSD: src/sys/modules/ath/Makefile,v 1.5 2007/01/28 04:38:35 sam Exp $ # -.PATH: ${.CURDIR}/../../dev/ath +.PATH: ${.CURDIR}/../../dev/ath \ + ${.CURDIR}/../../dev/ath/ath_hal \ + ${.CURDIR}/../../dev/ath/ath_hal/ar5210 \ + ${.CURDIR}/../../dev/ath/ath_hal/ar5211 \ + ${.CURDIR}/../../dev/ath/ath_hal/ar5212 \ + ${.CURDIR}/../../dev/ath/ath_hal/ar5416 + +AR5210_SRCS=ah_eeprom_v1.c \ + ar5210_attach.c ar5210_beacon.c ar5210_interrupts.c \ + ar5210_keycache.c ar5210_misc.c ar5210_phy.c ar5210_power.c \ + ar5210_recv.c ar5210_reset.c ar5210_xmit.c +AR5211_SRCS=ar5211_attach.c ar5211_beacon.c ar5211_interrupts.c \ + ar5211_keycache.c ar5211_misc.c ar5211_phy.c ar5211_power.c \ + ar5211_recv.c ar5211_reset.c ar5211_xmit.c +AR5212_SRCS=ar5212_ani.c ar5212_attach.c ar5212_beacon.c ar5212_eeprom.c \ + ar5212_gpio.c ar5212_interrupts.c ar5212_keycache.c ar5212_misc.c \ + ar5212_phy.c ar5212_power.c ar5212_recv.c ar5212_reset.c \ + ar5212_rfgain.c ar5212_xmit.c \ + ar2413.c ar2425.c ar5111.c ar5112.c ar5413.c +AR5416_SRCS=ah_eeprom_v14.c \ + ar5416_ani.c ar5416_attach.c ar5416_beacon.c ar5416_cal.c \ + ar5416_cal_iq.c ar5416_cal_adcgain.c ar5416_cal_adcdc.c \ + ar5416_eeprom.c ar5416_gpio.c ar5416_interrupts.c ar5416_keycache.c \ + ar5416_misc.c ar5416_phy.c ar5416_power.c ar5416_recv.c \ + ar5416_reset.c ar5416_xmit.c \ + ar2133.c +AR9160_SRCS=ar9160_attach.c KMOD= if_ath SRCS= if_ath.c if_ath_pci.c +# NB: v3 eeprom support used by both AR5211 and AR5212; just include it +SRCS+= ah_osdep.c ah.c ah_regdomain.c ah_eeprom_v3.c +SRCS+= ${AR5210_SRCS} +SRCS+= ${AR5211_SRCS} +SRCS+= ${AR5212_SRCS} +SRCS+= ${AR5416_SRCS} +SRCS+= ${AR9160_SRCS} SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_ath.h opt_ah.h -HAL= ${.CURDIR}/../../contrib/dev/ath -CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${HAL} +CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal opt_ath.h: - echo > $@ - -# patch for hal naming difference -.if ${MACHINE_ARCH} == "amd64" -ATH_MODULE_ARCH=x86_64 -.elif ${MACHINE_ARCH} == "sparc64" -ATH_MODULE_ARCH=sparc64-be -.elif ${MACHINE_ARCH} == "powerpc" -ATH_MODULE_ARCH=powerpc-be -.else -ATH_MODULE_ARCH=${MACHINE_ARCH} -.endif - -opt_ah.h: ${HAL}/public/${ATH_MODULE_ARCH}-elf.opt_ah.h - cp ${HAL}/public/${ATH_MODULE_ARCH}-elf.opt_ah.h ${.TARGET} + :> $@ +opt_ah.h: + echo '#define AH_SUPPORT_AR5416 1' > $@ .include ==== //depot/projects/vap/sys/modules/ath_rate_amrr/Makefile#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# Copyright (c) 2004 Sam Leffler, Errno Consulting +# Copyright (c) 2004-2008 Sam Leffler, Errno Consulting # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -12,13 +12,6 @@ # similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any # redistribution must be conditioned upon including a substantially # similar Disclaimer requirement for further binary redistribution. -# 3. Neither the names of the above-listed copyright holders nor the names -# of any contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# Alternatively, this software may be distributed under the terms of the -# GNU General Public License ("GPL") version 2 as published by the Free -# Software Foundation. # # NO WARRANTY # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS @@ -42,24 +35,11 @@ SRCS= amrr.c SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_ah.h opt_wlan.h -HAL= ${.CURDIR}/../../contrib/dev/ath -CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${HAL} - -# patch for hal naming difference -.if ${MACHINE_ARCH} == "amd64" -ATH_MODULE_ARCH=x86_64 -.elif ${MACHINE_ARCH} == "sparc64" -ATH_MODULE_ARCH=sparc64-be -.elif ${MACHINE_ARCH} == "powerpc" -ATH_MODULE_ARCH=powerpc-be -.else -ATH_MODULE_ARCH=${MACHINE_ARCH} -.endif +CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal -opt_ah.h: ${HAL}/public/${ATH_MODULE_ARCH}-elf.opt_ah.h - cp ${HAL}/public/${ATH_MODULE_ARCH}-elf.opt_ah.h ${.TARGET} - .if !defined(KERNBUILDDIR) +opt_ah.h: + echo '#define AH_SUPPORT_AR5416 1' > ${.TARGET} opt_wlan.h: # echo "#define IEEE80211_DEBUG 1" > ${.TARGET} echo > ${.TARGET} ==== //depot/projects/vap/sys/modules/ath_rate_onoe/Makefile#9 (text+ko) ==== @@ -1,5 +1,5 @@ # -# Copyright (c) 2004 Sam Leffler, Errno Consulting +# Copyright (c) 2004-2008 Sam Leffler, Errno Consulting # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -12,13 +12,6 @@ # similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any # redistribution must be conditioned upon including a substantially # similar Disclaimer requirement for further binary redistribution. -# 3. Neither the names of the above-listed copyright holders nor the names -# of any contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. -# -# Alternatively, this software may be distributed under the terms of the -# GNU General Public License ("GPL") version 2 as published by the Free -# Software Foundation. # # NO WARRANTY # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS @@ -42,24 +35,11 @@ SRCS= onoe.c SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_ah.h opt_wlan.h -HAL= ${.CURDIR}/../../contrib/dev/ath -CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${HAL} - -# patch for hal naming difference -.if ${MACHINE_ARCH} == "amd64" -ATH_MODULE_ARCH=x86_64 -.elif ${MACHINE_ARCH} == "sparc64" -ATH_MODULE_ARCH=sparc64-be -.elif ${MACHINE_ARCH} == "powerpc" -ATH_MODULE_ARCH=powerpc-be -.else -ATH_MODULE_ARCH=${MACHINE_ARCH} -.endif +CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal -opt_ah.h: ${HAL}/public/${ATH_MODULE_ARCH}-elf.opt_ah.h - cp ${HAL}/public/${ATH_MODULE_ARCH}-elf.opt_ah.h ${.TARGET} - .if !defined(KERNBUILDDIR) +opt_ah.h: + echo '#define AH_SUPPORT_AR5416 1' > ${.TARGET} opt_wlan.h: echo "#define IEEE80211_DEBUG 1" > ${.TARGET} # echo > ${.TARGET} ==== //depot/projects/vap/sys/modules/ath_rate_sample/Makefile#10 (text+ko) ==== @@ -1,5 +1,5 @@ # -# Copyright (c) 2004 Sam Leffler, Errno Consulting +# Copyright (c) 2004-2008 Sam Leffler, Errno Consulting # All rights reserved. # # Redistribution and use in source and binary forms, with or without @@ -12,14 +12,7 @@ # similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any # redistribution must be conditioned upon including a substantially # similar Disclaimer requirement for further binary redistribution. -# 3. Neither the names of the above-listed copyright holders nor the names -# of any contributors may be used to endorse or promote products derived -# from this software without specific prior written permission. # -# Alternatively, this software may be distributed under the terms of the -# GNU General Public License ("GPL") version 2 as published by the Free -# Software Foundation. -# # NO WARRANTY # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS # ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT @@ -42,27 +35,14 @@ SRCS= sample.c SRCS+= device_if.h bus_if.h pci_if.h opt_inet.h opt_ah.h opt_wlan.h -HAL= ${.CURDIR}/../../contrib/dev/ath -CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${HAL} - -# patch for hal naming difference -.if ${MACHINE_ARCH} == "amd64" -ATH_MODULE_ARCH=x86_64 -.elif ${MACHINE_ARCH} == "sparc64" -ATH_MODULE_ARCH=sparc64-be -.elif ${MACHINE_ARCH} == "powerpc" -ATH_MODULE_ARCH=powerpc-be -.else -ATH_MODULE_ARCH=${MACHINE_ARCH} -.endif +CFLAGS+= -I. -I${.CURDIR}/../../dev/ath -I${.CURDIR}/../../dev/ath/ath_hal -opt_ah.h: ${HAL}/public/${ATH_MODULE_ARCH}-elf.opt_ah.h - cp ${HAL}/public/${ATH_MODULE_ARCH}-elf.opt_ah.h ${.TARGET} - .if !defined(KERNBUILDDIR) +opt_ah.h: + echo '#define AH_SUPPORT_AR5416 1' > ${.TARGET} opt_wlan.h: # echo "#define IEEE80211_DEBUG 1" > ${.TARGET} - echo > ${.TARGET} + :> ${.TARGET} .endif .include From owner-p4-projects@FreeBSD.ORG Sat Nov 29 07:31:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4ECE21065677; Sat, 29 Nov 2008 07:31:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EE3431065670 for ; Sat, 29 Nov 2008 07:31:21 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D35058FC14 for ; Sat, 29 Nov 2008 07:31:21 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAT7VLfN081168 for ; Sat, 29 Nov 2008 07:31:21 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAT7VLVG081166 for perforce@freebsd.org; Sat, 29 Nov 2008 07:31:21 GMT (envelope-from sam@freebsd.org) Date: Sat, 29 Nov 2008 07:31:21 GMT Message-Id: <200811290731.mAT7VLVG081166@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 153749 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, 29 Nov 2008 07:31:22 -0000 http://perforce.freebsd.org/chv.cgi?CH=153749 Change 153749 by sam@sam_ebb on 2008/11/29 07:30:31 change hal source paths to dev/ath/ath_hal Affected files ... .. //depot/projects/vap/sys/conf/files#57 edit Differences ... ==== //depot/projects/vap/sys/conf/files#57 (text+ko) ==== @@ -502,183 +502,183 @@ dev/ata/atapi-tape.c optional atapist dev/ata/atapi-cam.c optional atapicam # -contrib/dev/ath/ah.c optional ath \ +dev/ath/if_ath.c optional ath \ compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ah_eeprom_v1.c optional ath_ar5210 \ +dev/ath/if_ath_pci.c optional ath pci \ compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ah_eeprom_v3.c optional ath_ar5211 | ath_ar5212 \ +dev/ath/ah_osdep.c optional ath \ compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ah_eeprom_v14.c optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ +dev/ath/ath_hal/ah.c optional ath \ compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ah_regdomain.c optional ath \ +dev/ath/ath_hal/ah_eeprom_v1.c optional ath_ar5210 \ compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5210/ar5210_attach.c optional ath_ar5210 \ +dev/ath/ath_hal/ah_eeprom_v3.c optional ath_ar5211 | ath_ar5212 \ compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5210/ar5210_beacon.c optional ath_ar5210 \ +dev/ath/ath_hal/ah_eeprom_v14.c optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5210/ar5210_interrupts.c optional ath_ar5210 \ +dev/ath/ath_hal/ah_regdomain.c optional ath \ compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5210/ar5210_keycache.c optional ath_ar5210 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5210/ar5210_misc.c optional ath_ar5210 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5210/ar5210_phy.c optional ath_ar5210 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5210/ar5210_power.c optional ath_ar5210 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5210/ar5210_recv.c optional ath_ar5210 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5210/ar5210_reset.c optional ath_ar5210 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5210/ar5210_xmit.c optional ath_ar5210 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5211/ar5211_attach.c optional ath_ar5211 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5211/ar5211_beacon.c optional ath_ar5211 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5211/ar5211_interrupts.c optional ath_ar5211 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5211/ar5211_keycache.c optional ath_ar5211 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5211/ar5211_misc.c optional ath_ar5211 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5211/ar5211_phy.c optional ath_ar5211 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5211/ar5211_power.c optional ath_ar5211 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5211/ar5211_recv.c optional ath_ar5211 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5211/ar5211_reset.c optional ath_ar5211 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5211/ar5211_xmit.c optional ath_ar5211 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5212/ar5212_ani.c \ +dev/ath/ath_hal/ar5210/ar5210_attach.c optional ath_ar5210 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5210/ar5210_beacon.c optional ath_ar5210 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5210/ar5210_interrupts.c optional ath_ar5210 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5210/ar5210_keycache.c optional ath_ar5210 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5210/ar5210_misc.c optional ath_ar5210 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5210/ar5210_phy.c optional ath_ar5210 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5210/ar5210_power.c optional ath_ar5210 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5210/ar5210_recv.c optional ath_ar5210 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5210/ar5210_reset.c optional ath_ar5210 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5210/ar5210_xmit.c optional ath_ar5210 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5211/ar5211_attach.c optional ath_ar5211 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5211/ar5211_beacon.c optional ath_ar5211 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5211/ar5211_interrupts.c optional ath_ar5211 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5211/ar5211_keycache.c optional ath_ar5211 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5211/ar5211_misc.c optional ath_ar5211 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5211/ar5211_phy.c optional ath_ar5211 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5211/ar5211_power.c optional ath_ar5211 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5211/ar5211_recv.c optional ath_ar5211 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5211/ar5211_reset.c optional ath_ar5211 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5211/ar5211_xmit.c optional ath_ar5211 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5212/ar5212_ani.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5212/ar5212_attach.c \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5212/ar5212_attach.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5212/ar5212_beacon.c \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5212/ar5212_beacon.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5212/ar5212_eeprom.c \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5212/ar5212_eeprom.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5212/ar5212_gpio.c \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5212/ar5212_gpio.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5212/ar5212_interrupts.c \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5212/ar5212_interrupts.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5212/ar5212_keycache.c \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5212/ar5212_keycache.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5212/ar5212_misc.c \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5212/ar5212_misc.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5212/ar5212_phy.c \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5212/ar5212_phy.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5212/ar5212_power.c \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5212/ar5212_power.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5212/ar5212_recv.c \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5212/ar5212_recv.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5212/ar5212_reset.c \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5212/ar5212_reset.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5212/ar5212_rfgain.c \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5212/ar5212_rfgain.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5212/ar5212_xmit.c \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5212/ar5212_xmit.c \ optional ath_ar5212 | ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5212/ar2316.c optional ath_rf2316 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5212/ar2317.c optional ath_rf2317 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5212/ar2413.c optional ath_rf2413 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5212/ar2425.c optional ath_rf2425 | ath_rf2417 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5212/ar5111.c optional ath_rf5111 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5212/ar5112.c optional ath_rf5112 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5212/ar5413.c optional ath_rf5413 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5416/ar2133.c optional ath_ar5416 | ath_ar9160 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5416/ar5416_ani.c \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5212/ar2316.c optional ath_rf2316 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5212/ar2317.c optional ath_rf2317 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5212/ar2413.c optional ath_rf2413 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5212/ar2425.c optional ath_rf2425 | ath_rf2417 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5212/ar5111.c optional ath_rf5111 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5212/ar5112.c optional ath_rf5112 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5212/ar5413.c optional ath_rf5413 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5416/ar2133.c optional ath_ar5416 | ath_ar9160 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5416/ar5416_ani.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5416/ar5416_attach.c \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5416/ar5416_attach.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5416/ar5416_beacon.c \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5416/ar5416_beacon.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5416/ar5416_cal.c \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5416/ar5416_cal.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5416/ar5416_cal_iq.c \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5416/ar5416_cal_iq.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5416/ar5416_cal_adcgain.c \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5416/ar5416_cal_adcgain.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5416/ar5416_cal_adcdc.c \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5416/ar5416_cal_adcdc.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5416/ar5416_eeprom.c \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5416/ar5416_eeprom.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5416/ar5416_gpio.c \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5416/ar5416_gpio.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5416/ar5416_interrupts.c \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5416/ar5416_interrupts.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5416/ar5416_keycache.c \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5416/ar5416_keycache.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5416/ar5416_misc.c \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5416/ar5416_misc.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5416/ar5416_phy.c \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5416/ar5416_phy.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5416/ar5416_power.c \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5416/ar5416_power.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5416/ar5416_recv.c \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5416/ar5416_recv.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5416/ar5416_reset.c \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5416/ar5416_reset.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5416/ar5416_xmit.c \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5416/ar5416_xmit.c \ optional ath_ar5416 | ath_ar9160 | ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5416/ar9160_attach.c optional ath_ar5416 | ath_ar9160 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5416/ar9280.c optional ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -contrib/dev/ath/ar5416/ar9280_attach.c optional ath_ar9280 \ - compile-with "${NORMAL_C} -I$S/dev/ath" -dev/ath/ah_osdep.c optional ath \ - compile-with "${NORMAL_C} -I$S/dev/ath" + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5416/ar9160_attach.c optional ath_ar5416 | ath_ar9160 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5416/ar9280.c optional ath_ar9280 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" +dev/ath/ath_hal/ar5416/ar9280_attach.c optional ath_ar9280 \ + compile-with "${NORMAL_C} -I$S/dev/ath -I$S/dev/ath/ath_hal" dev/ath/ath_rate/amrr/amrr.c optional ath_rate_amrr \ compile-with "${NORMAL_C} -I$S/dev/ath" dev/ath/ath_rate/onoe/onoe.c optional ath_rate_onoe \ compile-with "${NORMAL_C} -I$S/dev/ath" dev/ath/ath_rate/sample/sample.c optional ath_rate_sample \ compile-with "${NORMAL_C} -I$S/dev/ath" -dev/ath/if_ath.c optional ath \ - compile-with "${NORMAL_C} -I$S/dev/ath" -dev/ath/if_ath_pci.c optional ath pci \ - compile-with "${NORMAL_C} -I$S/dev/ath" dev/bce/if_bce.c optional bce dev/bfe/if_bfe.c optional bfe dev/bge/if_bge.c optional bge From owner-p4-projects@FreeBSD.ORG Sat Nov 29 07:32:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6BDE21065678; Sat, 29 Nov 2008 07:32:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2EF6B1065675 for ; Sat, 29 Nov 2008 07:32:23 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 14BD78FC12 for ; Sat, 29 Nov 2008 07:32:23 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mAT7WNTc081234 for ; Sat, 29 Nov 2008 07:32:23 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mAT7WM3n081232 for perforce@freebsd.org; Sat, 29 Nov 2008 07:32:22 GMT (envelope-from sam@freebsd.org) Date: Sat, 29 Nov 2008 07:32:22 GMT Message-Id: <200811290732.mAT7WM3n081232@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 153750 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, 29 Nov 2008 07:32:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=153750 Change 153750 by sam@sam_ebb on 2008/11/29 07:31:41 fixup ath_hal going away Affected files ... .. //depot/projects/vap/sys/amd64/conf/GENERIC#22 edit .. //depot/projects/vap/sys/amd64/conf/NOTES#15 edit .. //depot/projects/vap/sys/i386/conf/GENERIC#25 edit .. //depot/projects/vap/sys/i386/conf/NOTES#20 edit .. //depot/projects/vap/sys/i386/conf/PAE#8 edit .. //depot/projects/vap/sys/i386/conf/WIRELESS#4 edit .. //depot/projects/vap/sys/mips/conf/IDT#7 edit .. //depot/projects/vap/sys/mips/conf/SENTRY5#7 edit .. //depot/projects/vap/sys/pc98/conf/GENERIC#17 edit .. //depot/projects/vap/sys/pc98/conf/NOTES#14 edit .. //depot/projects/vap/sys/sparc64/conf/GENERIC#20 edit Differences ... ==== //depot/projects/vap/sys/amd64/conf/GENERIC#22 (text+ko) ==== @@ -248,7 +248,17 @@ 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) +device ath_ar5210 # AR5210 chips +device ath_ar5211 # AR5211 chips +device ath_ar5212 # AR5212 chips +device ath_rf2413 +device ath_rf2417 +device ath_rf2425 +device ath_rf5111 +device ath_rf5112 +device ath_rf5413 +device ath_ar5416 # AR5416 chips +options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors device ath_rate_sample # SampleRate tx rate control for ath device ral # Ralink Technology RT2500 wireless NICs. device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. ==== //depot/projects/vap/sys/amd64/conf/NOTES#15 (text+ko) ==== @@ -258,7 +258,6 @@ # Network interfaces: # -# ath: Atheros a/b/g WiFi adapters (requires ath_hal and wlan) # ed: Western Digital and SMC 80xx; Novell NE1000 and NE2000; 3Com 3C503 # HP PC Lan+, various PC Card devices # (requires miibus) @@ -284,12 +283,21 @@ device ural device wpi -device ath -device ath_hal # Atheros HAL (includes binary component) -#device ath_rate_amrr # AMRR rate control for ath driver -#device ath_rate_onoe # Onoe rate control for ath driver -device ath_rate_sample # SampleRate rate control for the ath driver -#device wlan # 802.11 layer +device ath # Atheros pci/cardbus NIC's +device ath_ar5210 # AR5210 chips +device ath_ar5211 # AR5211 chips +device ath_ar5212 # AR5212 chips +device ath_rf2413 +device ath_rf2417 +device ath_rf2425 +device ath_rf5111 +device ath_rf5112 +device ath_rf5413 +device ath_ar5416 # AR5416 chips +options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors +device ath_rate_sample # SampleRate tx rate control for ath +#device ath_rate_amrr # AMRR rate control for ath driver +#device ath_rate_onoe # Onoe rate control for ath driver # #XXX this stores pointers in a 32bit field that is defined by the hardware ==== //depot/projects/vap/sys/i386/conf/GENERIC#25 (text+ko) ==== @@ -263,7 +263,17 @@ 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) +device ath_ar5210 # AR5210 chips +device ath_ar5211 # AR5211 chips +device ath_ar5212 # AR5212 chips +device ath_rf2413 +device ath_rf2417 +device ath_rf2425 +device ath_rf5111 +device ath_rf5112 +device ath_rf5413 +device ath_ar5416 # AR5416 chips +options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors device ath_rate_sample # SampleRate tx rate control for ath device ral # Ralink Technology RT2500 wireless NICs. #device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. ==== //depot/projects/vap/sys/i386/conf/NOTES#20 (text+ko) ==== @@ -565,6 +565,19 @@ hint.ar.0.port="0x300" hint.ar.0.irq="10" hint.ar.0.maddr="0xd0000" +device ath # Atheros pci/cardbus NIC's +device ath_ar5210 # AR5210 chips +device ath_ar5211 # AR5211 chips +device ath_ar5212 # AR5212 chips +device ath_rf2413 +device ath_rf2417 +device ath_rf2425 +device ath_rf5111 +device ath_rf5112 +device ath_rf5413 +device ath_ar5416 # AR5416 chips +options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors +device ath_rate_sample # SampleRate tx rate control for ath device ce device cp device cs @@ -617,13 +630,6 @@ options WLDEBUG # enables verbose debugging output device wpi -device ath -device ath_hal # Atheros HAL (includes binary component) -#device ath_rate_amrr # AMRR rate control for ath driver -#device ath_rate_onoe # Onoe rate control for ath driver -device ath_rate_sample # SampleRate rate control for the ath driver -#device wlan # 802.11 layer - # # ATA raid adapters # ==== //depot/projects/vap/sys/i386/conf/PAE#8 (text+ko) ==== @@ -78,7 +78,16 @@ nodevice an nodevice ath # Atheros pci/cardbus NIC's -nodevice ath_hal # Atheros HAL (Hardware Access Layer) +nodevice ath_ar5210 # AR5210 chips +nodevice ath_ar5211 # AR5211 chips +nodevice ath_ar5212 # AR5212 chips +nodevice ath_rf2413 +nodevice ath_rf2417 +nodevice ath_rf2425 +nodevice ath_rf5111 +nodevice ath_rf5112 +nodevice ath_rf5413 +nodevice ath_ar5416 # AR5416 chips nodevice ath_rate_sample # SampleRate tx rate control for ath nodevice ral nodevice wi ==== //depot/projects/vap/sys/i386/conf/WIRELESS#4 (text+ko) ==== @@ -124,7 +124,8 @@ device cardbus # CardBus (32-bit) bus # Serial (COM) ports -device sio # 8250, 16[45]50 based serial ports +#device sio # 8250, 16[45]50 based serial ports +device uart # 8250, 16[45]50 based serial ports # PCI Ethernet NICs. device de # DEC/Intel DC21x4x (``Tulip'') @@ -170,7 +171,23 @@ device wlan_rssadapt device an # Aironet 4500/4800 802.11 wireless NICs. device ath # Atheros pci/cardbus NIC's -device ath_hal # Atheros HAL (Hardware Access Layer) +device ath_ar5210 +device ath_ar5211 +device ath_ar5212 +device ath_rf2413 +device ath_rf2417 +device ath_rf2425 +device ath_rf5111 +device ath_rf5112 +device ath_rf5413 +#define ath_ar5312 +#device ath_rf2316 +#device ath_rf2317 +device ath_ar5416 +options AH_SUPPORT_AR5416 +device ath_ar9160 +#device ath_ar9280 +#device ath_ar9285 device ath_rate_sample # SampleRate tx rate control for ath device bwi # Broadcom BCM43xx device ipw # Intel 2100 @@ -190,8 +207,8 @@ device loop # Network loopback device random # Entropy device device ether # Ethernet support -device sl # Kernel SLIP -device ppp # Kernel PPP +#device sl # Kernel SLIP +#device ppp # Kernel PPP device tun # Packet tunnel. device pty # Pseudo-ttys (telnet etc) device md # Memory "disks" @@ -221,7 +238,7 @@ device ucom # Generic com ttys device uark # Technologies ARK3116 based serial adapters device ubsa # Belkin F5U103 and compatible serial adapters -device ubser # BWCT console serial adapters +#device ubser # BWCT console serial adapters device uftdi # For FTDI usb serial adapters device uipaq # Some WinCE based devices device uplcom # Prolific PL-2303 serial adapters ==== //depot/projects/vap/sys/mips/conf/IDT#7 (text+ko) ==== @@ -44,7 +44,17 @@ device wlan_wep # 802.11 WEP support device wlan_tkip # 802.11 TKIP support device ath # Atheros pci/cardbus NIC's -device ath_hal # Atheros HAL (Hardware Access Layer) +device ath_ar5210 # AR5210 chips +device ath_ar5211 # AR5211 chips +device ath_ar5212 # AR5212 chips +device ath_rf2413 +device ath_rf2417 +device ath_rf2425 +device ath_rf5111 +device ath_rf5112 +device ath_rf5413 +device ath_ar5416 # AR5416 chips +options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors device ath_rate_sample # SampleRate tx rate control for ath options ATH_DEBUG ==== //depot/projects/vap/sys/mips/conf/SENTRY5#7 (text+ko) ==== @@ -79,7 +79,17 @@ # pci devices # notyet: #device ath # in pci slot -#device ath_hal # in pci slot +#device ath_ar5210 # AR5210 chips +#device ath_ar5211 # AR5211 chips +#device ath_ar5212 # AR5212 chips +#device ath_rf2413 +#device ath_rf2417 +#device ath_rf2425 +#device ath_rf5111 +#device ath_rf5112 +#device ath_rf5413 +#device ath_ar5416 # AR5416 chips +#options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors device usb # USB Bus (required) device uhci # UHCI PCI->USB interface ==== //depot/projects/vap/sys/pc98/conf/GENERIC#17 (text+ko) ==== @@ -221,7 +221,17 @@ 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) +device ath_ar5210 # AR5210 chips +device ath_ar5211 # AR5211 chips +device ath_ar5212 # AR5212 chips +device ath_rf2413 +device ath_rf2417 +device ath_rf2425 +device ath_rf5111 +device ath_rf5112 +device ath_rf5413 +device ath_ar5416 # AR5416 chips +options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors device ath_rate_sample # SampleRate tx rate control for ath device ral # Ralink Technology RT2500 wireless NICs. device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs. ==== //depot/projects/vap/sys/pc98/conf/NOTES#14 (text+ko) ==== @@ -418,12 +418,19 @@ device sr device ural -device ath -device ath_hal # Atheros HAL (includes binary component) -#device ath_rate_amrr # AMRR rate control for ath driver -#device ath_rate_onoe # Onoe rate control for ath driver -device ath_rate_sample # SampleRate rate control for the ath driver -#device wlan # 802.11 layer +device ath # Atheros pci/cardbus NIC's +device ath_ar5210 # AR5210 chips +device ath_ar5211 # AR5211 chips +device ath_ar5212 # AR5212 chips +device ath_rf2413 +device ath_rf2417 +device ath_rf2425 +device ath_rf5111 +device ath_rf5112 +device ath_rf5413 +device ath_ar5416 # AR5416 chips +options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors +device ath_rate_sample # SampleRate tx rate control for ath # # SCSI host adapters: ==== //depot/projects/vap/sys/sparc64/conf/GENERIC#20 (text+ko) ==== @@ -199,7 +199,17 @@ device wlan_ccmp # 802.11 CCMP support device wlan_tkip # 802.11 TKIP support device ath # Atheros pci/cardbus NIC's -device ath_hal # Atheros HAL (Hardware Access Layer) +device ath_ar5210 # AR5210 chips +device ath_ar5211 # AR5211 chips +device ath_ar5212 # AR5212 chips +device ath_rf2413 +device ath_rf2417 +device ath_rf2425 +device ath_rf5111 +device ath_rf5112 +device ath_rf5413 +device ath_ar5416 # AR5416 chips +options AH_SUPPORT_AR5416 # enable AR5416 tx/rx descriptors device ath_rate_sample # SampleRate tx rate control for ath # Pseudo devices. From owner-p4-projects@FreeBSD.ORG Sat Nov 29 11:36:31 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 2DE181065673; Sat, 29 Nov 2008 11:36:31 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E647E1065670 for ; Sat, 29 Nov 2008 11:36:30 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id D3E828FC08 for ; Sat, 29 Nov 2008 11:36:30 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mATBaUl5018471 for ; Sat, 29 Nov 2008 11:36:30 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mATBaUpx018469 for perforce@freebsd.org; Sat, 29 Nov 2008 11:36:30 GMT (envelope-from weongyo@FreeBSD.org) Date: Sat, 29 Nov 2008 11:36:30 GMT Message-Id: <200811291136.mATBaUpx018469@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 153753 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, 29 Nov 2008 11:36:31 -0000 http://perforce.freebsd.org/chv.cgi?CH=153753 Change 153753 by weongyo@weongyo_ws on 2008/11/29 11:35:57 In most cases of calling USB xfer's callback these're called from `ehci0' (or ohci0..) thread but a callback for aborting USB xfer is called `usbtask-hc' thread. Normally it looks it doesn't make problems unless the network load is high. It seems that accessing a IRP structure from multi-threads can make abnormal behavior so with this patch unify code flows to a NDIS Worker thread. But it looks NDIS USB support still has unknown TCP RX/TX problem because sometimes I saw the driver's watchdog timeout using TCP_STREAM of netperf(1) but it's ok to RX/TX with UDP_STREAM. Weird. Affected files ... .. //depot/projects/ndisusb/sys/compat/ndis/subr_usbd.c#14 edit .. //depot/projects/ndisusb/sys/dev/if_ndis/if_ndis.c#9 edit .. //depot/projects/ndisusb/sys/dev/if_ndis/if_ndisvar.h#7 edit Differences ... ==== //depot/projects/ndisusb/sys/compat/ndis/subr_usbd.c#14 (text+ko) ==== @@ -97,6 +97,9 @@ static int32_t usbd_urb2nt(int32_t); static void usbd_xfereof(usbd_xfer_handle, usbd_private_handle, usbd_status); +static void usbd_xferadd(usbd_xfer_handle, usbd_private_handle, + usbd_status, uint8_t); +static void usbd_xfertask(device_object *, void *); static void dummy(void); static union usbd_urb *USBD_CreateConfigurationRequestEx( @@ -120,6 +123,7 @@ static funcptr usbd_ioinvalid_wrap; static funcptr usbd_irpcancel_wrap; static funcptr usbd_irpcancel_iin_wrap; +static funcptr usbd_xfertask_wrap; int usbd_libinit(void) @@ -143,6 +147,8 @@ (funcptr *)&usbd_irpcancel_wrap, 2, WINDRV_WRAP_STDCALL); windrv_wrap((funcptr)usbd_irpcancel_iin, (funcptr *)&usbd_irpcancel_iin_wrap, 2, WINDRV_WRAP_STDCALL); + windrv_wrap((funcptr)usbd_xfertask, + (funcptr *)&usbd_xfertask_wrap, 2, WINDRV_WRAP_STDCALL); /* Create a fake USB driver instance. */ @@ -174,6 +180,7 @@ windrv_unwrap(usbd_iodispatch_wrap); windrv_unwrap(usbd_irpcancel_wrap); windrv_unwrap(usbd_irpcancel_iin_wrap); + windrv_unwrap(usbd_xfertask_wrap); free(usbd_driver.dro_drivername.us_buf, M_DEVBUF); @@ -885,63 +892,44 @@ } static void -usbd_intr(xfer, priv, status) +usbd_xferadd(xfer, priv, status, freexfer) usbd_xfer_handle xfer; usbd_private_handle priv; usbd_status status; + uint8_t freexfer; { irp *ip = priv; device_t dev = IRP_NDIS_DEV(ip); - struct usbd_urb_bulk_or_intr_transfer *ubi; - union usbd_urb *urb; + struct ndis_softc *sc = device_get_softc(dev); + struct ndisusb_xfer *nx; + uint8_t irql; - if (status != USBD_NORMAL_COMPLETION) { - if (status == USBD_NOT_STARTED) - return; - if (status == USBD_STALLED) - usbd_clear_endpoint_stall_async(xfer->pipe); - if (status != USBD_CANCELLED) { - device_printf(dev, "can't process status (%s)\n", - usbd_errstr(status)); - return; - } + nx = malloc(sizeof(struct ndisusb_xfer), M_USBDEV, M_NOWAIT | M_ZERO); + if (nx == NULL) { + device_printf(dev, "out of memory"); + return; } - - urb = usbd_geturb(ip); + nx->nx_xfer = xfer; + nx->nx_priv = priv; + nx->nx_status = status; + nx->nx_freexfer = freexfer; - KASSERT(urb->uu_hdr.uuh_func == URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER, - ("function(%d) isn't for bulk or interrupt", urb->uu_hdr.uuh_func)); + KeAcquireSpinLock(&sc->ndisusb_xferlock, &irql); + InsertTailList((&sc->ndisusb_xferlist), (&nx->nx_xferlist)); + KeReleaseSpinLock(&sc->ndisusb_xferlock, irql); - IoAcquireCancelSpinLock(&ip->irp_cancelirql); + IoQueueWorkItem(sc->ndisusb_xferitem, + (io_workitem_func)usbd_xfertask_wrap, WORKQUEUE_CRITICAL, sc); +} - ip->irp_cancelfunc = NULL; - IRP_NDISUSB_XFER(ip) = NULL; +static void +usbd_intr(xfer, priv, status) + usbd_xfer_handle xfer; + usbd_private_handle priv; + usbd_status status; +{ - switch (status) { - case USBD_NORMAL_COMPLETION: - ubi = &urb->uu_bulkintr; - ubi->ubi_trans_buflen = xfer->actlen; - if (ubi->ubi_trans_flags & USBD_TRANSFER_DIRECTION_IN) - memcpy(ubi->ubi_trans_buf, xfer->buffer, xfer->actlen); - - ip->irp_iostat.isb_info = xfer->actlen; - ip->irp_iostat.isb_status = STATUS_SUCCESS; - USBD_URB_STATUS(urb) = USBD_STATUS_SUCCESS; - break; - case USBD_CANCELLED: - ip->irp_iostat.isb_info = 0; - ip->irp_iostat.isb_status = STATUS_CANCELLED; - USBD_URB_STATUS(urb) = USBD_STATUS_SUCCESS; - break; - default: - ip->irp_iostat.isb_info = 0; - USBD_URB_STATUS(urb) = usbd_usb2urb(status); - ip->irp_iostat.isb_status = usbd_urb2nt(USBD_URB_STATUS(urb)); - break; - } - - IoReleaseCancelSpinLock(ip->irp_cancelirql); - IoCompleteRequest(ip, IO_NO_INCREMENT); + usbd_xferadd(xfer, priv, status, 0); } static void @@ -950,8 +938,108 @@ usbd_private_handle priv; usbd_status status; { - usbd_intr(xfer, priv, status); - usbd_free_xfer(xfer); + + usbd_xferadd(xfer, priv, status, 1); +} + +static void +usbd_xfertask(dobj, arg) + device_object *dobj; + void *arg; +{ + int error; + irp *ip; + device_t dev; + list_entry *l; + struct ndis_softc *sc = arg; + struct ndisusb_xfer *nx; + struct usbd_urb_bulk_or_intr_transfer *ubi; + uint8_t irql; + union usbd_urb *urb; + usbd_private_handle priv; + usbd_status status; + usbd_xfer_handle xfer; + + dev = sc->ndis_dev; + + if (IsListEmpty(&sc->ndisusb_xferlist)) + return; + + KeAcquireSpinLock(&sc->ndisusb_xferlock, &irql); + l = sc->ndisusb_xferlist.nle_flink; + while (l != &sc->ndisusb_xferlist) { + nx = CONTAINING_RECORD(l, struct ndisusb_xfer, nx_xferlist); + xfer = nx->nx_xfer; + priv = nx->nx_priv; + status = nx->nx_status; + error = 0; + ip = priv; + + if (status != USBD_NORMAL_COMPLETION) { + if (status == USBD_NOT_STARTED) { + error = 1; + goto next; + } + if (status == USBD_STALLED) + usbd_clear_endpoint_stall_async(xfer->pipe); + if (status != USBD_CANCELLED) { + device_printf(dev, "can't process status (%s)\n", + usbd_errstr(status)); + error = 1; + goto next; + } + } + + urb = usbd_geturb(ip); + + KASSERT(urb->uu_hdr.uuh_func == + URB_FUNCTION_BULK_OR_INTERRUPT_TRANSFER, + ("function(%d) isn't for bulk or interrupt", + urb->uu_hdr.uuh_func)); + + IoAcquireCancelSpinLock(&ip->irp_cancelirql); + + ip->irp_cancelfunc = NULL; + IRP_NDISUSB_XFER(ip) = NULL; + + switch (status) { + case USBD_NORMAL_COMPLETION: + ubi = &urb->uu_bulkintr; + ubi->ubi_trans_buflen = xfer->actlen; + if (ubi->ubi_trans_flags & USBD_TRANSFER_DIRECTION_IN) + memcpy(ubi->ubi_trans_buf, xfer->buffer, + xfer->actlen); + + ip->irp_iostat.isb_info = xfer->actlen; + ip->irp_iostat.isb_status = STATUS_SUCCESS; + USBD_URB_STATUS(urb) = USBD_STATUS_SUCCESS; + break; + case USBD_CANCELLED: + ip->irp_iostat.isb_info = 0; + ip->irp_iostat.isb_status = STATUS_CANCELLED; + USBD_URB_STATUS(urb) = USBD_STATUS_SUCCESS; + break; + default: + ip->irp_iostat.isb_info = 0; + USBD_URB_STATUS(urb) = usbd_usb2urb(status); + ip->irp_iostat.isb_status = + usbd_urb2nt(USBD_URB_STATUS(urb)); + break; + } + + IoReleaseCancelSpinLock(ip->irp_cancelirql); +next: + l = l->nle_flink; + RemoveEntryList(&nx->nx_xferlist); + if (nx->nx_freexfer) + usbd_free_xfer(nx->nx_xfer); + free(nx, M_USBDEV); + if (error) + continue; + /* NB: call after cleaning */ + IoCompleteRequest(ip, IO_NO_INCREMENT); + } + KeReleaseSpinLock(&sc->ndisusb_xferlock, irql); } static int32_t ==== //depot/projects/ndisusb/sys/dev/if_ndis/if_ndis.c#9 (text+ko) ==== @@ -543,7 +543,9 @@ mtx_init(&sc->ndis_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK, MTX_DEF); KeInitializeSpinLock(&sc->ndis_rxlock); + KeInitializeSpinLock(&sc->ndisusb_xferlock); InitializeListHead(&sc->ndis_shlist); + InitializeListHead(&sc->ndisusb_xferlist); callout_init(&sc->ndis_stat_callout, CALLOUT_MPSAFE); if (sc->ndis_iftype == PCMCIABus) { @@ -607,6 +609,7 @@ sc->ndis_startitem = IoAllocateWorkItem(sc->ndis_block->nmb_deviceobj); sc->ndis_resetitem = IoAllocateWorkItem(sc->ndis_block->nmb_deviceobj); sc->ndis_inputitem = IoAllocateWorkItem(sc->ndis_block->nmb_deviceobj); + sc->ndisusb_xferitem = IoAllocateWorkItem(sc->ndis_block->nmb_deviceobj); KeInitializeDpc(&sc->ndis_rxdpc, ndis_rxeof_xfr_wrap, sc->ndis_block); /* Call driver's init routine. */ @@ -1043,6 +1046,8 @@ IoFreeWorkItem(sc->ndis_resetitem); if (sc->ndis_inputitem != NULL) IoFreeWorkItem(sc->ndis_inputitem); + if (sc->ndisusb_xferitem != NULL) + IoFreeWorkItem(sc->ndisusb_xferitem); bus_generic_detach(dev); ndis_unload_driver(sc); ==== //depot/projects/ndisusb/sys/dev/if_ndis/if_ndisvar.h#7 (text+ko) ==== @@ -117,6 +117,13 @@ #define NDISUSB_IFACE_INDEX 0 #define NDISUSB_INTR_TIMEOUT 1000 #define NDISUSB_TX_TIMEOUT 10000 +struct ndisusb_xfer { + usbd_xfer_handle nx_xfer; + usbd_private_handle nx_priv; + usbd_status nx_status; + uint8_t nx_freexfer; + list_entry nx_xferlist; +}; struct ndis_softc { struct ifnet *ifp; @@ -195,6 +202,9 @@ int ndis_tx_timer; int ndis_hang_timer; + io_workitem *ndisusb_xferitem; + list_entry ndisusb_xferlist; + kspin_lock ndisusb_xferlock; #define NDISUSB_ENDPT_BOUT 0 #define NDISUSB_ENDPT_BIN 1 #define NDISUSB_ENDPT_IIN 2 From owner-p4-projects@FreeBSD.ORG Sat Nov 29 11:46:42 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C75F61065673; Sat, 29 Nov 2008 11:46:41 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8B99C106564A for ; Sat, 29 Nov 2008 11:46:41 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 7B52E8FC08 for ; Sat, 29 Nov 2008 11:46:41 +0000 (UTC) (envelope-from weongyo@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mATBkfBE019209 for ; Sat, 29 Nov 2008 11:46:41 GMT (envelope-from weongyo@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mATBkfrF019207 for perforce@freebsd.org; Sat, 29 Nov 2008 11:46:41 GMT (envelope-from weongyo@FreeBSD.org) Date: Sat, 29 Nov 2008 11:46:41 GMT Message-Id: <200811291146.mATBkfrF019207@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to weongyo@FreeBSD.org using -f From: Weongyo Jeong To: Perforce Change Reviews Cc: Subject: PERFORCE change 153754 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, 29 Nov 2008 11:46:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=153754 Change 153754 by weongyo@weongyo_ws on 2008/11/29 11:45:43 misc style(9) and name changes Affected files ... .. //depot/projects/ndisusb/sys/compat/ndis/subr_usbd.c#15 edit Differences ... ==== //depot/projects/ndisusb/sys/compat/ndis/subr_usbd.c#15 (text+ko) ==== @@ -269,10 +269,10 @@ /* Convert FreeBSD's usbd_status to USBD_STATUS */ static int32_t -usbd_usb2urb(int urb_status) +usbd_usb2urb(int status) { - switch (urb_status) { + switch (status) { case USBD_NORMAL_COMPLETION: return (USBD_STATUS_SUCCESS); case USBD_IN_PROGRESS: @@ -1076,7 +1076,6 @@ if (status != USBD_NORMAL_COMPLETION) return usbd_usb2urb(status); - xfer = usbd_init_ndisxfer(ip, ep, ubi->ubi_trans_buf, ubi->ubi_trans_buflen); if (xfer == NULL) { From owner-p4-projects@FreeBSD.ORG Sat Nov 29 18:31:02 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 49D0E1065687; Sat, 29 Nov 2008 18:31:02 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0C6801065670 for ; Sat, 29 Nov 2008 18:31:02 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id E99718FC18 for ; Sat, 29 Nov 2008 18:31:01 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mATIV1Hb081434 for ; Sat, 29 Nov 2008 18:31:01 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mATIV187081432 for perforce@freebsd.org; Sat, 29 Nov 2008 18:31:01 GMT (envelope-from sam@freebsd.org) Date: Sat, 29 Nov 2008 18:31:01 GMT Message-Id: <200811291831.mATIV187081432@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 153775 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, 29 Nov 2008 18:31:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=153775 Change 153775 by sam@sam_ebb on 2008/11/29 18:30:52 try to modularize per-board setup better and add Cambria; it's still a mess Affected files ... .. //depot/projects/vap/sys/arm/xscale/ixp425/avila_ata.c#3 edit Differences ... ==== //depot/projects/vap/sys/arm/xscale/ixp425/avila_ata.c#3 (text+ko) ==== @@ -67,13 +67,64 @@ #include #include -#define AVILA_IDE_GPIN 12 /* GPIO pin # */ -#define AVILA_IDE_IRQ IXP425_INT_GPIO_12 -#define AVILA_IDE_CTRL 0x06 /* control register */ +#define AVILA_IDE_CTRL 0x06 + +struct ata_config { + const char *desc; /* description for probe */ + uint8_t gpin; /* GPIO pin */ + uint8_t irq; /* IRQ */ + uint32_t base16; /* CS base addr for 16-bit */ + uint32_t size16; /* CS size for 16-bit */ + uint32_t off16; /* CS offset for 16-bit */ + uint32_t basealt; /* CS base addr for alt */ + uint32_t sizealt; /* CS size for alt */ + uint32_t offalt; /* CS offset for alt */ +}; + +static const struct ata_config * +ata_getconfig(struct ixp425_softc *sa) +{ + static const struct ata_config configs[] = { + { .desc = "Gateworks Avila IDE/CF Controller", + .gpin = 12, + .irq = IXP425_INT_GPIO_12, + .base16 = IXP425_EXP_BUS_CS1_HWBASE, + .size16 = IXP425_EXP_BUS_CS1_SIZE, + .off16 = EXP_TIMING_CS1_OFFSET, + .basealt = IXP425_EXP_BUS_CS2_HWBASE, + .sizealt = IXP425_EXP_BUS_CS2_SIZE, + .offalt = EXP_TIMING_CS2_OFFSET, + }, + { .desc = "Gateworks Cambria IDE/CF Controller", + .gpin = 12, + .irq = IXP425_INT_GPIO_12, + .base16 = CAMBRIA_CFSEL0_HWBASE, + .size16 = CAMBRIA_CFSEL0_SIZE, + .off16 = EXP_TIMING_CS3_OFFSET, + .basealt = CAMBRIA_CFSEL1_HWBASE, + .sizealt = CAMBRIA_CFSEL1_SIZE, + .offalt = EXP_TIMING_CS3_OFFSET, + }, + { .desc = "ADI Pronghorn Metro IDE/CF Controller", + .gpin = 0, + .irq = IXP425_INT_GPIO_0, + .base16 = IXP425_EXP_BUS_CS3_HWBASE, + .size16 = IXP425_EXP_BUS_CS3_SIZE, + .off16 = EXP_TIMING_CS3_OFFSET, + .basealt = IXP425_EXP_BUS_CS4_HWBASE, + .sizealt = IXP425_EXP_BUS_CS4_SIZE, + .offalt = EXP_TIMING_CS4_OFFSET, + }, + }; -#define PRONGHORN_IDE_GPIN 0 /* GPIO pin # */ -#define PRONGHORN_IDE_IRQ IXP425_INT_GPIO_0 -#define PRONGHORN_IDE_CNTRL 0x06 /* control register */ + /* XXX honor hint? (but then no multi-board support) */ + /* XXX total hack */ + if ((cpu_id() & CPU_ID_CPU_MASK) == CPU_ID_IXP435) + return &configs[1]; /* Cambria */ + if (EXP_BUS_READ_4(sa, EXP_TIMING_CS2_OFFSET) != 0) + return &configs[0]; /* Avila */ + return &configs[2]; /* Pronghorn */ +} struct ata_avila_softc { device_t sc_dev; @@ -105,14 +156,14 @@ ata_avila_probe(device_t dev) { struct ixp425_softc *sa = device_get_softc(device_get_parent(dev)); + const struct ata_config *config; - /* XXX any way to check? */ - if (EXP_BUS_READ_4(sa, EXP_TIMING_CS2_OFFSET) != 0) - device_set_desc_copy(dev, "Gateworks Avila IDE/CF Controller"); - else - device_set_desc_copy(dev, - "ADI Pronghorn Metro IDE/CF Controller"); - return 0; + config = ata_getconfig(sa); + if (config != NULL) { + device_set_desc_copy(dev, config->desc); + return 0; + } + return ENXIO; } static int @@ -120,41 +171,25 @@ { struct ata_avila_softc *sc = device_get_softc(dev); struct ixp425_softc *sa = device_get_softc(device_get_parent(dev)); - u_int32_t alt_t_off, ide_gpin, ide_irq; + const struct ata_config *config; + + config = ata_getconfig(sa); + KASSERT(config != NULL, ("no board config")); sc->sc_dev = dev; /* NB: borrow from parent */ sc->sc_iot = sa->sc_iot; sc->sc_exp_ioh = sa->sc_exp_ioh; - if (EXP_BUS_READ_4(sc, EXP_TIMING_CS2_OFFSET) != 0) { - /* Avila board */ - if (bus_space_map(sc->sc_iot, IXP425_EXP_BUS_CS1_HWBASE, - IXP425_EXP_BUS_CS1_SIZE, 0, &sc->sc_ioh)) - panic("%s: unable to map Expansion Bus CS1 window", - __func__); - if (bus_space_map(sc->sc_iot, IXP425_EXP_BUS_CS2_HWBASE, - IXP425_EXP_BUS_CS2_SIZE, 0, &sc->sc_alt_ioh)) - panic("%s: unable to map Expansion Bus CS2 window", - __func__); - ide_gpin = AVILA_IDE_GPIN; - ide_irq = AVILA_IDE_IRQ; - sc->sc_16bit_off = EXP_TIMING_CS1_OFFSET; - alt_t_off = EXP_TIMING_CS2_OFFSET; - } else { - /* Pronghorn */ - if (bus_space_map(sc->sc_iot, IXP425_EXP_BUS_CS3_HWBASE, - IXP425_EXP_BUS_CS3_SIZE, 0, &sc->sc_ioh)) - panic("%s: unable to map Expansion Bus CS3 window", - __func__); - if (bus_space_map(sc->sc_iot, IXP425_EXP_BUS_CS4_HWBASE, - IXP425_EXP_BUS_CS4_SIZE, 0, &sc->sc_alt_ioh)) - panic("%s: unable to map Expansion Bus CS4 window", - __func__); - ide_gpin = PRONGHORN_IDE_GPIN; - ide_irq = PRONGHORN_IDE_IRQ; - sc->sc_16bit_off = EXP_TIMING_CS3_OFFSET; - alt_t_off = EXP_TIMING_CS4_OFFSET; - } + + if (bus_space_map(sc->sc_iot, config->base16, config->size16, + 0, &sc->sc_ioh)) + panic("%s: cannot map 16-bit window (0x%x/0x%x)", + __func__, config->base16, config->size16); + if (bus_space_map(sc->sc_iot, config->basealt, config->sizealt, + 0, &sc->sc_alt_ioh)) + panic("%s: cannot map alt window (0x%x/0x%x)", + __func__, config->basealt, config->sizealt); + sc->sc_16bit_off = config->off16; /* * Craft special resource for ATA bus space ops @@ -184,30 +219,30 @@ rman_set_bushandle(&sc->sc_alt_ata, sc->sc_alt_ioh); GPIO_CONF_WRITE_4(sa, IXP425_GPIO_GPOER, - GPIO_CONF_READ_4(sa, IXP425_GPIO_GPOER) | (1<gpin)); /* set interrupt type */ - GPIO_CONF_WRITE_4(sa, GPIO_TYPE_REG(ide_gpin), - (GPIO_CONF_READ_4(sa, GPIO_TYPE_REG(ide_gpin)) &~ - GPIO_TYPE(ide_gpin, GPIO_TYPE_MASK)) | - GPIO_TYPE(ide_gpin, GPIO_TYPE_EDG_RISING)); + GPIO_CONF_WRITE_4(sa, GPIO_TYPE_REG(config->gpin), + (GPIO_CONF_READ_4(sa, GPIO_TYPE_REG(config->gpin)) &~ + GPIO_TYPE(config->gpin, GPIO_TYPE_MASK)) | + GPIO_TYPE(config->gpin, GPIO_TYPE_EDG_RISING)); /* clear ISR */ - GPIO_CONF_WRITE_4(sa, IXP425_GPIO_GPISR, (1<gpin)); /* configure CS1/3 window, leaving timing unchanged */ EXP_BUS_WRITE_4(sc, sc->sc_16bit_off, EXP_BUS_READ_4(sc, sc->sc_16bit_off) | EXP_BYTE_EN | EXP_WR_EN | EXP_BYTE_RD16 | EXP_CS_EN); /* configure CS2/4 window, leaving timing unchanged */ - EXP_BUS_WRITE_4(sc, alt_t_off, - EXP_BUS_READ_4(sc, alt_t_off) | + EXP_BUS_WRITE_4(sc, config->offalt, + EXP_BUS_READ_4(sc, config->offalt) | EXP_BYTE_EN | EXP_WR_EN | EXP_BYTE_RD16 | EXP_CS_EN); /* setup interrupt */ sc->sc_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &sc->sc_rid, - ide_irq, ide_irq, 1, RF_ACTIVE); + config->irq, config->irq, 1, RF_ACTIVE); if (!sc->sc_irq) - panic("Unable to allocate irq %u.\n", ide_irq); + panic("Unable to allocate irq %u.\n", config->irq); bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_BIO | INTR_MPSAFE | INTR_ENTROPY, NULL, ata_avila_intr, sc, &sc->sc_ih); From owner-p4-projects@FreeBSD.ORG Sat Nov 29 18:32:03 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 71EF9106567D; Sat, 29 Nov 2008 18:32:03 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 35DD5106567B for ; Sat, 29 Nov 2008 18:32:03 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1F0588FC14 for ; Sat, 29 Nov 2008 18:32:03 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mATIW3NR081496 for ; Sat, 29 Nov 2008 18:32:03 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mATIW30F081494 for perforce@freebsd.org; Sat, 29 Nov 2008 18:32:03 GMT (envelope-from sam@freebsd.org) Date: Sat, 29 Nov 2008 18:32:03 GMT Message-Id: <200811291832.mATIW30F081494@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 153776 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, 29 Nov 2008 18:32:03 -0000 http://perforce.freebsd.org/chv.cgi?CH=153776 Change 153776 by sam@sam_ebb on 2008/11/29 18:31:52 add Cambria support Affected files ... .. //depot/projects/vap/sys/arm/xscale/ixp425/avila_machdep.c#9 edit Differences ... ==== //depot/projects/vap/sys/arm/xscale/ixp425/avila_machdep.c#9 (text+ko) ==== @@ -147,105 +147,90 @@ /* Static device mappings. */ static const struct pmap_devmap ixp425_devmap[] = { /* Physical/Virtual address for I/O space */ - { - IXP425_IO_VBASE, - IXP425_IO_HWBASE, - IXP425_IO_SIZE, - VM_PROT_READ|VM_PROT_WRITE, - PTE_NOCACHE, - }, + { IXP425_IO_VBASE, IXP425_IO_HWBASE, IXP425_IO_SIZE, + VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, /* Expansion Bus */ - { - IXP425_EXP_VBASE, - IXP425_EXP_HWBASE, - IXP425_EXP_SIZE, - VM_PROT_READ|VM_PROT_WRITE, - PTE_NOCACHE, - }, + { IXP425_EXP_VBASE, IXP425_EXP_HWBASE, IXP425_EXP_SIZE, + VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, /* IXP425 PCI Configuration */ - { - IXP425_PCI_VBASE, - IXP425_PCI_HWBASE, - IXP425_PCI_SIZE, - VM_PROT_READ|VM_PROT_WRITE, - PTE_NOCACHE, - }, + { IXP425_PCI_VBASE, IXP425_PCI_HWBASE, IXP425_PCI_SIZE, + VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, /* SDRAM Controller */ - { - IXP425_MCU_VBASE, - IXP425_MCU_HWBASE, - IXP425_MCU_SIZE, - VM_PROT_READ|VM_PROT_WRITE, - PTE_NOCACHE, - }, + { IXP425_MCU_VBASE, IXP425_MCU_HWBASE, IXP425_MCU_SIZE, + VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, /* PCI Memory Space */ - { - IXP425_PCI_MEM_VBASE, - IXP425_PCI_MEM_HWBASE, - IXP425_PCI_MEM_SIZE, - VM_PROT_READ|VM_PROT_WRITE, - PTE_NOCACHE, - }, + { IXP425_PCI_MEM_VBASE, IXP425_PCI_MEM_HWBASE, IXP425_PCI_MEM_SIZE, + VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, + + /* Q-Mgr Memory Space */ + { IXP425_QMGR_VBASE, IXP425_QMGR_HWBASE, IXP425_QMGR_SIZE, + VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, + /* NPE-A Memory Space */ - { - IXP425_NPE_A_VBASE, - IXP425_NPE_A_HWBASE, - IXP425_NPE_A_SIZE, - VM_PROT_READ|VM_PROT_WRITE, - PTE_NOCACHE, - }, + { IXP425_NPE_A_VBASE, IXP425_NPE_A_HWBASE, IXP425_NPE_A_SIZE, + VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, /* NPE-B Memory Space */ - { - IXP425_NPE_B_VBASE, - IXP425_NPE_B_HWBASE, - IXP425_NPE_B_SIZE, - VM_PROT_READ|VM_PROT_WRITE, - PTE_NOCACHE, - }, + { IXP425_NPE_B_VBASE, IXP425_NPE_B_HWBASE, IXP425_NPE_B_SIZE, + VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, /* NPE-C Memory Space */ - { - IXP425_NPE_C_VBASE, - IXP425_NPE_C_HWBASE, - IXP425_NPE_C_SIZE, - VM_PROT_READ|VM_PROT_WRITE, - PTE_NOCACHE, - }, + { IXP425_NPE_C_VBASE, IXP425_NPE_C_HWBASE, IXP425_NPE_C_SIZE, + VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, + /* MAC-A Memory Space */ - { - IXP425_MAC_A_VBASE, - IXP425_MAC_A_HWBASE, - IXP425_MAC_A_SIZE, - VM_PROT_READ|VM_PROT_WRITE, - PTE_NOCACHE, - }, + { IXP425_MAC_A_VBASE, IXP425_MAC_A_HWBASE, IXP425_MAC_A_SIZE, + VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, /* MAC-B Memory Space */ - { - IXP425_MAC_B_VBASE, - IXP425_MAC_B_HWBASE, - IXP425_MAC_B_SIZE, - VM_PROT_READ|VM_PROT_WRITE, - PTE_NOCACHE, - }, + { IXP425_MAC_B_VBASE, IXP425_MAC_B_HWBASE, IXP425_MAC_B_SIZE, + VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, + + { 0 }, +}; + +/* Static device mappings. */ +static const struct pmap_devmap ixp435_devmap[] = { + /* Physical/Virtual address for I/O space */ + { IXP425_IO_VBASE, IXP425_IO_HWBASE, IXP425_IO_SIZE, + VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, + + /* Expansion Bus */ + { IXP425_EXP_VBASE, IXP425_EXP_HWBASE, IXP425_EXP_SIZE, + VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, + + /* IXP425 PCI Configuration */ + { IXP425_PCI_VBASE, IXP425_PCI_HWBASE, IXP425_PCI_SIZE, + VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, + + /* DDRII Controller NB: mapped same place as IXP425 */ + { IXP435_MCU_VBASE, IXP435_MCU_HWBASE, IXP435_MCU_SIZE, + VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, + + /* PCI Memory Space */ + { IXP425_PCI_MEM_VBASE, IXP425_PCI_MEM_HWBASE, IXP425_PCI_MEM_SIZE, + VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, + /* Q-Mgr Memory Space */ - { - IXP425_QMGR_VBASE, - IXP425_QMGR_HWBASE, - IXP425_QMGR_SIZE, - VM_PROT_READ|VM_PROT_WRITE, - PTE_NOCACHE, - }, + { IXP425_QMGR_VBASE, IXP425_QMGR_HWBASE, IXP425_QMGR_SIZE, + VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, + + /* NPE-A Memory Space */ + { IXP425_NPE_A_VBASE, IXP425_NPE_A_HWBASE, IXP425_NPE_A_SIZE, + VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, + /* NPE-C Memory Space */ + { IXP425_NPE_C_VBASE, IXP425_NPE_C_HWBASE, IXP425_NPE_C_SIZE, + VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, + + /* MAC-C Memory Space */ + { IXP435_MAC_C_VBASE, IXP435_MAC_C_HWBASE, IXP435_MAC_C_SIZE, + VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, + /* MAC-A Memory Space */ + { IXP435_MAC_A_VBASE, IXP435_MAC_A_HWBASE, IXP435_MAC_A_SIZE, + VM_PROT_READ|VM_PROT_WRITE, PTE_NOCACHE, }, - { - 0, - 0, - 0, - 0, - 0, - } + { 0 } }; extern vm_offset_t xscale_cache_clean_addr; @@ -265,7 +250,7 @@ vm_offset_t lastaddr; uint32_t memsize; - set_cpufuncs(); + set_cpufuncs(); /* NB: sets cputype */ lastaddr = fake_preload_metadata(); pcpu_init(pcpup, 0, sizeof(struct pcpu)); PCPU_SET(curthread, &thread0); @@ -400,7 +385,10 @@ /* Map the vector page. */ pmap_map_entry(l1pagetable, ARM_VECTORS_HIGH, systempage.pv_pa, VM_PROT_READ|VM_PROT_WRITE, PTE_CACHE); - pmap_devmap_bootstrap(l1pagetable, ixp425_devmap); + if (cpu_is_ixp43x()) + pmap_devmap_bootstrap(l1pagetable, ixp435_devmap); + else + pmap_devmap_bootstrap(l1pagetable, ixp425_devmap); /* * Give the XScale global cache clean code an appropriately * sized chunk of unmapped VA space starting at 0xff000000 @@ -436,12 +424,16 @@ * this problem will not occur after initarm(). */ cpu_idcache_wbinv_all(); + /* ready to setup the console (XXX move earlier if possible) */ + cninit(); /* - * Fetch the SDRAM start/size from the ixp425 SDRAM configration - * registers. + * Fetch the RAM size from the MCU registers. The + * expansion bus was mapped above so we can now read 'em. */ - cninit(); - memsize = ixp425_sdram_size(); + if (cpu_is_ixp43x()) + memsize = ixp435_ddram_size(); + else + memsize = ixp425_sdram_size(); physmem = memsize / PAGE_SIZE; /* Set stack for exception handlers */ From owner-p4-projects@FreeBSD.ORG Sat Nov 29 18:41:13 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 15CBE106567D; Sat, 29 Nov 2008 18:41:13 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B4ACF106567A for ; Sat, 29 Nov 2008 18:41:12 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9E1B28FC0A for ; Sat, 29 Nov 2008 18:41:12 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mATIfCQj082192 for ; Sat, 29 Nov 2008 18:41:12 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mATIfCpc082190 for perforce@freebsd.org; Sat, 29 Nov 2008 18:41:12 GMT (envelope-from sam@freebsd.org) Date: Sat, 29 Nov 2008 18:41:12 GMT Message-Id: <200811291841.mATIfCpc082190@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 153777 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, 29 Nov 2008 18:41:13 -0000 http://perforce.freebsd.org/chv.cgi?CH=153777 Change 153777 by sam@sam_ebb on 2008/11/29 18:40:51 Improve configuarability, add ixp435 support, and other fixups: o change static configation state to use NPE id's instead of port #'s; this allows board descriptions to be more portable and more understandable (e.g. it's simpler to compare to the IAL and linux code bases) o add support for ixp435/Cambria boards o change npe init setup to be done by npeid instead of unit# so npe code doesn't need to translate o add support for hints override of npeid and imageid o add some error msgs for improbable conditions o hack "fix rx q setup" issue; this was a reminder that if we tried to map all 8 traffic classifications to our rx q the npe firmware would hang; this looks to be dependent on the firmware--if we're running vanilla Ethernet support it only groks 4 classifications, 8 when QoS+VLAN support is present; use the f/w image features id to decide how many to map NB: the 2nd port on the Cambria board doesn't work but this is likely because we have the wrong firmware; still working on that. Affected files ... .. //depot/projects/vap/sys/arm/xscale/ixp425/if_npe.c#6 edit .. //depot/projects/vap/sys/arm/xscale/ixp425/if_npereg.h#3 edit .. //depot/projects/vap/sys/arm/xscale/ixp425/ixp425_npe.c#3 edit .. //depot/projects/vap/sys/arm/xscale/ixp425/ixp425_npevar.h#3 edit Differences ... ==== //depot/projects/vap/sys/arm/xscale/ixp425/if_npe.c#6 (text+ko) ==== @@ -85,6 +85,8 @@ #include #include +#include + #include "miibus_if.h" /* @@ -121,6 +123,7 @@ bus_space_handle_t sc_ioh; /* MAC register window */ device_t sc_mii; /* child miibus */ bus_space_handle_t sc_miih; /* MII register window */ + int sc_npeid; struct ixpnpe_softc *sc_npe; /* NPE support */ int sc_debug; /* DPRINTF* control */ int sc_tickinterval; @@ -143,7 +146,7 @@ }; /* - * Per-unit static configuration for IXP425. The tx and + * Static configuration for IXP425. The tx and * rx free Q id's are fixed by the NPE microcode. The * rx Q id's are programmed to be separate to simplify * multi-port processing. It may be better to handle @@ -154,11 +157,9 @@ * assumptions probably need to be handled through hints. */ static const struct { - const char *desc; /* device description */ - int npeid; /* NPE assignment */ - uint32_t imageid; /* NPE firmware image id */ - uint32_t regbase; - int regsize; + uint32_t imageid; /* default fw image */ + uint32_t macbase; + int macsize; uint32_t miibase; int miisize; int phy; /* phy id */ @@ -166,12 +167,23 @@ uint8_t rx_freeqid; uint8_t tx_qid; uint8_t tx_doneqid; -} npeconfig[NPE_PORTS_MAX] = { - { .desc = "IXP NPE-B", - .npeid = NPE_B, +} npeconfig[NPE_MAX] = { + [NPE_A] = { + .imageid = IXP425_NPE_A_IMAGEID, + .macbase = IXP435_MAC_A_HWBASE, + .macsize = IXP435_MAC_A_SIZE, + .miibase = IXP435_MAC_A_HWBASE, + .miisize = IXP435_MAC_A_SIZE, + .phy = 2, + .rx_qid = 4, + .rx_freeqid = 27, + .tx_qid = 24, + .tx_doneqid = 31 + }, + [NPE_B] = { .imageid = IXP425_NPE_B_IMAGEID, - .regbase = IXP425_MAC_A_HWBASE, - .regsize = IXP425_MAC_A_SIZE, + .macbase = IXP425_MAC_A_HWBASE, + .macsize = IXP425_MAC_A_SIZE, .miibase = IXP425_MAC_A_HWBASE, .miisize = IXP425_MAC_A_SIZE, .phy = 0, @@ -180,11 +192,10 @@ .tx_qid = 24, .tx_doneqid = 31 }, - { .desc = "IXP NPE-C", - .npeid = NPE_C, + [NPE_C] = { .imageid = IXP425_NPE_C_IMAGEID, - .regbase = IXP425_MAC_B_HWBASE, - .regsize = IXP425_MAC_B_SIZE, + .macbase = IXP425_MAC_B_HWBASE, + .macsize = IXP425_MAC_B_SIZE, .miibase = IXP425_MAC_A_HWBASE, .miisize = IXP425_MAC_A_SIZE, .phy = 1, @@ -219,6 +230,7 @@ static devclass_t npe_devclass; +static int override_npeid(device_t, const char *resname, int *val); static int npe_activate(device_t dev); static void npe_deactivate(device_t dev); static int npe_ifmedia_update(struct ifnet *ifp); @@ -275,16 +287,38 @@ TUNABLE_INT("hw.npe.txbuf", &npe_txbuf); static int +unit2npeid(int unit) +{ + static const int npeidmap[2][3] = { + /* on 425 A is for HSS, B & C are for Ethernet */ + { NPE_B, NPE_C, -1 }, /* IXP425 */ + /* 435 only has A & C, order C then A */ + { NPE_C, NPE_A, -1 }, /* IXP435 */ + }; + /* XXX check feature register instead */ + return (unit < 3 ? npeidmap[ + (cpu_id() & CPU_ID_CPU_MASK) == CPU_ID_IXP435][unit] : -1); +} + +static int npe_probe(device_t dev) { - int unit = device_get_unit(dev); + static const char *desc[NPE_MAX] = { + [NPE_A] = "IXP NPE-A", + [NPE_B] = "IXP NPE-B", + [NPE_C] = "IXP NPE-C" + }; + int npeid; - if (unit >= NPE_PORTS_MAX) { - device_printf(dev, "unit %d not supported\n", unit); + npeid = -1; + if (!override_npeid(dev, "npeid", &npeid)) + npeid = unit2npeid(device_get_unit(dev)); + if (npeid == -1) { + device_printf(dev, "unit not supported\n"); return EINVAL; } /* XXX check feature register to see if enabled */ - device_set_desc(dev, npeconfig[unit].desc); + device_set_desc(dev, desc[npeid]); return 0; } @@ -306,22 +340,27 @@ sc->sc_debug = npe_debug; sc->sc_tickinterval = npe_tickinterval; - sc->sc_npe = ixpnpe_attach(dev); + if (!override_npeid(dev, "npeid", &sc->sc_npeid)) + sc->sc_npeid = unit2npeid(device_get_unit(dev)); + sc->sc_npe = ixpnpe_attach(dev, sc->sc_npeid); if (sc->sc_npe == NULL) { + device_printf(dev, "cannot attach ixpnpe.\n"); error = EIO; /* XXX */ goto out; } error = npe_activate(dev); - if (error) + if (error) { + device_printf(dev, "cannot activate npe.\n"); goto out; + } npe_getmac(sc, eaddr); /* NB: must be setup prior to invoking mii code */ sc->sc_ifp = ifp = if_alloc(IFT_ETHER); if (mii_phy_probe(dev, &sc->sc_mii, npe_ifmedia_update, npe_ifmedia_status)) { - device_printf(dev, "Cannot find my PHY.\n"); + device_printf(dev, "cannot find my PHY.\n"); error = ENXIO; goto out; } @@ -548,6 +587,34 @@ } static int +npe_macaddr(int npeid, int *base, int *size) +{ + if (npeid == NPE_A) { + if ((cpu_id() & CPU_ID_CPU_MASK) == CPU_ID_IXP435) { + *base = IXP435_MAC_A_HWBASE; + *size = IXP435_MAC_A_SIZE; + } else { + *base = IXP425_MAC_A_HWBASE; + *size = IXP425_MAC_A_SIZE; + } + return 0; + } else if (npeid == NPE_B) { + if ((cpu_id() & CPU_ID_CPU_MASK) != CPU_ID_IXP435) { + *base = IXP425_MAC_B_HWBASE; + *size = IXP425_MAC_B_SIZE; + return 0; + } + } else if (npeid == NPE_C) { + if ((cpu_id() & CPU_ID_CPU_MASK) == CPU_ID_IXP435) { + *base = IXP435_MAC_C_HWBASE; + *size = IXP435_MAC_C_SIZE; + return 0; + } + } + return EINVAL; +} + +static int override_addr(device_t dev, const char *resname, int *base, int *size) { int unit = device_get_unit(dev); @@ -558,14 +625,42 @@ return 0; switch (resval[0]) { case 'A': - *base = IXP425_MAC_A_HWBASE; - *size = IXP425_MAC_A_SIZE; + npe_macaddr(NPE_A, base, size); break; case 'B': - *base = IXP425_MAC_B_HWBASE; - *size = IXP425_MAC_B_SIZE; + if (npe_macaddr(NPE_B, base, size) != 0) + goto bad; + break; + case 'C': + if (npe_macaddr(NPE_C, base, size) != 0) + goto bad; break; default: + bad: + device_printf(dev, "Warning, bad value %s for " + "npe.%d.%s ignored\n", resval, unit, resname); + return 0; + } + if (bootverbose) + device_printf(dev, "using npe.%d.%s=%s override\n", + unit, resname, resval); + return 1; +} + +static int +override_npeid(device_t dev, const char *resname, int *npeid) +{ + int unit = device_get_unit(dev); + const char *resval; + + /* XXX warn for wrong hint type */ + if (resource_string_value("npe", unit, resname, &resval) != 0) + return 0; + switch (resval[0]) { + case 'A': *npeid = NPE_A; break; + case 'B': *npeid = NPE_B; break; + case 'C': *npeid = NPE_C; break; + default: device_printf(dev, "Warning, bad value %s for " "npe.%d.%s ignored\n", resval, unit, resname); return 0; @@ -598,11 +693,26 @@ } static int +override_imageid(device_t dev, const char *resname, uint32_t *val) +{ + int unit = device_get_unit(dev); + int resval; + + if (resource_int_value("npe", unit, resname, &resval) != 0) + return 0; + /* XXX validate */ + if (bootverbose) + device_printf(dev, "using npe.%d.%s=0x%x override\n", + unit, resname, resval); + *val = resval; + return 1; +} + +static int npe_activate(device_t dev) { struct npe_softc * sc = device_get_softc(dev); - int unit = device_get_unit(dev); - int error, i, regbase, regsize, miibase, miisize; + int error, i, macbase, macsize, miibase, miisize; uint32_t imageid; /* @@ -611,42 +721,49 @@ * the firmware image starting with the expected version * and then bump the minor version up to the max. */ - imageid = npeconfig[unit].imageid; + if (!override_imageid(dev, "imageid", &imageid)) + imageid = npeconfig[sc->sc_npeid].imageid; for (;;) { error = ixpnpe_init(sc->sc_npe, "npe_fw", imageid); if (error == 0) break; /* ESRCH is returned when the requested image is not present */ - if (error != ESRCH) + if (error != ESRCH) { + device_printf(dev, "cannot init NPE (error %d)\n", + error); return error; + } /* bump the minor version up to the max possible */ - if (NPEIMAGE_MINOR(imageid) == 0xff) + if (NPEIMAGE_MINOR(imageid) == 0xff) { + device_printf(dev, "cannot locate firmware " + "(imageid 0x%08x)\n", imageid); return error; + } imageid++; } - if (!override_addr(dev, "mac", ®base, ®size)) { - regbase = npeconfig[unit].regbase; - regbase = npeconfig[unit].regsize; + if (!override_addr(dev, "mac", &macbase, &macsize)) { + macbase = npeconfig[sc->sc_npeid].macbase; + macsize = npeconfig[sc->sc_npeid].macsize; } - if (bus_space_map(sc->sc_iot, regbase, regsize, 0, &sc->sc_ioh)) { - device_printf(dev, "Cannot map registers 0x%x:0x%x\n", - regbase, regsize); + if (bus_space_map(sc->sc_iot, macbase, macsize, 0, &sc->sc_ioh)) { + device_printf(dev, "cannot map mac registers 0x%x:0x%x\n", + macbase, macsize); return ENOMEM; } if (!override_addr(dev, "mii", &miibase, &miisize)) { - miibase = npeconfig[unit].miibase; - miisize = npeconfig[unit].miisize; + miibase = npeconfig[sc->sc_npeid].miibase; + miisize = npeconfig[sc->sc_npeid].miisize; } - if (miibase != regbase) { + if (miibase != macbase) { /* * PHY is mapped through a different MAC, setup an * additional mapping for frobbing the PHY registers. */ if (bus_space_map(sc->sc_iot, miibase, miisize, 0, &sc->sc_miih)) { device_printf(dev, - "Cannot map MII registers 0x%x:0x%x\n", + "cannot map MII registers 0x%x:0x%x\n", miibase, miisize); return ENOMEM; } @@ -703,22 +820,21 @@ * when the rx q has at least one frame. These setings can * changed at the time the q is configured. */ - sc->rx_qid = npeconfig[unit].rx_qid; + sc->rx_qid = npeconfig[sc->sc_npeid].rx_qid; ixpqmgr_qconfig(sc->rx_qid, npe_rxbuf, 0, 1, IX_QMGR_Q_SOURCE_ID_NOT_E, npe_rxdone, sc); - sc->rx_freeqid = npeconfig[unit].rx_freeqid; + sc->rx_freeqid = npeconfig[sc->sc_npeid].rx_freeqid; ixpqmgr_qconfig(sc->rx_freeqid, npe_rxbuf, 0, npe_rxbuf/2, 0, NULL, sc); - /* tell the NPE to direct all traffic to rx_qid */ -#if 0 - for (i = 0; i < 8; i++) -#else -device_printf(sc->sc_dev, "remember to fix rx q setup\n"); - for (i = 0; i < 4; i++) -#endif + /* + * Setup the NPE to direct all traffic to rx_qid. + * When QoS is enabled in the firmware there are + * 8 traffic classes; otherwise just 4. + */ + for (i = 0; i < (imageid & 0xf0000 ? 8 : 4); i++) npe_setrxqosentry(sc, i, 0, sc->rx_qid); - sc->tx_qid = npeconfig[unit].tx_qid; - sc->tx_doneqid = npeconfig[unit].tx_doneqid; + sc->tx_qid = npeconfig[sc->sc_npeid].tx_qid; + sc->tx_doneqid = npeconfig[sc->sc_npeid].tx_doneqid; ixpqmgr_qconfig(sc->tx_qid, npe_txbuf, 0, npe_txbuf, 0, NULL, sc); if (tx_doneqid == -1) { ixpqmgr_qconfig(sc->tx_doneqid, npe_txbuf, 0, 2, @@ -731,11 +847,11 @@ * to handle different board configs. */ if (!override_unit(dev, "phy", &sc->sc_phy, 0, MII_NPHY-1)) - sc->sc_phy = npeconfig[unit].phy; + sc->sc_phy = npeconfig[sc->sc_npeid].phy; - KASSERT(npes[npeconfig[unit].npeid] == NULL, - ("npe %u already setup", npeconfig[unit].npeid)); - npes[npeconfig[unit].npeid] = sc; + KASSERT(npes[sc->sc_npeid] == NULL, + ("npe %u already setup", sc->sc_npeid)); + npes[sc->sc_npeid] = sc; return 0; } @@ -744,9 +860,8 @@ npe_deactivate(device_t dev) { struct npe_softc *sc = device_get_softc(dev); - int unit = device_get_unit(dev); - npes[npeconfig[unit].npeid] = NULL; + npes[sc->sc_npeid] = NULL; /* XXX disable q's */ if (sc->sc_npe != NULL) @@ -1470,10 +1585,9 @@ static int npe_setrxqosentry(struct npe_softc *sc, int classix, int trafclass, int qid) { - int npeid = npeconfig[device_get_unit(sc->sc_dev)].npeid; uint32_t msg[2]; - msg[0] = (NPE_SETRXQOSENTRY << 24) | (npeid << 20) | classix; + msg[0] = (NPE_SETRXQOSENTRY << 24) | (sc->sc_npeid << 20) | classix; msg[1] = (trafclass << 24) | (1 << 23) | (qid << 16) | (qid << 4); return ixpnpe_sendandrecvmsg(sc->sc_npe, msg, msg); } ==== //depot/projects/vap/sys/arm/xscale/ixp425/if_npereg.h#3 (text+ko) ==== @@ -84,12 +84,6 @@ } ix_ne[NPE_MAXSEG]; }; -/* NPE ID's */ -#define NPE_A 0 -#define NPE_B 1 -#define NPE_C 2 -#define NPE_MAX (NPE_C+1) - #define NPE_PORTS_MAX 2 /* logical ports */ #define NPE_FRAME_SIZE_DEFAULT 1536 #define NPE_FRAME_SIZE_MAX (65536-64) ==== //depot/projects/vap/sys/arm/xscale/ixp425/ixp425_npe.c#3 (text+ko) ==== @@ -246,12 +246,48 @@ } struct ixpnpe_softc * -ixpnpe_attach(device_t dev) +ixpnpe_attach(device_t dev, int npeid) { + struct npeconfig { + uint32_t base; + uint32_t size; + int irq; + uint32_t ins_memsize; + uint32_t data_memsize; + }; + static const struct npeconfig npeconfigs[NPE_MAX] = { + [NPE_A] = { + .base = IXP425_NPE_A_HWBASE, + .size = IXP425_NPE_A_SIZE, + .irq = IXP425_INT_NPE_A, + .ins_memsize = IX_NPEDL_INS_MEMSIZE_WORDS_NPEA, + .data_memsize = IX_NPEDL_DATA_MEMSIZE_WORDS_NPEA + }, + [NPE_B] = { + .base = IXP425_NPE_B_HWBASE, + .size = IXP425_NPE_B_SIZE, + .irq = IXP425_INT_NPE_B, + .ins_memsize = IX_NPEDL_INS_MEMSIZE_WORDS_NPEB, + .data_memsize = IX_NPEDL_DATA_MEMSIZE_WORDS_NPEB + }, + [NPE_C] = { + .base = IXP425_NPE_C_HWBASE, + .size = IXP425_NPE_C_SIZE, + .irq = IXP425_INT_NPE_C, + .ins_memsize = IX_NPEDL_INS_MEMSIZE_WORDS_NPEC, + .data_memsize = IX_NPEDL_DATA_MEMSIZE_WORDS_NPEC + }, + }; struct ixp425_softc *sa = device_get_softc(device_get_parent(dev)); struct ixpnpe_softc *sc; - bus_addr_t base; - int rid, irq; + const struct npeconfig *config; + int rid; + + if (npeid >= NPE_MAX) { + device_printf(dev, "bad npeid %d passed to %s\n", npeid, __func__); + return NULL; + } + config = &npeconfigs[npeid]; /* XXX M_BUS */ sc = malloc(sizeof(struct ixpnpe_softc), M_TEMP, M_WAITOK | M_ZERO); @@ -259,26 +295,11 @@ sc->sc_iot = sa->sc_iot; mtx_init(&sc->sc_mtx, device_get_nameunit(dev), "npe driver", MTX_DEF); - if (device_get_unit(dev) == 0) { - base = IXP425_NPE_B_HWBASE; - sc->sc_size = IXP425_NPE_B_SIZE; - irq = IXP425_INT_NPE_B; + sc->sc_size = config->size; + sc->insMemSize = config->ins_memsize; /* size of instruction memory */ + sc->dataMemSize = config->data_memsize; /* size of data memory */ - /* size of instruction memory */ - sc->insMemSize = IX_NPEDL_INS_MEMSIZE_WORDS_NPEB; - /* size of data memory */ - sc->dataMemSize = IX_NPEDL_DATA_MEMSIZE_WORDS_NPEB; - } else { - base = IXP425_NPE_C_HWBASE; - sc->sc_size = IXP425_NPE_C_SIZE; - irq = IXP425_INT_NPE_C; - - /* size of instruction memory */ - sc->insMemSize = IX_NPEDL_INS_MEMSIZE_WORDS_NPEC; - /* size of data memory */ - sc->dataMemSize = IX_NPEDL_DATA_MEMSIZE_WORDS_NPEC; - } - if (bus_space_map(sc->sc_iot, base, sc->sc_size, 0, &sc->sc_ioh)) + if (bus_space_map(sc->sc_iot, config->base, sc->sc_size, 0, &sc->sc_ioh)) panic("%s: Cannot map registers", device_get_name(dev)); /* @@ -286,9 +307,9 @@ */ rid = 0; sc->sc_irq = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, - irq, irq, 1, RF_ACTIVE); + config->irq, config->irq, 1, RF_ACTIVE); if (!sc->sc_irq) - panic("%s: Unable to allocate irq %u", device_get_name(dev), irq); + panic("%s: Unable to allocate irq %u", device_get_name(dev), config->irq); /* XXX could be a source of entropy */ bus_setup_intr(dev, sc->sc_irq, INTR_TYPE_NET | INTR_MPSAFE, NULL, ixpnpe_intr, sc, &sc->sc_ih); @@ -1326,7 +1347,7 @@ error = EIO; if (error) - device_printf(sc->sc_dev, "input FIFO timeout, msg [0x%x,0x%x]\n", + device_printf(sc->sc_dev, "input FIFO timeout, msg [0x%08x,0x%08x]\n", msg[0], msg[1]); return error; } ==== //depot/projects/vap/sys/arm/xscale/ixp425/ixp425_npevar.h#3 (text+ko) ==== @@ -95,11 +95,18 @@ #define NPEFW_B_DMA 0x01020100 /* DMA only */ /* XXX ... more not include */ +/* NPE ID's */ +#define NPE_A 0 +#define NPE_B 1 +#define NPE_C 2 +#define NPE_MAX (NPE_C+1) + +#define IXP425_NPE_A_IMAGEID 0x10800200 #define IXP425_NPE_B_IMAGEID 0x01000200 #define IXP425_NPE_C_IMAGEID 0x02000200 struct ixpnpe_softc; -struct ixpnpe_softc *ixpnpe_attach(device_t); +struct ixpnpe_softc *ixpnpe_attach(device_t, int npeid); void ixpnpe_detach(struct ixpnpe_softc *); int ixpnpe_stopandreset(struct ixpnpe_softc *); int ixpnpe_start(struct ixpnpe_softc *); From owner-p4-projects@FreeBSD.ORG Sat Nov 29 18:42:14 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 061751065675; Sat, 29 Nov 2008 18:42:14 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A66681065672 for ; Sat, 29 Nov 2008 18:42:13 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9138B8FC18 for ; Sat, 29 Nov 2008 18:42:13 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mATIgDkE082259 for ; Sat, 29 Nov 2008 18:42:13 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mATIgDdn082257 for perforce@freebsd.org; Sat, 29 Nov 2008 18:42:13 GMT (envelope-from sam@freebsd.org) Date: Sat, 29 Nov 2008 18:42:13 GMT Message-Id: <200811291842.mATIgDdn082257@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 153778 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, 29 Nov 2008 18:42:14 -0000 http://perforce.freebsd.org/chv.cgi?CH=153778 Change 153778 by sam@sam_ebb on 2008/11/29 18:41:30 add ixp435 and Cambria-specific definitions Affected files ... .. //depot/projects/vap/sys/arm/xscale/ixp425/ixp425reg.h#3 edit Differences ... ==== //depot/projects/vap/sys/arm/xscale/ixp425/ixp425reg.h#3 (text+ko) ==== @@ -64,7 +64,7 @@ * * 4000 0000 --------------------------- * SDRAM - * 1000 0000 --------------------------- + * 0000 0000 --------------------------- */ /* @@ -115,6 +115,11 @@ #define IXP425_MAC_B_OFFSET 0x0000a000UL #define IXP425_USB_OFFSET 0x0000b000UL +#define IXP435_MAC_C_OFFSET 0x0000a000UL /* Ethernet MAC on NPE C */ +#define IXP435_MAC_A_OFFSET 0x0000c000UL /* Ethernet MAC on NPE A */ +#define IXP435_USB1_OFFSET 0x0000d000UL /* USB host controller 1 */ +#define IXP435_USB2_OFFSET 0x0000e000UL /* USB host controller 2 */ + #define IXP425_REG_SIZE 0x1000 /* @@ -224,6 +229,18 @@ #define IXP425_INT_NPE_B 1 /* NPE B */ #define IXP425_INT_NPE_A 0 /* NPE A */ +/* NB: IXP435 has an additional 32 IRQ's */ +#define IXP435_INT_STATUS2 (IXP425_IRQ_VBASE + 0x20) +#define IXP435_INT_ENABLE2 (IXP425_IRQ_VBASE + 0x24) +#define IXP435_INT_SELECT2 (IXP425_IRQ_VBASE + 0x28) +#define IXP435_IRQ_STATUS2 (IXP425_IRQ_VBASE + 0x2C) +#define IXP435_FIQ_STATUS2 (IXP425_IRQ_VBASE + 0x30) + +#define IXP435_INT_USB0 32 /* USB Host 2.0 Host 0 */ +#define IXP435_INT_USB1 33 /* USB Host 2.0 Host 1 */ +#define IXP435_INT_QMGR_PER 60 /* Queue manager parity error */ +#define IXP435_INT_ECC 61 /* Single or multi-bit ECC error */ + /* * software interrupt */ @@ -239,6 +256,11 @@ (1 << IXP425_INT_bit11))) #define IXP425_INT_GPIOMASK (0x3ff800c0u) +#define IXP435_INT_HWMASK ((1 << (IXP435_INT_USB0 - 32)) | \ + (1 << (IXP435_INT_USB1 - 32)) | \ + (1 << (IXP435_INT_QMGR_PER - 32)) | \ + (1 << (IXP435_INT_ECC - 32))) + /* * GPIO */ @@ -491,6 +513,30 @@ #define MCU_SDR_IR 0x08 /* + * IXP435 DDR MCU Registers + */ +#define IXP435_MCU_HWBASE 0xcc00e500UL +#define IXP435_MCU_VBASE 0xf0200000UL /* NB: use same addr as 425 */ +#define IXP435_MCU_SIZE 0x1000 /* NB: does not map all regs */ +#define MCU_DDR_SDIR 0x00 /* DDR SDAM Initialization Reg*/ +#define MCU_DDR_SDCR0 0x04 /* DDR SDRAM Control Reg 0 */ +#define MCU_DDR_SDCR1 0x08 /* DDR SDRAM Control Reg 1 */ +#define MCU_DDR_SDBR 0x0c /* SDRAM Base Register */ +#define MCU_DDR_SBR0 0x10 /* SDRAM Boundary Register 0 */ +#define MCU_DDR_SBR1 0x14 /* SDRAM Boundary Register 1 */ +#define MCU_DDR_ECCR 0x1c /* ECC Control Register */ +#define MCU_DDR_ELOG0 0x20 /* ECC Log Register 0 */ +#define MCU_DDR_ELOG1 0x24 /* ECC Log Register 1 */ +#define MCU_DDR_ECAR0 0x28 /* ECC Address Register 0 */ +#define MCU_DDR_ECAR1 0x2c /* ECC Address Register 1 */ +#define MCU_DDR_ECTST 0x30 /* ECC Test Register */ +#define MCU_DDR_MCISR 0x34 /* MC Interrupt Status Reg */ +#define MCU_DDR_MPTCR 0x3c /* MC Port Transaction Cnt Reg*/ +#define MCU_DDR_RFR 0x48 /* Refresh Frequency Register */ +#define MCU_DDR_SDPR(n) (0x50+(n)*4) /* SDRAM Page Register 0-7 */ +/* NB: RCVDLY at 0x1050 and LEGOVERIDE at 0x1074 */ + +/* * Performance Monitoring Unit (CP14) * * CP14.0.1 Performance Monitor Control Register(PMNC) @@ -557,6 +603,14 @@ #define IXP425_MAC_B_VBASE (IXP425_IO_VBASE + IXP425_MAC_B_OFFSET) #define IXP425_MAC_B_SIZE 0x1000 /* Actually only 256 bytes */ +#define IXP435_MAC_A_HWBASE (IXP425_IO_HWBASE + IXP435_MAC_A_OFFSET) +#define IXP435_MAC_A_VBASE (IXP425_IO_VBASE + IXP435_MAC_A_OFFSET) +#define IXP435_MAC_A_SIZE 0x1000 /* Actually only 256 bytes */ + +#define IXP435_MAC_C_HWBASE (IXP425_IO_HWBASE + IXP435_MAC_C_OFFSET) +#define IXP435_MAC_C_VBASE (IXP425_IO_VBASE + IXP435_MAC_C_OFFSET) +#define IXP435_MAC_C_SIZE 0x1000 /* Actually only 256 bytes */ + /* * Expansion Bus Data Space. */ @@ -588,4 +642,25 @@ #define IXP425_EXP_BUS_CS6_HWBASE IXP425_EXP_BUS_CSx_HWBASE(6) #define IXP425_EXP_BUS_CS7_HWBASE IXP425_EXP_BUS_CSx_HWBASE(7) +/* + * IXP435/Gateworks Cambria + * + * Octal status LED latch is in upper 256K of CS3 + * Optional RS485 Serial port is next lower 256K + * Optional GPS Serial port is next lower 256K + * next lower 768K is reserved + * Compact flash socket 1 is next lower 256K + * Compact flash socket 0 is next lower 256K + */ +#define CAMBRIA_OCTAL_LED_HWBASE (IXP425_EXP_BUS_CS4_HWBASE - 0x40000) +#define CAMBRIA_OCTAL_LED_SIZE 0x40000 +#define CAMBRIA_RS485_HWBASE (CAMBRIA_OCTAL_LED_HWBASE - 0x40000) +#define CAMBRIA_RS485_SIZE 0x40000 +#define CAMBRIA_GPS_HWBASE (CAMBRIA_RS485_HWBASE - 0x40000) +#define CAMBRIA_GPS_SIZE 0x40000 +#define CAMBRIA_CFSEL1_HWBASE (CAMBRIA_GPS_HWBASE - 4*0x40000) +#define CAMBRIA_CFSEL1_SIZE 0x40000 +#define CAMBRIA_CFSEL0_HWBASE (CAMBRIA_CFSEL1_HWBASE - 0x40000) +#define CAMBRIA_CFSEL0_SIZE 0x40000 + #endif /* _IXP425REG_H_ */ From owner-p4-projects@FreeBSD.ORG Sat Nov 29 18:43:15 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 55FEE1065680; Sat, 29 Nov 2008 18:43:15 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F1330106564A for ; Sat, 29 Nov 2008 18:43:14 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id DBDE68FC18 for ; Sat, 29 Nov 2008 18:43:14 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mATIhEcR082390 for ; Sat, 29 Nov 2008 18:43:14 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mATIhEGq082388 for perforce@freebsd.org; Sat, 29 Nov 2008 18:43:14 GMT (envelope-from sam@freebsd.org) Date: Sat, 29 Nov 2008 18:43:14 GMT Message-Id: <200811291843.mATIhEGq082388@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 153780 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, 29 Nov 2008 18:43:15 -0000 http://perforce.freebsd.org/chv.cgi?CH=153780 Change 153780 by sam@sam_ebb on 2008/11/29 18:42:54 checkpoint ixp435 work; we're apparently not mapping the MCU registers correctly as their contents looks wrong; need this so we can size DDRAM at boot Affected files ... .. //depot/projects/vap/sys/arm/xscale/ixp425/ixp425_mem.c#3 edit Differences ... ==== //depot/projects/vap/sys/arm/xscale/ixp425/ixp425_mem.c#3 (text+ko) ==== @@ -62,11 +62,10 @@ 0, 0 }; -#define MCU_REG_READ(x) (*(volatile uint32_t *)(IXP425_MCU_VBASE + (x))) - uint32_t ixp425_sdram_size(void) { +#define MCU_REG_READ(x) (*(volatile uint32_t *)(IXP425_MCU_VBASE + (x))) uint32_t size, sdr_config; sdr_config = MCU_REG_READ(MCU_SDR_CONFIG); @@ -82,4 +81,20 @@ } return (size); +#undef MCU_REG_READ +} + +uint32_t +ixp435_ddram_size(void) +{ +#define MCU_REG_READ(x) (*(volatile uint32_t *)(IXP435_MCU_VBASE + (x))) + +printf("sdir 0x%x\n", MCU_REG_READ(MCU_DDR_SDIR));/*XXX*/ +printf("sdcr0 0x%x\n", MCU_REG_READ(MCU_DDR_SDCR0));/*XXX*/ +printf("sdcr1 0x%x\n", MCU_REG_READ(MCU_DDR_SDCR1));/*XXX*/ +printf("sdbr 0x%x\n", MCU_REG_READ(MCU_DDR_SDBR));/*XXX*/ +printf("sbr0 0x%x\n", MCU_REG_READ(MCU_DDR_SBR0));/*XXX*/ +printf("sbr1 0x%x\n", MCU_REG_READ(MCU_DDR_SBR1));/*XXX*/ + return 128*1024*1024; /*XXX*/ +#undef MCU_REG_READ } From owner-p4-projects@FreeBSD.ORG Sat Nov 29 18:44:16 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 622B41065676; Sat, 29 Nov 2008 18:44:16 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2674B1065670 for ; Sat, 29 Nov 2008 18:44:16 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 10DC48FC0A for ; Sat, 29 Nov 2008 18:44:16 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mATIiGGe082467 for ; Sat, 29 Nov 2008 18:44:16 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mATIiGGj082465 for perforce@freebsd.org; Sat, 29 Nov 2008 18:44:16 GMT (envelope-from sam@freebsd.org) Date: Sat, 29 Nov 2008 18:44:16 GMT Message-Id: <200811291844.mATIiGGj082465@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 153781 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, 29 Nov 2008 18:44:16 -0000 http://perforce.freebsd.org/chv.cgi?CH=153781 Change 153781 by sam@sam_ebb on 2008/11/29 18:44:09 o add cpu_is_ixp43x() to check if we're running on an ixp435 o also add cpu_is_ixp46x() though we're not using it; would need this most places we do special work for ixp435 o add decl for ixp435_ddram_size Affected files ... .. //depot/projects/vap/sys/arm/xscale/ixp425/ixp425var.h#3 edit Differences ... ==== //depot/projects/vap/sys/arm/xscale/ixp425/ixp425var.h#3 (text+ko) ==== @@ -47,6 +47,10 @@ #include #include +/* NB: cputype is setup by set_cpufuncs */ +#define cpu_is_ixp43x() (cputype == CPU_ID_IXP435) +#define cpu_is_ixp46x() (cputype == CPU_ID_IXP465) + struct ixp425_softc { device_t sc_dev; bus_space_tag_t sc_iot; @@ -94,6 +98,7 @@ void ixp425_mem_bs_init(bus_space_tag_t, void *); uint32_t ixp425_sdram_size(void); +uint32_t ixp435_ddram_size(void); int ixp425_md_route_interrupt(device_t, device_t, int); void ixp425_md_attach(device_t); From owner-p4-projects@FreeBSD.ORG Sat Nov 29 18:50:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id C84E81065677; Sat, 29 Nov 2008 18:50:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8BCA9106564A for ; Sat, 29 Nov 2008 18:50:22 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 75FF08FC0A for ; Sat, 29 Nov 2008 18:50:22 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mATIoMT8082972 for ; Sat, 29 Nov 2008 18:50:22 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mATIoMpF082970 for perforce@freebsd.org; Sat, 29 Nov 2008 18:50:22 GMT (envelope-from sam@freebsd.org) Date: Sat, 29 Nov 2008 18:50:22 GMT Message-Id: <200811291850.mATIoMpF082970@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 153782 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, 29 Nov 2008 18:50:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=153782 Change 153782 by sam@sam_ebb on 2008/11/29 18:49:25 Checkpoint ixp435/Cambria board support: o there are 64 IRQ's on ixp435, add a second set of masks for the additional registers and fixup related code o strip down the builtin vtophys mapping used to handle alloc_resource requests; this had grown to include many unneeded entries through my ignorance and subsequent cut&paste of others o add a print when we can't allocate a memory resource because we lack a vtophys mapping; this will help folks to add needed entries in the future (or until we can kill this table) o while here clear a bunch of old netbsd cruft from ixp425_intr.h Interrupts work on Cambria but haven't tested any devices that have IRQ's at 32+ (e.g. usb). Affected files ... .. //depot/projects/vap/sys/arm/xscale/ixp425/ixp425.c#5 edit .. //depot/projects/vap/sys/arm/xscale/ixp425/ixp425_intr.h#3 edit Differences ... ==== //depot/projects/vap/sys/arm/xscale/ixp425/ixp425.c#5 (text+ko) ==== @@ -58,59 +58,16 @@ volatile uint32_t intr_enabled; uint32_t intr_steer = 0; +/* ixp43x et. al have +32 IRQ's */ +volatile uint32_t intr_enabled2; +uint32_t intr_steer2 = 0; + struct ixp425_softc *ixp425_softc = NULL; static int ixp425_probe(device_t); static void ixp425_identify(driver_t *, device_t); static int ixp425_attach(device_t); -static struct { - uint32_t hwbase; - uint32_t size; - uint32_t vbase; -} hwvtrans[] = { - { IXP425_IO_HWBASE, IXP425_IO_SIZE, IXP425_IO_VBASE }, - { IXP425_EXP_HWBASE, IXP425_EXP_SIZE, IXP425_EXP_VBASE }, - { IXP425_PCI_HWBASE, IXP425_PCI_SIZE, IXP425_PCI_VBASE }, - { IXP425_PCI_MEM_HWBASE,IXP425_PCI_MEM_SIZE, IXP425_PCI_MEM_VBASE }, -#if 0 - { IXP425_PCI_IO_HWBASE, IXP425_PCI_IO_SIZE, IXP425_PCI_IO_VBASE }, -#endif - { IXP425_MCU_HWBASE, IXP425_MCU_SIZE, IXP425_MCU_VBASE }, - { IXP425_QMGR_HWBASE, IXP425_QMGR_SIZE, IXP425_QMGR_VBASE }, - { IXP425_NPE_A_HWBASE, IXP425_NPE_A_SIZE, IXP425_NPE_A_VBASE }, - { IXP425_NPE_B_HWBASE, IXP425_NPE_B_SIZE, IXP425_NPE_B_VBASE }, - { IXP425_NPE_C_HWBASE, IXP425_NPE_C_SIZE, IXP425_NPE_C_VBASE }, - { IXP425_MAC_A_HWBASE, IXP425_MAC_A_SIZE, IXP425_MAC_A_VBASE }, - { IXP425_MAC_B_HWBASE, IXP425_MAC_B_SIZE, IXP425_MAC_B_VBASE }, - /* Gateworks Avila IDE/CF is mapped here */ - { IXP425_EXP_BUS_CS1_HWBASE, IXP425_EXP_BUS_SIZE, - IXP425_EXP_BUS_CS1_VBASE }, - { IXP425_EXP_BUS_CS2_HWBASE, IXP425_EXP_BUS_SIZE, - IXP425_EXP_BUS_CS2_VBASE }, - /* ADI Pronghorn Metro IDE/CF is mapped here */ - { IXP425_EXP_BUS_CS3_HWBASE, IXP425_EXP_BUS_SIZE, - IXP425_EXP_BUS_CS3_VBASE }, - { IXP425_EXP_BUS_CS4_HWBASE, IXP425_EXP_BUS_SIZE, - IXP425_EXP_BUS_CS4_VBASE }, -}; - -int -getvbase(uint32_t hwbase, uint32_t size, uint32_t *vbase) -{ - int i; - - for (i = 0; i < sizeof hwvtrans / sizeof *hwvtrans; i++) { - if (hwbase >= hwvtrans[i].hwbase && - hwbase + size <= hwvtrans[i].hwbase + hwvtrans[i].size) { - *vbase = hwbase - hwvtrans[i].hwbase + hwvtrans[i].vbase; - return (0); - } - } - - return (ENOENT); -} - struct arm32_dma_range * bus_dma_get_range(void) { @@ -146,11 +103,16 @@ int i; i = disable_interrupts(I32_bit); - intr_enabled &= ~(1 << nb); - ixp425_set_intrmask(); + if (nb < 32) { + intr_enabled &= ~(1 << nb); + ixp425_set_intrmask(); + } else { + intr_enabled2 &= ~(1 << (nb - 32)); + ixp435_set_intrmask(); + } restore_interrupts(i); /*XXX; If it's a GPIO interrupt, ACK it know. Can it be a problem ?*/ - if ((1 << nb) & IXP425_INT_GPIOMASK) + if (nb < 32 && ((1 << nb) & IXP425_INT_GPIOMASK)) IXPREG(IXP425_GPIO_VBASE + IXP425_GPIO_GPISR) = ixp425_irq2gpio_bit(nb); } @@ -161,8 +123,13 @@ int i; i = disable_interrupts(I32_bit); - intr_enabled |= (1 << nb); - ixp425_set_intrmask(); + if (nb < 32) { + intr_enabled |= (1 << nb); + ixp425_set_intrmask(); + } else { + intr_enabled2 |= (1 << (nb - 32)); + ixp435_set_intrmask(); + } restore_interrupts(i); } @@ -172,13 +139,21 @@ return IXPREG(IXP425_INT_STATUS) & intr_enabled; } +static __inline uint32_t +ixp435_irq_read(void) +{ + return IXPREG(IXP435_INT_STATUS2) & intr_enabled2; +} + int arm_get_next_irq(void) { - int irq; + uint32_t irq; if ((irq = ixp425_irq_read())) return (ffs(irq) - 1); + if (cpu_is_ixp43x() && (irq = ixp435_irq_read())) + return (32 + ffs(irq) - 1); return (-1); } @@ -215,31 +190,37 @@ { struct ixp425_softc *sc; +bootverbose=1; sc = device_get_softc(dev); sc->sc_iot = &ixp425_bs_tag; - KASSERT(ixp425_softc == NULL, ("ixp425_attach called twice?")); + KASSERT(ixp425_softc == NULL, ("%s called twice?", __func__)); ixp425_softc = sc; intr_enabled = 0; ixp425_set_intrmask(); ixp425_set_intrsteer(); + if (cpu_is_ixp43x()) { + intr_enabled2 = 0; + ixp435_set_intrmask(); + ixp435_set_intrsteer(); + } if (bus_dma_tag_create(NULL, 1, 0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL, 0xffffffff, 0xff, 0xffffffff, 0, NULL, NULL, &sc->sc_dmat)) - panic("couldn't create the IXP425 dma tag !"); + panic("%s: failed to create dma tag", __func__); sc->sc_irq_rman.rm_type = RMAN_ARRAY; sc->sc_irq_rman.rm_descr = "IXP425 IRQs"; if (rman_init(&sc->sc_irq_rman) != 0 || - rman_manage_region(&sc->sc_irq_rman, 0, 31) != 0) - panic("ixp425_attach: failed to set up IRQ rman"); + rman_manage_region(&sc->sc_irq_rman, 0, cpu_is_ixp43x() ? 63 : 31) != 0) + panic("%s: failed to set up IRQ rman", __func__); sc->sc_mem_rman.rm_type = RMAN_ARRAY; sc->sc_mem_rman.rm_descr = "IXP425 Memory"; if (rman_init(&sc->sc_mem_rman) != 0 || rman_manage_region(&sc->sc_mem_rman, 0, ~0) != 0) - panic("ixp425_attach: failed to set up memory rman"); + panic("%s: failed to set up memory rman", __func__); BUS_ADD_CHILD(dev, 0, "pcib", 0); BUS_ADD_CHILD(dev, 0, "ixpclk", 0); @@ -252,10 +233,10 @@ if (bus_space_map(sc->sc_iot, IXP425_GPIO_HWBASE, IXP425_GPIO_SIZE, 0, &sc->sc_gpio_ioh)) - panic("ixp425_attach: unable to map GPIO registers"); + panic("%s: unable to map GPIO registers", __func__); if (bus_space_map(sc->sc_iot, IXP425_EXP_HWBASE, IXP425_EXP_SIZE, 0, &sc->sc_exp_ioh)) - panic("ixp425_attach: unable to map Expansion Bus registers"); + panic("%s: unable to map Expansion Bus registers", __func__); bus_generic_probe(dev); bus_generic_attach(dev); @@ -317,6 +298,41 @@ return EINVAL; } +/* + * NB: This table handles P->V translations for regions mapped + * through bus_alloc_resource. Anything done with bus_space_map + * is handled elsewhere and does not require an entry here. + * + * XXX getvbase is also used by uart_cpu_getdev (hence public) + */ +static const struct { + uint32_t hwbase; + uint32_t size; + uint32_t vbase; +} hwvtrans[] = { + { IXP425_IO_HWBASE, IXP425_IO_SIZE, IXP425_IO_VBASE }, + { IXP425_PCI_HWBASE, IXP425_PCI_SIZE, IXP425_PCI_VBASE }, + { IXP425_PCI_MEM_HWBASE,IXP425_PCI_MEM_SIZE, IXP425_PCI_MEM_VBASE }, + /* NB: needed only for uart_cpu_getdev */ + { IXP425_UART0_HWBASE, IXP425_REG_SIZE, IXP425_UART0_VBASE }, + { IXP425_UART1_HWBASE, IXP425_REG_SIZE, IXP425_UART1_VBASE }, +}; + +int +getvbase(uint32_t hwbase, uint32_t size, uint32_t *vbase) +{ + int i; + + for (i = 0; i < sizeof hwvtrans / sizeof *hwvtrans; i++) { + if (hwbase >= hwvtrans[i].hwbase && + hwbase + size <= hwvtrans[i].hwbase + hwvtrans[i].size) { + *vbase = hwbase - hwvtrans[i].hwbase + hwvtrans[i].vbase; + return (0); + } + } + return (ENOENT); +} + static struct resource * ixp425_alloc_resource(device_t dev, device_t child, int type, int *rid, u_long start, u_long end, u_long count, u_int flags) @@ -346,8 +362,12 @@ start = addr; end = start + 0x1000; /* XXX */ } - if (getvbase(start, end - start, &vbase)) + if (getvbase(start, end - start, &vbase) != 0) { + /* likely means above table needs to be updated */ + device_printf(dev, "%s: no mapping for 0x%lx:0x%lx\n", + __func__, start, end-start); return NULL; + } rv = rman_reserve_resource(rmanp, start, end, count, flags, child); if (rv != NULL) { @@ -366,22 +386,43 @@ return rv; } +static __inline void +get_masks(struct resource *res, uint32_t *mask, uint32_t *mask2) +{ + int i; + + *mask = 0; + for (i = rman_get_start(res); i < 32 && i <= rman_get_end(res); i++) + *mask |= 1 << i; + *mask2 = 0; + for (; i <= rman_get_end(res); i++) + *mask2 |= 1 << (i - 32); +} + +static __inline void +update_masks(uint32_t mask, uint32_t mask2) +{ + + intr_enabled = mask; + ixp425_set_intrmask(); + if (cpu_is_ixp43x()) { + intr_enabled2 = mask2; + ixp435_set_intrmask(); + } +} + static int ixp425_setup_intr(device_t dev, device_t child, - struct resource *ires, int flags, driver_filter_t *filt, + struct resource *res, int flags, driver_filter_t *filt, driver_intr_t *intr, void *arg, void **cookiep) { - uint32_t mask; - int i; + uint32_t mask, mask2; - BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filt, intr, + BUS_SETUP_INTR(device_get_parent(dev), child, res, flags, filt, intr, arg, cookiep); - mask = 0; - for (i = rman_get_start(ires); i <= rman_get_end(ires); i++) - mask |= 1 << i; - intr_enabled |= mask; - ixp425_set_intrmask(); + get_masks(res, &mask, &mask2); + update_masks(intr_enabled | mask, intr_enabled2 | mask2); return (0); } @@ -390,14 +431,10 @@ ixp425_teardown_intr(device_t dev, device_t child, struct resource *res, void *cookie) { - uint32_t mask; - int i; + uint32_t mask, mask2; - mask = 0; - for (i = rman_get_start(res); i <= rman_get_end(res); i++) - mask |= 1 << i; - intr_enabled &= ~mask; - ixp425_set_intrmask(); + get_masks(res, &mask, &mask2); + update_masks(intr_enabled &~ mask, intr_enabled2 &~ mask2); return (BUS_TEARDOWN_INTR(device_get_parent(dev), child, res, cookie)); } ==== //depot/projects/vap/sys/arm/xscale/ixp425/ixp425_intr.h#3 (text+ko) ==== @@ -69,81 +69,21 @@ IXPREG(IXP425_INT_SELECT) = intr_steer & IXP425_INT_HWMASK; } -#define INT_SWMASK \ - ((1U << IXP425_INT_bit31) | (1U << IXP425_INT_bit30) | \ - (1U << IXP425_INT_bit14) | (1U << IXP425_INT_bit11)) +extern __volatile uint32_t intr_enabled2; +extern uint32_t intr_steer2; -#if 0 static __inline void __attribute__((__unused__)) -ixp425_splx(int new) +ixp435_set_intrmask(void) { - extern __volatile uint32_t intr_enabled; - extern __volatile int current_spl_level; - extern __volatile int ixp425_ipending; - extern void ixp425_do_pending(void); - int oldirqstate, hwpend; - - /* Don't let the compiler re-order this code with preceding code */ - __insn_barrier(); - - current_spl_level = new; - - hwpend = (ixp425_ipending & IXP425_INT_HWMASK) & ~new; - if (hwpend != 0) { - oldirqstate = disable_interrupts(I32_bit); - intr_enabled |= hwpend; - ixp425_set_intrmask(); - restore_interrupts(oldirqstate); - } - - if ((ixp425_ipending & INT_SWMASK) & ~new) - ixp425_do_pending(); + IXPREG(IXP435_INT_ENABLE2) = intr_enabled2 & IXP435_INT_HWMASK; } -static __inline int __attribute__((__unused__)) -ixp425_splraise(int ipl) +static __inline void +ixp435_set_intrsteer(void) { - extern __volatile int current_spl_level; - extern int ixp425_imask[]; - int old; - - old = current_spl_level; - current_spl_level |= ixp425_imask[ipl]; - - /* Don't let the compiler re-order this code with subsequent code */ - __insn_barrier(); - - return (old); + IXPREG(IXP435_INT_SELECT2) = intr_steer2 & IXP435_INT_HWMASK; } -static __inline int __attribute__((__unused__)) -ixp425_spllower(int ipl) -{ - extern __volatile int current_spl_level; - extern int ixp425_imask[]; - int old = current_spl_level; - - ixp425_splx(ixp425_imask[ipl]); - return(old); -} - -#endif -#if !defined(EVBARM_SPL_NOINLINE) - -#define splx(new) ixp425_splx(new) -#define _spllower(ipl) ixp425_spllower(ipl) -#define _splraise(ipl) ixp425_splraise(ipl) -void _setsoftintr(int); - -#else - -int _splraise(int); -int _spllower(int); -void splx(int); -void _setsoftintr(int); - -#endif /* ! EVBARM_SPL_NOINLINE */ - #endif /* _LOCORE */ #endif /* _IXP425_INTR_H_ */ From owner-p4-projects@FreeBSD.ORG Sat Nov 29 18:50:23 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 145E51065748; Sat, 29 Nov 2008 18:50:23 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id ABEDA1065675 for ; Sat, 29 Nov 2008 18:50:22 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 978A18FC0C for ; Sat, 29 Nov 2008 18:50:22 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mATIoMLN082977 for ; Sat, 29 Nov 2008 18:50:22 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mATIoMN9082975 for perforce@freebsd.org; Sat, 29 Nov 2008 18:50:22 GMT (envelope-from sam@freebsd.org) Date: Sat, 29 Nov 2008 18:50:22 GMT Message-Id: <200811291850.mATIoMN9082975@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 153783 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, 29 Nov 2008 18:50:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=153783 Change 153783 by sam@sam_ebb on 2008/11/29 18:50:11 add npe id mapping after npe code changes Affected files ... .. //depot/projects/vap/sys/arm/conf/AVILA.hints#4 edit Differences ... ==== //depot/projects/vap/sys/arm/conf/AVILA.hints#4 (text+ko) ==== @@ -17,14 +17,15 @@ # NPE Hardware Queue Manager hint.ixpqmgr.0.at="ixp0" -# NPE wireless NIC's, requires ixpqmgr +# NPE wired NIC's, requires ixpqmgr hint.npe.0.at="ixp0" +hint.npe.0.npeid="B" hint.npe.0.mac="A" hint.npe.0.mii="A" hint.npe.0.phy=0 hint.npe.1.at="ixp0" +hint.npe.1.npeid="C" hint.npe.1.mac="B" -# NB: on 2348 boards all PHY's are addressed through MAC A hint.npe.1.mii="A" hint.npe.1.phy=1 From owner-p4-projects@FreeBSD.ORG Sat Nov 29 18:55:28 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 866DA106567B; Sat, 29 Nov 2008 18:55:28 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 319A21065673 for ; Sat, 29 Nov 2008 18:55:28 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1D30C8FC0A for ; Sat, 29 Nov 2008 18:55:28 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mATItRk1083350 for ; Sat, 29 Nov 2008 18:55:27 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mATItRUX083348 for perforce@freebsd.org; Sat, 29 Nov 2008 18:55:27 GMT (envelope-from sam@freebsd.org) Date: Sat, 29 Nov 2008 18:55:27 GMT Message-Id: <200811291855.mATItRUX083348@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 153784 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, 29 Nov 2008 18:55:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=153784 Change 153784 by sam@sam_ebb on 2008/11/29 18:54:54 o shuffle board config stuff to the top o switch to ath hal source code use o remove usb for now o remove crypto stuff o enable IEEE80211_DEBUG o remove rl for now (not sure who added it or why) o enable INVARIANTS for now (but see a noticeable penalty) o add MODULES_OVERRIDE as modules are enabled in this branch o turn off a bunch of stuff not usually needed Affected files ... .. //depot/projects/vap/sys/arm/conf/AVILA#15 edit Differences ... ==== //depot/projects/vap/sys/arm/conf/AVILA#15 (text+ko) ==== @@ -23,11 +23,14 @@ # NB: memory mapping is defined in std.avila include "../xscale/ixp425/std.avila" +options XSCALE_CACHE_READ_WRITE_ALLOCATE +#options ARM_USE_SMALL_ALLOC #To statically compile in device wiring instead of /boot/device.hints hints "AVILA.hints" #Default places to look for devices. makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols makeoptions CONF_CFLAGS=-mcpu=xscale +makeoptions MODULES_OVERRIDE="" #options HZ=1000 options HZ=100 options DEVICE_POLLING @@ -36,34 +39,18 @@ options KDB #options GDB options DDB #Enable the kernel debugger -#options INVARIANTS #Enable calls of extra sanity checking -#options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS +options INVARIANTS #Enable calls of extra sanity checking +options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS #options WITNESS #Enable checks to detect deadlocks and cycles #options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed #options DIAGNOSTIC options SCHED_4BSD #4BSD scheduler options INET #InterNETworking -options INET6 #IPv6 communications protocols options FFS #Berkeley Fast Filesystem options SOFTUPDATES #Enable FFS soft updates support -options UFS_ACL #Support for access control lists -options UFS_DIRHASH #Improve performance on big directories options NFSCLIENT #Network Filesystem Client -options NFSSERVER #Network Filesystem Server -options NFSLOCKD #Network Lock Manager options NFS_ROOT #NFS usable as /, requires NFSCLIENT -#options MSDOSFS #MSDOS Filesystem -options CD9660 #ISO 9660 Filesystem -#options PROCFS #Process filesystem (requires PSEUDOFS) -options PSEUDOFS #Pseudo-filesystem framework -options SCSI_DELAY=5000 #Delay (in ms) before probing SCSI -options KTRACE #ktrace(1) support -options SYSVSHM #SYSV-style shared memory -options SYSVMSG #SYSV-style message queues -options SYSVSEM #SYSV-style semaphores -options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions -options KBD_INSTALL_CDEV # install a CDEV entry in /dev options BOOTP options BOOTP_NFSROOT options BOOTP_NFSV3 @@ -100,7 +87,6 @@ device firmware device qmgr # Q Manager (required by npe) device miibus # NB: required by npe -device rl # RealTek 8129/8139 device ether device bpf @@ -108,36 +94,35 @@ device loop device if_bridge -options XSCALE_CACHE_READ_WRITE_ALLOCATE device md device random # Entropy device -#options ARM_USE_SMALL_ALLOC - # Wireless NIC cards device wlan # 802.11 support +options IEEE80211_DEBUG device wlan_wep # 802.11 WEP support device wlan_ccmp # 802.11 CCMP support device wlan_tkip # 802.11 TKIP support device wlan_xauth + device ath # Atheros pci/cardbus NIC's -device ath_hal # Atheros HAL (Hardware Access Layer) +options ATH_DEBUG +options ATH_DIAGAPI +options ATH_TX99_DIAG device ath_rate_sample # SampleRate tx rate control for ath -options ATH_DEBUG -#device crypto -#device cryptodev -#device hifn # NB: Soekris minipci card known to work - -device usb -options USB_DEBUG -device ohci -device ehci -device ugen -device umass -device scbus # SCSI bus (required for SCSI) -device da # Direct Access (disks) - -device ural -device zyd -device wlan_amrr +#options AH_DEBUG +#options AH_ASSERT +#device ath_ar5210 +#device ath_ar5211 +device ath_ar5212 +device ath_rf2413 +device ath_rf2417 +device ath_rf2425 +device ath_rf5111 +device ath_rf5112 +device ath_rf5413 +# +device ath_ar5416 +options AH_SUPPORT_AR5416 +device ath_ar9160 From owner-p4-projects@FreeBSD.ORG Sat Nov 29 18:56:29 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 614C81065678; Sat, 29 Nov 2008 18:56:29 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 241781065670 for ; Sat, 29 Nov 2008 18:56:29 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 0FD398FC1A for ; Sat, 29 Nov 2008 18:56:29 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mATIuTvO083416 for ; Sat, 29 Nov 2008 18:56:29 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mATIuS1S083414 for perforce@freebsd.org; Sat, 29 Nov 2008 18:56:28 GMT (envelope-from sam@freebsd.org) Date: Sat, 29 Nov 2008 18:56:28 GMT Message-Id: <200811291856.mATIuS1S083414@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 153785 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, 29 Nov 2008 18:56:29 -0000 http://perforce.freebsd.org/chv.cgi?CH=153785 Change 153785 by sam@sam_ebb on 2008/11/29 18:55:42 consolidate common defs in toplevel Makefile.inc Affected files ... .. //depot/projects/vap/tools/tools/ath/Makefile.inc#1 add .. //depot/projects/vap/tools/tools/ath/athdebug/Makefile#3 edit .. //depot/projects/vap/tools/tools/ath/athstats/Makefile#7 edit Differences ... ==== //depot/projects/vap/tools/tools/ath/athdebug/Makefile#3 (text+ko) ==== @@ -1,7 +1,7 @@ # $FreeBSD: src/tools/tools/ath/athdebug/Makefile,v 1.2 2006/03/15 10:46:36 ru Exp $ PROG= athdebug -BINDIR= /usr/local/bin -NO_MAN= + +.include <../Makefile.inc> .include ==== //depot/projects/vap/tools/tools/ath/athstats/Makefile#7 (text+ko) ==== @@ -1,8 +1,6 @@ # $FreeBSD: src/tools/tools/ath/athstats/Makefile,v 1.6 2008/10/27 18:50:46 sam Exp $ PROG= athstats -BINDIR= /usr/local/bin -NO_MAN= SRCS= main.c statfoo.c athstats.c @@ -16,8 +14,8 @@ CFLAGS+=-I${.CURDIR} CFLAGS+=-I${SRCDIR}/sys/net80211 -CFLAGS+=-I${SRCDIR}/sys/dev/ath -CFLAGS+=-I${SRCDIR}/sys/dev/ath/ath_hal + +.include <../Makefile.inc> athstats.o: opt_ah.h ah_osdep.h From owner-p4-projects@FreeBSD.ORG Sat Nov 29 19:07:44 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 4CED61065679; Sat, 29 Nov 2008 19:07:44 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 0EBC71065677 for ; Sat, 29 Nov 2008 19:07:44 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id ED40A8FC1A for ; Sat, 29 Nov 2008 19:07:43 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mATJ7hVH085240 for ; Sat, 29 Nov 2008 19:07:43 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mATJ7ecR085234 for perforce@freebsd.org; Sat, 29 Nov 2008 19:07:40 GMT (envelope-from sam@freebsd.org) Date: Sat, 29 Nov 2008 19:07:40 GMT Message-Id: <200811291907.mATJ7ecR085234@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 153786 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, 29 Nov 2008 19:07:44 -0000 http://perforce.freebsd.org/chv.cgi?CH=153786 Change 153786 by sam@sam_ebb on 2008/11/29 19:07:04 IFC @ 153779 Affected files ... .. //depot/projects/vap/COPYRIGHT#4 integrate .. //depot/projects/vap/Makefile#10 integrate .. //depot/projects/vap/Makefile.inc1#18 integrate .. //depot/projects/vap/UPDATING#22 integrate .. //depot/projects/vap/bin/df/df.1#3 integrate .. //depot/projects/vap/bin/df/df.c#3 integrate .. //depot/projects/vap/bin/ps/print.c#3 integrate .. //depot/projects/vap/bin/sh/eval.c#4 integrate .. //depot/projects/vap/bin/sh/exec.c#3 integrate .. //depot/projects/vap/cddl/compat/opensolaris/include/libshare.h#1 branch .. //depot/projects/vap/cddl/compat/opensolaris/include/mnttab.h#3 integrate .. //depot/projects/vap/cddl/compat/opensolaris/misc/deviceid.c#2 integrate .. //depot/projects/vap/cddl/compat/opensolaris/misc/mnttab.c#2 integrate .. //depot/projects/vap/cddl/compat/opensolaris/misc/zmount.c#2 integrate .. //depot/projects/vap/cddl/compat/opensolaris/misc/zone.c#2 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/cmd/zdb/zdb.8#2 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/cmd/zdb/zdb.c#2 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#2 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/cmd/zfs/zfs.8#2 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c#2 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h#2 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#2 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/cmd/zinject/translate.c#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/cmd/zinject/zinject.c#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/cmd/zinject/zinject.h#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/cmd/zpool/zpool.8#2 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/cmd/zpool/zpool_iter.c#2 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#2 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/cmd/zpool/zpool_util.c#2 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h#2 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c#2 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/cmd/ztest/ztest.c#2 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/head/assert.h#2 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/head/libintl.h#2 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/head/synch.h#2 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/head/thread.h#2 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c#2 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.h#2 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libuutil/common/libuutil.h#2 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#2 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#2 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libuutil/common/uu_avl.c#2 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#2 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libuutil/common/uu_list.c#2 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#2 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#2 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#2 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#2 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#2 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_sendrecv.c#1 branch .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#2 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#2 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#2 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#4 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#2 integrate .. //depot/projects/vap/cddl/contrib/opensolaris/lib/libzpool/common/util.c#2 integrate .. //depot/projects/vap/cddl/lib/libzfs/Makefile#4 integrate .. //depot/projects/vap/cddl/lib/libzpool/Makefile#4 integrate .. //depot/projects/vap/cddl/sbin/zpool/Makefile#4 integrate .. //depot/projects/vap/cddl/usr.bin/Makefile#5 integrate .. //depot/projects/vap/cddl/usr.bin/zinject/Makefile#1 branch .. //depot/projects/vap/cddl/usr.bin/ztest/Makefile#4 integrate .. //depot/projects/vap/cddl/usr.sbin/zdb/Makefile#4 integrate .. //depot/projects/vap/contrib/gdb/gdb/arm-tdep.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ANNOUNCE#3 integrate .. //depot/projects/vap/contrib/ncurses/FREEBSD-upgrade#6 integrate .. //depot/projects/vap/contrib/ncurses/FREEBSD-vendor#4 delete .. //depot/projects/vap/contrib/ncurses/INSTALL#5 integrate .. //depot/projects/vap/contrib/ncurses/MANIFEST#5 integrate .. //depot/projects/vap/contrib/ncurses/NEWS#6 integrate .. //depot/projects/vap/contrib/ncurses/TO-DO#4 integrate .. //depot/projects/vap/contrib/ncurses/aclocal.m4#5 integrate .. //depot/projects/vap/contrib/ncurses/announce.html.in#3 integrate .. //depot/projects/vap/contrib/ncurses/config.guess#5 integrate .. //depot/projects/vap/contrib/ncurses/config.sub#5 integrate .. //depot/projects/vap/contrib/ncurses/configure#5 integrate .. //depot/projects/vap/contrib/ncurses/configure.in#5 integrate .. //depot/projects/vap/contrib/ncurses/dist.mk#6 integrate .. //depot/projects/vap/contrib/ncurses/doc/html/announce.html#3 integrate .. //depot/projects/vap/contrib/ncurses/form/form.priv.h#3 integrate .. //depot/projects/vap/contrib/ncurses/form/frm_def.c#4 integrate .. //depot/projects/vap/contrib/ncurses/form/frm_driver.c#5 integrate .. //depot/projects/vap/contrib/ncurses/form/frm_req_name.c#3 integrate .. //depot/projects/vap/contrib/ncurses/include/MKterm.h.awk.in#4 integrate .. //depot/projects/vap/contrib/ncurses/include/capdefaults.c#3 integrate .. //depot/projects/vap/contrib/ncurses/include/curses.h.in#6 integrate .. //depot/projects/vap/contrib/ncurses/include/curses.tail#4 integrate .. //depot/projects/vap/contrib/ncurses/include/nc_alloc.h#4 integrate .. //depot/projects/vap/contrib/ncurses/include/nc_panel.h#3 integrate .. //depot/projects/vap/contrib/ncurses/include/ncurses_defs#5 integrate .. //depot/projects/vap/contrib/ncurses/include/term_entry.h#3 integrate .. //depot/projects/vap/contrib/ncurses/man/curs_getcchar.3x#4 integrate .. //depot/projects/vap/contrib/ncurses/man/curs_memleaks.3x#1 branch .. //depot/projects/vap/contrib/ncurses/man/curs_terminfo.3x#4 integrate .. //depot/projects/vap/contrib/ncurses/man/curs_util.3x#4 integrate .. //depot/projects/vap/contrib/ncurses/man/form.3x#4 integrate .. //depot/projects/vap/contrib/ncurses/man/form_driver.3x#4 integrate .. //depot/projects/vap/contrib/ncurses/man/form_field_buffer.3x#3 integrate .. //depot/projects/vap/contrib/ncurses/man/man_db.renames#5 integrate .. //depot/projects/vap/contrib/ncurses/man/menu_attributes.3x#3 integrate .. //depot/projects/vap/contrib/ncurses/man/menu_driver.3x#4 integrate .. //depot/projects/vap/contrib/ncurses/man/menu_pattern.3x#3 integrate .. //depot/projects/vap/contrib/ncurses/man/ncurses.3x#4 integrate .. //depot/projects/vap/contrib/ncurses/menu/m_driver.c#3 integrate .. //depot/projects/vap/contrib/ncurses/menu/m_req_name.c#3 integrate .. //depot/projects/vap/contrib/ncurses/misc/ncu-indent#3 integrate .. //depot/projects/vap/contrib/ncurses/misc/ncurses.supp#1 branch .. //depot/projects/vap/contrib/ncurses/misc/terminfo.src#6 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/Makefile.in#4 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/MKkeyname.awk#4 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/MKlib_gen.sh#5 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/MKunctrl.awk#5 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_addch.c#5 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_delwin.c#5 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_freeall.c#5 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_getch.c#6 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_getstr.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_initscr.c#5 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_mouse.c#4 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_newterm.c#6 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_newwin.c#6 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_overlay.c#5 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_restart.c#5 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_screen.c#4 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_set_term.c#6 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_slk.c#4 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_slkrefr.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_ungetch.c#5 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/lib_window.c#5 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/resizeterm.c#6 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/tries.c#4 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/use_window.c#4 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/base/wresize.c#5 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/curses.priv.h#6 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/fifo_defs.h#4 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/llib-lncurses#4 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/llib-lncursest#2 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/llib-lncursesw#4 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/MKcodes.awk#2 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/MKnames.awk#4 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/alloc_entry.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/alloc_ttype.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/captoinfo.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/comp_expand.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/comp_hash.c#4 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/comp_parse.c#4 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/comp_scan.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/entries.c#2 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/home_terminfo.c#4 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/init_keytry.c#5 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/lib_acs.c#4 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/lib_baudrate.c#4 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/lib_cur_term.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/lib_data.c#6 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/lib_options.c#5 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/lib_raw.c#4 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/lib_setup.c#6 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/lib_termcap.c#4 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/lib_tgoto.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/lib_tparm.c#4 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/lib_tputs.c#4 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/lib_ttyflags.c#5 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/make_keys.c#4 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/name_match.c#4 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/parse_entry.c#4 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/read_entry.c#4 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/use_screen.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tinfo/write_entry.c#4 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/trace/lib_trace.c#5 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/trace/lib_traceatr.c#4 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/trace/lib_tracebits.c#4 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/trace/lib_tracechr.c#4 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/trace/lib_tracedmp.c#4 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/trace/lib_tracemse.c#4 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/trace/trace_buf.c#4 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/trace/trace_tries.c#4 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/trace/varargs.c#4 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/trace/visbuf.c#4 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tty/hardscroll.c#4 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tty/lib_mvcur.c#4 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tty/lib_twait.c#5 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/tty/tty_update.c#5 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/widechar/charable.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/widechar/lib_get_wch.c#4 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/widechar/lib_get_wstr.c#3 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/widechar/lib_key_name.c#2 integrate .. //depot/projects/vap/contrib/ncurses/ncurses/widechar/lib_unget_wch.c#4 integrate .. //depot/projects/vap/contrib/ncurses/panel/p_new.c#3 integrate .. //depot/projects/vap/contrib/ncurses/panel/panel.priv.h#3 integrate .. //depot/projects/vap/contrib/ncurses/progs/MKtermsort.sh#3 integrate .. //depot/projects/vap/contrib/ncurses/progs/Makefile.in#4 integrate .. //depot/projects/vap/contrib/ncurses/progs/dump_entry.c#5 integrate .. //depot/projects/vap/contrib/ncurses/progs/dump_entry.h#3 integrate .. //depot/projects/vap/contrib/ncurses/progs/infocmp.c#5 integrate .. //depot/projects/vap/contrib/ncurses/progs/progs.priv.h#4 integrate .. //depot/projects/vap/contrib/ncurses/progs/tic.c#4 integrate .. //depot/projects/vap/contrib/ncurses/progs/toe.c#5 integrate .. //depot/projects/vap/contrib/ncurses/progs/tput.c#4 integrate .. //depot/projects/vap/contrib/ncurses/progs/tset.c#4 integrate .. //depot/projects/vap/contrib/sendmail/src/sendmail.h#4 integrate .. //depot/projects/vap/contrib/telnet/telnetd/ext.h#3 integrate .. //depot/projects/vap/contrib/telnet/telnetd/sys_term.c#3 integrate .. //depot/projects/vap/etc/mtree/BSD.include.dist#5 integrate .. //depot/projects/vap/gnu/usr.bin/gdb/Makefile#3 integrate .. //depot/projects/vap/gnu/usr.bin/gdb/gdbserver/Makefile#3 integrate .. //depot/projects/vap/gnu/usr.bin/gdb/gdbserver/fbsd-arm-low.c#1 branch .. //depot/projects/vap/gnu/usr.bin/gdb/gdbserver/reg-arm.c#1 branch .. //depot/projects/vap/include/Makefile#8 integrate .. //depot/projects/vap/include/utmp.h#3 integrate .. //depot/projects/vap/lib/Makefile#8 integrate .. //depot/projects/vap/lib/libarchive/test/test_acl_freebsd.c#2 integrate .. //depot/projects/vap/lib/libc/gen/Symbol.map#8 integrate .. //depot/projects/vap/lib/libc/gen/dlfcn.c#3 integrate .. //depot/projects/vap/lib/libc/gen/getvfsbyname.3#3 integrate .. //depot/projects/vap/lib/libc/i386/sys/pipe.S#4 integrate .. //depot/projects/vap/lib/libc/i386/sys/reboot.S#4 integrate .. //depot/projects/vap/lib/libc/i386/sys/setlogin.S#4 integrate .. //depot/projects/vap/lib/libc/sys/cpuset_getaffinity.2#4 integrate .. //depot/projects/vap/lib/libc/sys/jail.2#4 integrate .. //depot/projects/vap/lib/libkvm/kvm_proc.c#4 integrate .. //depot/projects/vap/lib/libpmc/libpmc.c#7 integrate .. //depot/projects/vap/lib/libpmc/libpmcinternal.h#1 branch .. //depot/projects/vap/lib/libpmc/pmc.3#8 integrate .. //depot/projects/vap/lib/libpmc/pmc.atom.3#2 integrate .. //depot/projects/vap/lib/libpmc/pmc.core.3#2 integrate .. //depot/projects/vap/lib/libpmc/pmc.core2.3#2 integrate .. //depot/projects/vap/lib/libpmc/pmc.iaf.3#2 integrate .. //depot/projects/vap/lib/libpmc/pmclog.c#4 integrate .. //depot/projects/vap/lib/libstand/nfs.c#4 integrate .. //depot/projects/vap/lib/libstand/printf.c#3 integrate .. //depot/projects/vap/lib/libthr/thread/thr_fork.c#3 integrate .. //depot/projects/vap/lib/libusb20/libusb20.3#2 integrate .. //depot/projects/vap/lib/libusb20/libusb20.c#2 integrate .. //depot/projects/vap/lib/libusb20/libusb20.h#2 integrate .. //depot/projects/vap/lib/libusb20/libusb20_compat01.c#2 integrate .. //depot/projects/vap/lib/libusb20/libusb20_compat01.h#2 integrate .. //depot/projects/vap/lib/libusb20/libusb20_desc.c#2 integrate .. //depot/projects/vap/lib/libusb20/libusb20_desc.h#2 integrate .. //depot/projects/vap/lib/libusb20/libusb20_ugen20.c#2 integrate .. //depot/projects/vap/lib/libutil/Makefile#6 integrate .. //depot/projects/vap/lib/libutil/gr_util.c#3 integrate .. //depot/projects/vap/lib/libutil/realhostname.c#5 integrate .. //depot/projects/vap/lib/ncurses/ncurses/Makefile#5 integrate .. //depot/projects/vap/lib/ncurses/ncurses/ncurses_cfg.h#6 integrate .. //depot/projects/vap/libexec/rtld-elf/Symbol.map#3 integrate .. //depot/projects/vap/libexec/rtld-elf/rtld.c#7 integrate .. //depot/projects/vap/libexec/rtld-elf/rtld_lock.c#5 integrate .. //depot/projects/vap/libexec/rtld-elf/rtld_lock.h#4 integrate .. //depot/projects/vap/libexec/telnetd/Makefile#4 integrate .. //depot/projects/vap/release/Makefile#8 integrate .. //depot/projects/vap/release/doc/en_US.ISO8859-1/hardware/article.sgml#9 integrate .. //depot/projects/vap/release/doc/en_US.ISO8859-1/relnotes/article.sgml#15 integrate .. //depot/projects/vap/sbin/geom/class/part/Makefile#3 integrate .. //depot/projects/vap/sbin/geom/class/part/geom_part.c#8 integrate .. //depot/projects/vap/sbin/geom/class/part/gpart.8#6 integrate .. //depot/projects/vap/sbin/iscontrol/auth_subr.c#3 integrate .. //depot/projects/vap/sbin/iscontrol/config.c#3 integrate .. //depot/projects/vap/sbin/iscontrol/fsm.c#3 integrate .. //depot/projects/vap/sbin/iscontrol/iscontrol.8#3 integrate .. //depot/projects/vap/sbin/iscontrol/iscontrol.c#3 integrate .. //depot/projects/vap/sbin/iscontrol/iscontrol.h#3 integrate .. //depot/projects/vap/sbin/iscontrol/iscsi.conf.5#3 integrate .. //depot/projects/vap/sbin/iscontrol/login.c#3 integrate .. //depot/projects/vap/sbin/iscontrol/misc.c#4 integrate .. //depot/projects/vap/sbin/iscontrol/pdu.c#3 integrate .. //depot/projects/vap/sbin/mount_msdosfs/mount_msdosfs.c#3 integrate .. //depot/projects/vap/sbin/newfs_msdos/newfs_msdos.c#3 integrate .. //depot/projects/vap/share/man/man4/Makefile#23 integrate .. //depot/projects/vap/share/man/man4/ale.4#1 branch .. //depot/projects/vap/share/man/man4/altq.4#5 integrate .. //depot/projects/vap/share/man/man4/ddb.4#14 integrate .. //depot/projects/vap/share/man/man4/man4.arm/Makefile#3 integrate .. //depot/projects/vap/share/man/man4/man4.arm/mge.4#1 branch .. //depot/projects/vap/share/man/man4/miibus.4#5 integrate .. //depot/projects/vap/share/man/man4/vlan.4#6 integrate .. //depot/projects/vap/share/man/man5/fstab.5#5 integrate .. //depot/projects/vap/share/man/man7/hier.7#4 integrate .. //depot/projects/vap/share/man/man9/Makefile#17 integrate .. //depot/projects/vap/share/man/man9/VFS_SET.9#3 integrate .. //depot/projects/vap/share/man/man9/bus_dma.9#6 integrate .. //depot/projects/vap/share/man/man9/devfs_set_cdevpriv.9#2 integrate .. //depot/projects/vap/share/man/man9/style.9#7 integrate .. //depot/projects/vap/share/man/man9/vfs_mountedon.9#3 delete .. //depot/projects/vap/share/man/man9/vn_fullpath.9#3 integrate .. //depot/projects/vap/share/misc/bsd-family-tree#9 integrate .. //depot/projects/vap/share/misc/committers-src.dot#13 integrate .. //depot/projects/vap/share/mk/bsd.libnames.mk#6 integrate .. //depot/projects/vap/sys/amd64/amd64/amd64_mem.c#5 integrate .. //depot/projects/vap/sys/amd64/amd64/elf_machdep.c#6 integrate .. //depot/projects/vap/sys/amd64/amd64/identcpu.c#13 integrate .. //depot/projects/vap/sys/amd64/amd64/initcpu.c#6 integrate .. //depot/projects/vap/sys/amd64/amd64/local_apic.c#11 integrate .. //depot/projects/vap/sys/amd64/amd64/mp_machdep.c#12 integrate .. //depot/projects/vap/sys/amd64/amd64/msi.c#3 integrate .. //depot/projects/vap/sys/amd64/conf/GENERIC#23 integrate .. //depot/projects/vap/sys/amd64/include/atomic.h#7 integrate .. //depot/projects/vap/sys/amd64/include/cputypes.h#3 integrate .. //depot/projects/vap/sys/amd64/include/md_var.h#6 integrate .. //depot/projects/vap/sys/amd64/include/pmc_mdep.h#9 integrate .. //depot/projects/vap/sys/amd64/include/specialreg.h#12 integrate .. //depot/projects/vap/sys/amd64/linux32/linux.h#8 integrate .. //depot/projects/vap/sys/amd64/linux32/linux32_machdep.c#10 integrate .. //depot/projects/vap/sys/amd64/linux32/linux32_proto.h#11 integrate .. //depot/projects/vap/sys/amd64/linux32/linux32_syscall.h#11 integrate .. //depot/projects/vap/sys/amd64/linux32/linux32_sysent.c#11 integrate .. //depot/projects/vap/sys/amd64/linux32/linux32_sysvec.c#12 integrate .. //depot/projects/vap/sys/amd64/linux32/syscalls.master#11 integrate .. //depot/projects/vap/sys/arm/arm/elf_machdep.c#7 integrate .. //depot/projects/vap/sys/arm/at91/at91.c#8 integrate .. //depot/projects/vap/sys/arm/at91/at91_machdep.c#1 branch .. //depot/projects/vap/sys/arm/at91/at91_mci.c#7 integrate .. //depot/projects/vap/sys/arm/at91/at91_mcireg.h#3 integrate .. //depot/projects/vap/sys/arm/at91/at91_pdcreg.h#3 integrate .. //depot/projects/vap/sys/arm/at91/at91_pio.c#4 integrate .. //depot/projects/vap/sys/arm/at91/at91_pioreg.h#3 integrate .. //depot/projects/vap/sys/arm/at91/at91_piovar.h#4 integrate .. //depot/projects/vap/sys/arm/at91/at91_pmc.c#5 integrate .. //depot/projects/vap/sys/arm/at91/at91_pmcreg.h#3 integrate .. //depot/projects/vap/sys/arm/at91/at91_pmcvar.h#3 integrate .. //depot/projects/vap/sys/arm/at91/at91_rtc.c#3 integrate .. //depot/projects/vap/sys/arm/at91/at91_rtcreg.h#3 integrate .. //depot/projects/vap/sys/arm/at91/at91_spi.c#4 integrate .. //depot/projects/vap/sys/arm/at91/at91_spireg.h#3 integrate .. //depot/projects/vap/sys/arm/at91/at91_ssc.c#4 integrate .. //depot/projects/vap/sys/arm/at91/at91_sscreg.h#3 integrate .. //depot/projects/vap/sys/arm/at91/at91_st.c#3 integrate .. //depot/projects/vap/sys/arm/at91/at91_streg.h#3 integrate .. //depot/projects/vap/sys/arm/at91/at91_twi.c#5 integrate .. //depot/projects/vap/sys/arm/at91/at91_twiio.h#3 integrate .. //depot/projects/vap/sys/arm/at91/at91_twireg.h#3 integrate .. //depot/projects/vap/sys/arm/at91/at91_usartreg.h#3 integrate .. //depot/projects/vap/sys/arm/at91/at91board.h#1 branch .. //depot/projects/vap/sys/arm/at91/at91rm92reg.h#3 integrate .. //depot/projects/vap/sys/arm/at91/at91var.h#3 integrate .. //depot/projects/vap/sys/arm/at91/board_bwct.c#1 branch .. //depot/projects/vap/sys/arm/at91/board_hl200.c#1 branch .. //depot/projects/vap/sys/arm/at91/board_kb920x.c#1 branch .. //depot/projects/vap/sys/arm/at91/board_tsc4370.c#1 branch .. //depot/projects/vap/sys/arm/at91/files.at91#3 integrate .. //depot/projects/vap/sys/arm/at91/files.kb920x#3 delete .. //depot/projects/vap/sys/arm/at91/if_ate.c#7 integrate .. //depot/projects/vap/sys/arm/at91/if_atereg.h#4 integrate .. //depot/projects/vap/sys/arm/at91/kb920x_machdep.c#6 delete .. //depot/projects/vap/sys/arm/at91/ohci_atmelarm.c#3 integrate .. //depot/projects/vap/sys/arm/at91/std.at91#3 integrate .. //depot/projects/vap/sys/arm/at91/std.bwct#1 branch .. //depot/projects/vap/sys/arm/at91/std.hl200#1 branch .. //depot/projects/vap/sys/arm/at91/std.kb920x#3 integrate .. //depot/projects/vap/sys/arm/at91/std.tsc4370#1 branch .. //depot/projects/vap/sys/arm/at91/uart_bus_at91usart.c#3 integrate .. //depot/projects/vap/sys/arm/at91/uart_cpu_at91rm9200usart.c#3 integrate .. //depot/projects/vap/sys/arm/at91/uart_dev_at91usart.c#7 integrate .. //depot/projects/vap/sys/arm/conf/AVILA#16 integrate .. //depot/projects/vap/sys/arm/conf/BWCT#7 integrate .. //depot/projects/vap/sys/arm/conf/DB-78XXX#3 integrate .. //depot/projects/vap/sys/arm/conf/DB-88F5XXX#3 integrate .. //depot/projects/vap/sys/arm/conf/DB-88F6XXX#3 integrate .. //depot/projects/vap/sys/arm/conf/HL200#9 integrate .. //depot/projects/vap/sys/arm/include/atomic.h#8 integrate .. //depot/projects/vap/sys/arm/mv/common.c#2 integrate .. //depot/projects/vap/sys/arm/mv/discovery/db78xxx.c#2 integrate .. //depot/projects/vap/sys/arm/mv/discovery/discovery.c#2 integrate .. //depot/projects/vap/sys/arm/mv/files.mv#2 integrate .. //depot/projects/vap/sys/arm/mv/kirkwood/db88f6xxx.c#2 integrate .. //depot/projects/vap/sys/arm/mv/kirkwood/kirkwood.c#2 integrate .. //depot/projects/vap/sys/arm/mv/mv_pci.c#1 branch .. //depot/projects/vap/sys/arm/mv/mvreg.h#2 integrate .. //depot/projects/vap/sys/arm/mv/mvvar.h#2 integrate .. //depot/projects/vap/sys/arm/mv/obio.c#2 integrate .. //depot/projects/vap/sys/arm/mv/orion/db88f5xxx.c#2 integrate .. //depot/projects/vap/sys/arm/mv/orion/orion.c#2 integrate .. //depot/projects/vap/sys/boot/Makefile#9 integrate .. //depot/projects/vap/sys/boot/arm/uboot/Makefile#2 integrate .. //depot/projects/vap/sys/boot/arm/uboot/conf.c#2 integrate .. //depot/projects/vap/sys/boot/arm/uboot/version#2 integrate .. //depot/projects/vap/sys/boot/common/bootstrap.h#6 integrate .. //depot/projects/vap/sys/boot/common/interp.c#3 integrate .. //depot/projects/vap/sys/boot/forth/loader.conf#16 integrate .. //depot/projects/vap/sys/boot/i386/Makefile#5 integrate .. //depot/projects/vap/sys/boot/i386/boot0/boot0.S#6 integrate .. //depot/projects/vap/sys/boot/i386/gptzfsboot/Makefile#1 branch .. //depot/projects/vap/sys/boot/i386/libi386/biosdisk.c#6 integrate .. //depot/projects/vap/sys/boot/i386/libi386/bootinfo32.c#5 integrate .. //depot/projects/vap/sys/boot/i386/libi386/devicename.c#6 integrate .. //depot/projects/vap/sys/boot/i386/loader/Makefile#6 integrate .. //depot/projects/vap/sys/boot/i386/loader/conf.c#5 integrate .. //depot/projects/vap/sys/boot/i386/loader/main.c#6 integrate .. //depot/projects/vap/sys/boot/i386/zfsboot/Makefile#1 branch .. //depot/projects/vap/sys/boot/i386/zfsboot/zfsboot.c#1 branch .. //depot/projects/vap/sys/boot/i386/zfsboot/zfsldr.S#1 branch .. //depot/projects/vap/sys/boot/uboot/lib/devicename.c#3 integrate .. //depot/projects/vap/sys/boot/uboot/lib/disk.c#3 integrate .. //depot/projects/vap/sys/boot/uboot/lib/glue.c#7 integrate .. //depot/projects/vap/sys/boot/uboot/lib/glue.h#6 integrate .. //depot/projects/vap/sys/boot/uboot/lib/libuboot.h#4 integrate .. //depot/projects/vap/sys/boot/uboot/lib/net.c#6 integrate .. //depot/projects/vap/sys/boot/zfs/Makefile#1 branch .. //depot/projects/vap/sys/boot/zfs/zfs.c#1 branch .. //depot/projects/vap/sys/boot/zfs/zfsimpl.c#1 branch .. //depot/projects/vap/sys/cddl/boot/zfs/README#1 branch .. //depot/projects/vap/sys/cddl/boot/zfs/fletcher.c#1 branch .. //depot/projects/vap/sys/cddl/boot/zfs/lzjb.c#1 branch .. //depot/projects/vap/sys/cddl/boot/zfs/sha256.c#1 branch .. //depot/projects/vap/sys/cddl/boot/zfs/zfsimpl.h#1 branch .. //depot/projects/vap/sys/cddl/boot/zfs/zfssubr.c#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#3 integrate .. //depot/projects/vap/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#4 integrate .. //depot/projects/vap/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#3 integrate .. //depot/projects/vap/sys/cddl/compat/opensolaris/kern/opensolaris_lookup.c#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#2 integrate .. //depot/projects/vap/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#3 integrate .. //depot/projects/vap/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#4 integrate .. //depot/projects/vap/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#2 integrate .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/acl.h#3 delete .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/atomic.h#4 integrate .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/callb.h#3 delete .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/cred.h#2 integrate .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/dnlc.h#2 integrate .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/file.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/kidmap.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/kmem.h#3 integrate .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/misc.h#2 integrate .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/mntent.h#3 integrate .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/param.h#2 integrate .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/pathname.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/policy.h#3 integrate .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/proc.h#2 integrate .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/refstr.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/sid.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/sig.h#1 branch .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/sunddi.h#2 integrate .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/sysmacros.h#3 integrate .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/time.h#2 integrate .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/types.h#3 integrate .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/uio.h#3 integrate .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/vfs.h#2 integrate .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/vnode.h#2 integrate .. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/zone.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/common/avl/avl.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/common/unicode/u8_textprep.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/common/zfs/zfs_comutil.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/common/zfs/zfs_deleg.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/common/zfs/zpool_prop.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/common/zfs/zprop_common.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/Makefile.files#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#3 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/vnode.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#3 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_deleg.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_scrub.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#3 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/rrwlock.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#3 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_deleg.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#3 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/rrwlock.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_boot.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_fuid.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#3 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/unique.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#3 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#3 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#6 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fuid.c#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#3 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#3 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#7 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#8 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/os/callb.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/os/list.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/acl.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/acl_impl.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/cred.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/extdirent.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/fm/protocol.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/fm/util.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/idmap.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#4 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/list.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/synch.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent/eventdefs.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h#2 integrate .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/u8_textprep.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/u8_textprep_data.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#1 branch .. //depot/projects/vap/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c#2 integrate .. //depot/projects/vap/sys/cddl/dev/cyclic/cyclic.c#2 integrate .. //depot/projects/vap/sys/cddl/dev/dtrace/i386/dtrace_subr.c#2 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32.h#6 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_misc.c#12 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_proto.h#17 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_syscall.h#17 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_syscalls.c#17 integrate .. //depot/projects/vap/sys/compat/freebsd32/freebsd32_sysent.c#17 integrate .. //depot/projects/vap/sys/compat/freebsd32/syscalls.master#17 integrate .. //depot/projects/vap/sys/compat/ia32/ia32_sysvec.c#7 integrate .. //depot/projects/vap/sys/compat/linux/linux_futex.c#7 integrate .. //depot/projects/vap/sys/compat/linux/linux_ipc.c#6 integrate .. //depot/projects/vap/sys/compat/linux/linux_socket.c#10 integrate .. //depot/projects/vap/sys/compat/linux/linux_socket.h#3 integrate .. //depot/projects/vap/sys/compat/svr4/svr4_sysvec.c#11 integrate .. //depot/projects/vap/sys/conf/NOTES#32 integrate .. //depot/projects/vap/sys/conf/files#58 integrate .. //depot/projects/vap/sys/conf/files.amd64#15 integrate .. //depot/projects/vap/sys/conf/files.i386#22 integrate .. //depot/projects/vap/sys/conf/files.pc98#16 integrate .. //depot/projects/vap/sys/conf/options#33 integrate .. //depot/projects/vap/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#7 integrate .. //depot/projects/vap/sys/contrib/ipfilter/netinet/mlfk_ipl.c#6 integrate .. //depot/projects/vap/sys/crypto/via/padlock.c#5 integrate .. //depot/projects/vap/sys/dev/aac/aac_pci.c#10 integrate .. //depot/projects/vap/sys/dev/acpica/acpi.c#15 integrate .. //depot/projects/vap/sys/dev/acpica/acpi_hpet.c#4 integrate .. //depot/projects/vap/sys/dev/acpica/acpi_pcib.c#6 integrate .. //depot/projects/vap/sys/dev/adb/adb_bus.c#3 integrate .. //depot/projects/vap/sys/dev/ale/if_ale.c#1 branch .. //depot/projects/vap/sys/dev/ale/if_alereg.h#1 branch .. //depot/projects/vap/sys/dev/ale/if_alevar.h#1 branch .. //depot/projects/vap/sys/dev/asmc/asmc.c#6 integrate .. //depot/projects/vap/sys/dev/ata/ata-pci.h#14 integrate .. //depot/projects/vap/sys/dev/ata/ata-queue.c#10 integrate .. //depot/projects/vap/sys/dev/ata/chipsets/ata-marvell.c#2 integrate .. //depot/projects/vap/sys/dev/ath/if_ath.c#127 integrate .. //depot/projects/vap/sys/dev/ath/if_athvar.h#40 integrate .. //depot/projects/vap/sys/dev/bce/if_bce.c#10 integrate .. //depot/projects/vap/sys/dev/bce/if_bcereg.h#7 integrate .. //depot/projects/vap/sys/dev/cardbus/cardbus.c#6 integrate .. //depot/projects/vap/sys/dev/cardbus/cardbus_cis.c#7 integrate .. //depot/projects/vap/sys/dev/cardbus/cardbus_device.c#3 integrate .. //depot/projects/vap/sys/dev/cardbus/cardbusvar.h#6 integrate .. //depot/projects/vap/sys/dev/coretemp/coretemp.c#7 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_ael1002.c#8 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_common.h#8 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_ctl_defs.h#4 integrate .. //depot/projects/vap/sys/dev/cxgb/common/cxgb_t3_hw.c#7 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_adapter.h#11 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_config.h#6 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_main.c#17 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_multiq.c#4 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_osdep.h#9 integrate .. //depot/projects/vap/sys/dev/cxgb/cxgb_sge.c#15 integrate .. //depot/projects/vap/sys/dev/cxgb/sys/cxgb_support.c#6 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb_resource.c#3 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#13 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_tom.c#6 integrate .. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#6 integrate .. //depot/projects/vap/sys/dev/dcons/dcons_crom.c#5 integrate .. //depot/projects/vap/sys/dev/dcons/dcons_os.c#8 integrate .. //depot/projects/vap/sys/dev/e1000/e1000_80003es2lan.c#2 integrate .. //depot/projects/vap/sys/dev/e1000/e1000_82540.c#2 integrate .. //depot/projects/vap/sys/dev/e1000/e1000_82541.c#2 integrate .. //depot/projects/vap/sys/dev/e1000/e1000_82542.c#2 integrate .. //depot/projects/vap/sys/dev/e1000/e1000_82543.c#2 integrate .. //depot/projects/vap/sys/dev/e1000/e1000_82571.c#2 integrate .. //depot/projects/vap/sys/dev/e1000/e1000_82575.c#2 integrate .. //depot/projects/vap/sys/dev/e1000/e1000_82575.h#2 integrate .. //depot/projects/vap/sys/dev/e1000/e1000_api.c#2 integrate .. //depot/projects/vap/sys/dev/e1000/e1000_api.h#2 integrate .. //depot/projects/vap/sys/dev/e1000/e1000_defines.h#2 integrate .. //depot/projects/vap/sys/dev/e1000/e1000_hw.h#2 integrate .. //depot/projects/vap/sys/dev/e1000/e1000_ich8lan.c#2 integrate .. //depot/projects/vap/sys/dev/e1000/e1000_ich8lan.h#2 integrate .. //depot/projects/vap/sys/dev/e1000/e1000_mac.c#2 integrate .. //depot/projects/vap/sys/dev/e1000/e1000_mac.h#2 integrate .. //depot/projects/vap/sys/dev/e1000/e1000_manage.c#2 integrate .. //depot/projects/vap/sys/dev/e1000/e1000_nvm.c#2 integrate .. //depot/projects/vap/sys/dev/e1000/e1000_osdep.c#2 integrate .. //depot/projects/vap/sys/dev/e1000/e1000_osdep.h#2 integrate .. //depot/projects/vap/sys/dev/e1000/e1000_phy.c#2 integrate .. //depot/projects/vap/sys/dev/e1000/e1000_phy.h#2 integrate .. //depot/projects/vap/sys/dev/e1000/e1000_regs.h#2 integrate .. //depot/projects/vap/sys/dev/e1000/if_em.c#3 integrate .. //depot/projects/vap/sys/dev/e1000/if_em.h#2 integrate .. //depot/projects/vap/sys/dev/e1000/if_igb.c#4 integrate .. //depot/projects/vap/sys/dev/fdc/fdc.c#7 integrate .. //depot/projects/vap/sys/dev/fdc/fdc_pccard.c#6 integrate .. //depot/projects/vap/sys/dev/fxp/if_fxp.c#7 integrate .. //depot/projects/vap/sys/dev/fxp/if_fxpreg.h#4 integrate .. //depot/projects/vap/sys/dev/fxp/if_fxpvar.h#6 integrate .. //depot/projects/vap/sys/dev/glxsb/glxsb.c#2 integrate .. //depot/projects/vap/sys/dev/hwpmc/hwpmc_amd.c#10 integrate .. //depot/projects/vap/sys/dev/hwpmc/hwpmc_arm.c#4 integrate .. //depot/projects/vap/sys/dev/hwpmc/hwpmc_core.c#1 branch .. //depot/projects/vap/sys/dev/hwpmc/hwpmc_core.h#1 branch .. //depot/projects/vap/sys/dev/hwpmc/hwpmc_ia64.c#4 integrate .. //depot/projects/vap/sys/dev/hwpmc/hwpmc_logging.c#6 integrate .. //depot/projects/vap/sys/dev/hwpmc/hwpmc_mod.c#10 integrate .. //depot/projects/vap/sys/dev/hwpmc/hwpmc_piv.c#9 integrate .. //depot/projects/vap/sys/dev/hwpmc/hwpmc_powerpc.c#4 integrate .. //depot/projects/vap/sys/dev/hwpmc/hwpmc_ppro.c#10 integrate .. //depot/projects/vap/sys/dev/hwpmc/hwpmc_sparc64.c#4 integrate .. //depot/projects/vap/sys/dev/hwpmc/hwpmc_x86.c#7 integrate .. //depot/projects/vap/sys/dev/hwpmc/pmc_events.h#6 integrate .. //depot/projects/vap/sys/dev/ipmi/ipmi.c#4 integrate .. //depot/projects/vap/sys/dev/iscsi/initiator/isc_cam.c#4 integrate .. //depot/projects/vap/sys/dev/iscsi/initiator/isc_sm.c#3 integrate .. //depot/projects/vap/sys/dev/iscsi/initiator/isc_soc.c#5 integrate .. //depot/projects/vap/sys/dev/iscsi/initiator/isc_subr.c#3 integrate .. //depot/projects/vap/sys/dev/iscsi/initiator/iscsi.c#5 integrate .. //depot/projects/vap/sys/dev/iscsi/initiator/iscsi.h#3 integrate .. //depot/projects/vap/sys/dev/iscsi/initiator/iscsi_subr.c#3 integrate .. //depot/projects/vap/sys/dev/iscsi/initiator/iscsivar.h#3 integrate .. //depot/projects/vap/sys/dev/ixgbe/ixgbe.c#5 integrate .. //depot/projects/vap/sys/dev/ixgbe/ixgbe.h#6 integrate .. //depot/projects/vap/sys/dev/ixgbe/ixgbe_82598.c#5 integrate .. //depot/projects/vap/sys/dev/ixgbe/ixgbe_api.c#5 integrate .. //depot/projects/vap/sys/dev/ixgbe/ixgbe_api.h#5 integrate .. //depot/projects/vap/sys/dev/ixgbe/ixgbe_common.c#5 integrate .. //depot/projects/vap/sys/dev/ixgbe/ixgbe_common.h#5 integrate .. //depot/projects/vap/sys/dev/ixgbe/ixgbe_osdep.h#4 integrate .. //depot/projects/vap/sys/dev/ixgbe/ixgbe_phy.c#5 integrate .. //depot/projects/vap/sys/dev/ixgbe/ixgbe_phy.h#5 integrate .. //depot/projects/vap/sys/dev/ixgbe/ixgbe_type.h#5 integrate .. //depot/projects/vap/sys/dev/k8temp/k8temp.c#8 integrate .. //depot/projects/vap/sys/dev/mfi/mfi.c#11 integrate .. //depot/projects/vap/sys/dev/mfi/mfi_disk.c#3 integrate .. //depot/projects/vap/sys/dev/mfi/mfi_ioctl.h#5 integrate .. //depot/projects/vap/sys/dev/mfi/mfi_pci.c#4 integrate .. //depot/projects/vap/sys/dev/mfi/mfireg.h#4 integrate .. //depot/projects/vap/sys/dev/mfi/mfivar.h#3 integrate .. //depot/projects/vap/sys/dev/mii/truephy.c#2 integrate .. //depot/projects/vap/sys/dev/mmc/mmcsd.c#6 integrate .. //depot/projects/vap/sys/dev/msk/if_msk.c#11 integrate .. //depot/projects/vap/sys/dev/mxge/if_mxge.c#9 integrate .. //depot/projects/vap/sys/dev/mxge/if_mxge_var.h#6 integrate .. //depot/projects/vap/sys/dev/nmdm/nmdm.c#8 integrate .. //depot/projects/vap/sys/dev/nxge/xge-osdep.h#3 integrate .. //depot/projects/vap/sys/dev/patm/if_patm_intr.c#5 integrate .. //depot/projects/vap/sys/dev/pci/pci.c#12 integrate .. //depot/projects/vap/sys/dev/ppbus/if_plip.c#8 integrate .. //depot/projects/vap/sys/dev/ppbus/immio.c#6 integrate .. //depot/projects/vap/sys/dev/ppbus/lpbb.c#7 integrate .. //depot/projects/vap/sys/dev/ppbus/lpt.c#8 integrate .. //depot/projects/vap/sys/dev/ppbus/lpt.h#3 integrate .. //depot/projects/vap/sys/dev/ppbus/pcfclock.c#5 integrate .. //depot/projects/vap/sys/dev/ppbus/ppb_1284.c#3 integrate .. //depot/projects/vap/sys/dev/ppbus/ppb_base.c#4 integrate .. //depot/projects/vap/sys/dev/ppbus/ppb_msq.c#4 integrate .. //depot/projects/vap/sys/dev/ppbus/ppbconf.c#9 integrate .. //depot/projects/vap/sys/dev/ppbus/ppbconf.h#6 integrate .. //depot/projects/vap/sys/dev/ppbus/ppi.c#7 integrate .. //depot/projects/vap/sys/dev/ppbus/ppi.h#3 integrate .. //depot/projects/vap/sys/dev/ppbus/pps.c#8 integrate .. //depot/projects/vap/sys/dev/ppbus/vpo.c#6 integrate .. //depot/projects/vap/sys/dev/ppbus/vpoio.c#6 integrate .. //depot/projects/vap/sys/dev/ppbus/vpoio.h#4 integrate .. //depot/projects/vap/sys/dev/ppc/ppc.c#9 integrate .. //depot/projects/vap/sys/dev/ppc/ppc_acpi.c#5 integrate .. //depot/projects/vap/sys/dev/random/randomdev.c#5 integrate .. //depot/projects/vap/sys/dev/random/randomdev_soft.c#6 integrate .. //depot/projects/vap/sys/dev/sio/sio_pci.c#6 integrate .. //depot/projects/vap/sys/dev/sio/sio_puc.c#5 integrate .. //depot/projects/vap/sys/dev/sound/pci/hda/hdac.c#15 integrate .. //depot/projects/vap/sys/dev/sound/pci/hda/hdac_private.h#4 integrate .. //depot/projects/vap/sys/dev/syscons/syscons.c#13 integrate .. //depot/projects/vap/sys/dev/uart/uart_dev_quicc.c#2 integrate .. //depot/projects/vap/sys/dev/usb/if_aue.c#7 integrate .. //depot/projects/vap/sys/dev/usb/if_zyd.c#33 integrate .. //depot/projects/vap/sys/dev/usb/if_zydreg.h#13 integrate .. //depot/projects/vap/sys/dev/usb/rio500_usb.h#5 integrate .. //depot/projects/vap/sys/dev/usb/u3g.c#4 integrate .. //depot/projects/vap/sys/dev/usb/ugen.c#7 integrate .. //depot/projects/vap/sys/dev/usb/usb.h#6 integrate .. //depot/projects/vap/sys/dev/usb/usb_quirks.c#9 integrate .. //depot/projects/vap/sys/dev/usb/usb_subr.c#7 integrate .. //depot/projects/vap/sys/dev/usb/usbdevs#33 integrate .. //depot/projects/vap/sys/dev/usb/usbdi.c#9 integrate .. //depot/projects/vap/sys/dev/usb/usbdi.h#7 integrate .. //depot/projects/vap/sys/dev/usb2/bluetooth/ng_ubt2.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/controller/ehci2.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/controller/ehci2.h#2 integrate .. //depot/projects/vap/sys/dev/usb2/controller/uss820dci_pccard.c#2 delete .. //depot/projects/vap/sys/dev/usb2/core/usb2_busdma.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_core.h#2 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_dev.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_dev.h#2 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_device.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_generic.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_generic.h#2 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_hub.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_msctest.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_msctest.h#2 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_request.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/core/usb2_util.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/core/usbdevs#2 delete .. //depot/projects/vap/sys/dev/usb2/ethernet/if_aue2.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/image/uscanner2.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/include/Makefile#2 integrate .. //depot/projects/vap/sys/dev/usb2/include/urio2_ioctl.h#2 delete .. //depot/projects/vap/sys/dev/usb2/include/usb2_devid.h#2 integrate .. //depot/projects/vap/sys/dev/usb2/include/usb2_devtable.h#2 integrate .. //depot/projects/vap/sys/dev/usb2/include/usb2_ioctl.h#2 integrate .. //depot/projects/vap/sys/dev/usb2/include/usb2_standard.h#2 integrate .. //depot/projects/vap/sys/dev/usb2/quirk/usb2_quirk.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/serial/u3g2.c#1 branch .. //depot/projects/vap/sys/dev/usb2/serial/ubsa2.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/serial/ugensa2.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/sound/uaudio2.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/storage/umass2.c#2 integrate .. //depot/projects/vap/sys/dev/usb2/storage/urio2.c#2 integrate .. //depot/projects/vap/sys/dev/vge/if_vge.c#6 integrate .. //depot/projects/vap/sys/dev/vr/if_vr.c#3 integrate .. //depot/projects/vap/sys/fs/cd9660/cd9660_bmap.c#3 integrate .. //depot/projects/vap/sys/fs/cd9660/cd9660_node.c#5 integrate .. //depot/projects/vap/sys/fs/cd9660/cd9660_node.h#3 integrate .. //depot/projects/vap/sys/fs/cd9660/cd9660_rrip.c#6 integrate .. //depot/projects/vap/sys/fs/cd9660/cd9660_vfsops.c#8 integrate .. //depot/projects/vap/sys/fs/cd9660/cd9660_vnops.c#7 integrate .. //depot/projects/vap/sys/fs/nullfs/null_vnops.c#12 integrate .. //depot/projects/vap/sys/fs/unionfs/union.h#6 integrate .. //depot/projects/vap/sys/fs/unionfs/union_subr.c#13 integrate .. //depot/projects/vap/sys/fs/unionfs/union_vfsops.c#11 integrate .. //depot/projects/vap/sys/fs/unionfs/union_vnops.c#11 integrate .. //depot/projects/vap/sys/geom/geom_ccd.c#6 integrate .. //depot/projects/vap/sys/geom/part/g_part_bsd.c#8 integrate .. //depot/projects/vap/sys/geom/vinum/geom_vinum.c#7 integrate .. //depot/projects/vap/sys/geom/vinum/geom_vinum_list.c#3 integrate .. //depot/projects/vap/sys/geom/vinum/geom_vinum_move.c#3 integrate .. //depot/projects/vap/sys/geom/vinum/geom_vinum_rename.c#4 integrate .. //depot/projects/vap/sys/geom/vinum/geom_vinum_rm.c#7 integrate .. //depot/projects/vap/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h#4 integrate .. //depot/projects/vap/sys/gnu/fs/xfs/xfs_dfrag.c#3 integrate .. //depot/projects/vap/sys/gnu/fs/xfs/xfs_inode.c#3 integrate .. //depot/projects/vap/sys/gnu/fs/xfs/xfs_inode.h#3 integrate .. //depot/projects/vap/sys/gnu/fs/xfs/xfs_vnodeops.c#3 integrate .. //depot/projects/vap/sys/i386/conf/GENERIC#26 integrate .. //depot/projects/vap/sys/i386/conf/XEN#5 integrate .. //depot/projects/vap/sys/i386/cpufreq/est.c#14 integrate .. //depot/projects/vap/sys/i386/cpufreq/p4tcc.c#7 integrate .. //depot/projects/vap/sys/i386/cpufreq/powernow.c#8 integrate .. //depot/projects/vap/sys/i386/i386/elf_machdep.c#6 integrate .. //depot/projects/vap/sys/i386/i386/i686_mem.c#5 integrate .. //depot/projects/vap/sys/i386/i386/identcpu.c#13 integrate .. //depot/projects/vap/sys/i386/i386/initcpu.c#7 integrate .. //depot/projects/vap/sys/i386/i386/intr_machdep.c#10 integrate .. //depot/projects/vap/sys/i386/i386/k6_mem.c#5 integrate .. //depot/projects/vap/sys/i386/i386/local_apic.c#12 integrate .. //depot/projects/vap/sys/i386/i386/longrun.c#3 integrate .. //depot/projects/vap/sys/i386/i386/mp_machdep.c#13 integrate .. //depot/projects/vap/sys/i386/i386/msi.c#3 integrate .. //depot/projects/vap/sys/i386/ibcs2/ibcs2_sysvec.c#7 integrate .. //depot/projects/vap/sys/i386/include/atomic.h#7 integrate .. //depot/projects/vap/sys/i386/include/cputypes.h#3 integrate .. //depot/projects/vap/sys/i386/include/md_var.h#7 integrate .. //depot/projects/vap/sys/i386/include/pmc_mdep.h#9 integrate .. //depot/projects/vap/sys/i386/include/specialreg.h#11 integrate .. //depot/projects/vap/sys/i386/include/xen/xen-os.h#5 integrate .. //depot/projects/vap/sys/i386/linux/linux.h#9 integrate .. //depot/projects/vap/sys/i386/linux/linux_sysvec.c#12 integrate .. //depot/projects/vap/sys/ia64/ia64/elf_machdep.c#7 integrate .. //depot/projects/vap/sys/ia64/include/atomic.h#7 integrate .. //depot/projects/vap/sys/isa/isa_common.c#8 integrate .. //depot/projects/vap/sys/isa/isa_common.h#6 integrate .. //depot/projects/vap/sys/isa/isahint.c#6 integrate .. //depot/projects/vap/sys/isa/isavar.h#6 integrate .. //depot/projects/vap/sys/kern/bus_if.m#6 integrate .. //depot/projects/vap/sys/kern/imgact_aout.c#8 integrate .. //depot/projects/vap/sys/kern/kern_conf.c#15 integrate .. //depot/projects/vap/sys/kern/kern_cpuset.c#10 integrate .. //depot/projects/vap/sys/kern/kern_exit.c#14 integrate .. //depot/projects/vap/sys/kern/kern_fork.c#12 integrate .. //depot/projects/vap/sys/kern/kern_jail.c#16 integrate .. //depot/projects/vap/sys/kern/kern_lockf.c#12 integrate .. //depot/projects/vap/sys/kern/kern_osd.c#1 branch .. //depot/projects/vap/sys/kern/kern_poll.c#9 integrate .. //depot/projects/vap/sys/kern/kern_proc.c#16 integrate .. //depot/projects/vap/sys/kern/kern_shutdown.c#13 integrate .. //depot/projects/vap/sys/kern/kern_sysctl.c#6 integrate .. //depot/projects/vap/sys/kern/kern_thr.c#12 integrate .. //depot/projects/vap/sys/kern/kern_thread.c#18 integrate .. //depot/projects/vap/sys/kern/sched_ule.c#19 integrate .. //depot/projects/vap/sys/kern/subr_bufring.c#1 branch .. //depot/projects/vap/sys/kern/subr_bus.c#14 integrate .. //depot/projects/vap/sys/kern/subr_prf.c#7 integrate .. //depot/projects/vap/sys/kern/tty_ttydisc.c#5 integrate .. //depot/projects/vap/sys/kern/uipc_mqueue.c#10 integrate .. //depot/projects/vap/sys/kern/uipc_socket.c#17 integrate .. //depot/projects/vap/sys/kern/vfs_cache.c#14 integrate .. //depot/projects/vap/sys/kern/vfs_export.c#10 integrate .. //depot/projects/vap/sys/kern/vfs_lookup.c#14 integrate .. //depot/projects/vap/sys/kern/vfs_subr.c#26 integrate .. //depot/projects/vap/sys/kern/vfs_syscalls.c#15 integrate .. //depot/projects/vap/sys/kern/vfs_vnops.c#14 integrate .. //depot/projects/vap/sys/kgssapi/gsstest.c#2 integrate .. //depot/projects/vap/sys/mips/include/atomic.h#2 integrate .. //depot/projects/vap/sys/mips/mips/elf_machdep.c#3 integrate .. //depot/projects/vap/sys/modules/Makefile#46 integrate .. //depot/projects/vap/sys/modules/ale/Makefile#1 branch .. //depot/projects/vap/sys/modules/cxgb/cxgb/Makefile#8 integrate .. //depot/projects/vap/sys/modules/cxgb/iw_cxgb/Makefile#3 integrate .. //depot/projects/vap/sys/modules/cxgb/toecore/Makefile#3 integrate .. //depot/projects/vap/sys/modules/em/Makefile#9 integrate .. //depot/projects/vap/sys/modules/hwpmc/Makefile#7 integrate .. //depot/projects/vap/sys/modules/igb/Makefile#4 integrate .. //depot/projects/vap/sys/modules/nfsserver/Makefile#6 integrate .. //depot/projects/vap/sys/modules/powermac_nvram/Makefile#3 integrate .. //depot/projects/vap/sys/modules/uart/Makefile#5 integrate .. //depot/projects/vap/sys/modules/usb2/Makefile#2 integrate .. //depot/projects/vap/sys/modules/zfs/Makefile#8 integrate .. //depot/projects/vap/sys/net/bpf.c#22 integrate .. //depot/projects/vap/sys/net/if.c#20 integrate .. //depot/projects/vap/sys/net/if_ethersubr.c#14 integrate .. //depot/projects/vap/sys/net/if_fddisubr.c#9 integrate .. //depot/projects/vap/sys/net/if_fwsubr.c#9 integrate .. //depot/projects/vap/sys/net/if_gif.c#13 integrate .. //depot/projects/vap/sys/net/if_lagg.c#10 integrate .. //depot/projects/vap/sys/net/if_loop.c#15 integrate .. //depot/projects/vap/sys/net/if_tun.c#12 integrate .. //depot/projects/vap/sys/net/if_var.h#13 integrate .. //depot/projects/vap/sys/net/if_vlan.c#13 integrate .. //depot/projects/vap/sys/net/raw_cb.c#11 integrate .. //depot/projects/vap/sys/net/route.c#15 integrate .. //depot/projects/vap/sys/net/rtsock.c#14 integrate .. //depot/projects/vap/sys/net/vnet.h#2 integrate .. //depot/projects/vap/sys/net80211/ieee80211_hostap.c#30 integrate .. //depot/projects/vap/sys/net80211/ieee80211_output.c#65 integrate .. //depot/projects/vap/sys/net80211/ieee80211_var.h#57 integrate .. //depot/projects/vap/sys/net80211/ieee80211_wds.c#13 integrate .. //depot/projects/vap/sys/netgraph/netgraph.h#13 integrate .. //depot/projects/vap/sys/netgraph/ng_base.c#25 integrate .. //depot/projects/vap/sys/netgraph/ng_eiface.c#9 integrate .. //depot/projects/vap/sys/netgraph/ng_iface.c#11 integrate .. //depot/projects/vap/sys/netgraph/ng_l2tp.c#10 integrate .. //depot/projects/vap/sys/netgraph/ng_socket.c#8 integrate .. //depot/projects/vap/sys/netinet/if_ether.c#15 integrate .. //depot/projects/vap/sys/netinet/igmp.c#9 integrate .. //depot/projects/vap/sys/netinet/in.c#11 integrate .. //depot/projects/vap/sys/netinet/in_gif.c#8 integrate .. //depot/projects/vap/sys/netinet/in_mcast.c#8 integrate .. //depot/projects/vap/sys/netinet/in_pcb.c#23 integrate .. //depot/projects/vap/sys/netinet/in_pcb.h#16 integrate .. //depot/projects/vap/sys/netinet/in_proto.c#7 integrate .. //depot/projects/vap/sys/netinet/in_rmx.c#10 integrate .. //depot/projects/vap/sys/netinet/in_var.h#8 integrate .. //depot/projects/vap/sys/netinet/ip_divert.c#11 integrate .. //depot/projects/vap/sys/netinet/ip_fastfwd.c#9 integrate .. //depot/projects/vap/sys/netinet/ip_fw_pfil.c#8 integrate .. //depot/projects/vap/sys/netinet/ip_icmp.c#11 integrate .. //depot/projects/vap/sys/netinet/ip_icmp.h#6 integrate .. //depot/projects/vap/sys/netinet/ip_id.c#6 integrate .. //depot/projects/vap/sys/netinet/ip_input.c#13 integrate .. //depot/projects/vap/sys/netinet/ip_output.c#13 integrate .. //depot/projects/vap/sys/netinet/ip_var.h#7 integrate .. //depot/projects/vap/sys/netinet/raw_ip.c#15 integrate .. //depot/projects/vap/sys/netinet/sctp_constants.h#7 integrate .. //depot/projects/vap/sys/netinet/sctp_indata.c#9 integrate .. //depot/projects/vap/sys/netinet/sctp_input.c#10 integrate .. //depot/projects/vap/sys/netinet/sctp_pcb.c#12 integrate .. //depot/projects/vap/sys/netinet/sctp_pcb.h#8 integrate .. //depot/projects/vap/sys/netinet/sctp_usrreq.c#11 integrate .. //depot/projects/vap/sys/netinet/sctputil.c#13 integrate .. //depot/projects/vap/sys/netinet/tcp_hostcache.c#8 integrate .. //depot/projects/vap/sys/netinet/tcp_hostcache.h#1 branch .. //depot/projects/vap/sys/netinet/tcp_input.c#18 integrate .. //depot/projects/vap/sys/netinet/tcp_output.c#16 integrate .. //depot/projects/vap/sys/netinet/tcp_reass.c#6 integrate .. //depot/projects/vap/sys/netinet/tcp_sack.c#10 integrate .. //depot/projects/vap/sys/netinet/tcp_subr.c#17 integrate .. //depot/projects/vap/sys/netinet/tcp_syncache.c#18 integrate .. //depot/projects/vap/sys/netinet/tcp_timewait.c#7 integrate .. //depot/projects/vap/sys/netinet/tcp_usrreq.c#13 integrate .. //depot/projects/vap/sys/netinet/tcp_var.h#12 integrate .. //depot/projects/vap/sys/netinet/udp_usrreq.c#16 integrate .. //depot/projects/vap/sys/netinet/vinet.h#2 integrate .. //depot/projects/vap/sys/netinet6/frag6.c#10 integrate .. //depot/projects/vap/sys/netinet6/icmp6.c#15 integrate .. //depot/projects/vap/sys/netinet6/in6_ifattach.c#11 integrate .. //depot/projects/vap/sys/netinet6/in6_pcb.c#14 integrate .. //depot/projects/vap/sys/netinet6/in6_pcb.h#7 integrate .. //depot/projects/vap/sys/netinet6/in6_proto.c#10 integrate .. //depot/projects/vap/sys/netinet6/in6_rmx.c#10 integrate .. //depot/projects/vap/sys/netinet6/in6_src.c#14 integrate .. //depot/projects/vap/sys/netinet6/ip6_forward.c#9 integrate .. //depot/projects/vap/sys/netinet6/ip6_input.c#12 integrate .. //depot/projects/vap/sys/netinet6/ip6_mroute.c#8 integrate .. //depot/projects/vap/sys/netinet6/mld6.c#11 integrate .. //depot/projects/vap/sys/netinet6/nd6.c#9 integrate .. //depot/projects/vap/sys/netinet6/nd6_nbr.c#10 integrate >>> TRUNCATED FOR MAIL (1000 lines) <<< From owner-p4-projects@FreeBSD.ORG Sat Nov 29 20:44:22 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id B8C4A1065673; Sat, 29 Nov 2008 20:44:22 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 7CC061065670 for ; Sat, 29 Nov 2008 20:44:22 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 6E58B8FC16 for ; Sat, 29 Nov 2008 20:44:22 +0000 (UTC) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mATKiMkI094592 for ; Sat, 29 Nov 2008 20:44:22 GMT (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mATKiMPG094590 for perforce@freebsd.org; Sat, 29 Nov 2008 20:44:22 GMT (envelope-from sam@freebsd.org) Date: Sat, 29 Nov 2008 20:44:22 GMT Message-Id: <200811292044.mATKiMPG094590@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 153792 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, 29 Nov 2008 20:44:23 -0000 http://perforce.freebsd.org/chv.cgi?CH=153792 Change 153792 by sam@sam_ebb on 2008/11/29 20:44:11 IFC @ 153791 Affected files ... .. //depot/projects/vap/share/man/man4/man4.arm/Makefile#4 integrate .. //depot/projects/vap/share/man/man4/upgt.4#3 integrate .. //depot/projects/vap/sys/dev/fb/s3_pci.c#6 integrate .. //depot/projects/vap/sys/dev/hwpmc/hwpmc_intel.c#3 branch .. //depot/projects/vap/usr.bin/cpio/cpio.c#8 integrate .. //depot/projects/vap/usr.bin/cpio/cpio.h#5 integrate .. //depot/projects/vap/usr.bin/cpio/test/test_option_tv.stdout.uu#2 integrate .. //depot/projects/vap/usr.bin/tar/config_freebsd.h#9 integrate .. //depot/projects/vap/usr.bin/tar/util.c#7 integrate Differences ... ==== //depot/projects/vap/share/man/man4/man4.arm/Makefile#4 (text+ko) ==== @@ -1,7 +1,10 @@ -# $FreeBSD: src/share/man/man4/man4.arm/Makefile,v 1.2 2008/11/27 16:50:23 raj Exp $ +# $FreeBSD: src/share/man/man4/man4.arm/Makefile,v 1.3 2008/11/29 19:01:44 brueffer Exp $ MAN= mge.4 npe.4 +MLINKS= mge.4 if_mge.4 +MLINKS+=npe.4 if_npe.4 + MANSUBDIR=/arm .include ==== //depot/projects/vap/share/man/man4/upgt.4#3 (text+ko) ==== @@ -1,5 +1,5 @@ .\" $OpenBSD: upgt.4,v 1.6 2008/04/17 14:01:22 jmc Exp $ -.\" $FreeBSD$ +.\" $FreeBSD: src/share/man/man4/upgt.4,v 1.2 2008/11/29 18:58:20 brueffer Exp $ .\" .\" Copyright (c) 2007 Marcus Glocker .\" Copyright (c) 2005-2007 @@ -49,7 +49,7 @@ .\" OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd $Mdocdate: April 17 2008 $ +.Dd April 17, 2008 .Os .Dt UPGT 4 .Sh NAME @@ -140,29 +140,43 @@ .\"users have to download these files on their own. This driver requires the .Nm upgtfw -be installed before it will work. +firmware be installed before it will work. The firmware files are not publicly available. A package of the firmware which can be installed via .Xr pkg_add 1 -with: +is available: .Bd -literal -offset indent http://weongyo.org/project/upgt/upgt-firmware-2.13.1.0.tar.gz .Ed .Sh HARDWARE -The following adapters should work: +The +.Nm +driver supports USB 2.0 Conexant/Intersil PrismGT series wireless +adapters based on the GW3887 chipset, among them: .Pp -.Bl -tag -width Ds -offset indent -compact -.It Belkin F5D7050 (version 1000) -.It Cohiba Proto Board -.It D-Link DWL-G120 Cohiba -.It FSC Connect2Air E-5400 USB D1700 -.It Gigaset USB Adapter 54 -.It Inventel UR045G -.It Netgear WG111v2 -.It SMC EZ ConnectG SMC2862W-G -.It Sagem XG703A -.It Spinnaker DUT -.It Spinnaker Proto Board +.Bl -bullet -compact +.It +Belkin F5D7050 (version 1000) +.It +Cohiba Proto Board +.It +D-Link DWL-G120 Cohiba +.It +FSC Connect2Air E-5400 USB D1700 +.It +Gigaset USB Adapter 54 +.It +Inventel UR045G +.It +Netgear WG111v2 +.It +SMC EZ ConnectG SMC2862W-G +.It +Sagem XG703A +.It +Spinnaker DUT +.It +Spinnaker Proto Board .El .Sh EXAMPLES Join an existing BSS network (i.e., connect to an access point): ==== //depot/projects/vap/sys/dev/fb/s3_pci.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/dev/fb/s3_pci.c,v 1.10 2005/09/28 14:54:06 marius Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/fb/s3_pci.c,v 1.11 2008/11/29 20:16:53 kib Exp $"); /* Enable LFB on S3 cards that has only VESA 1.2 BIOS */ @@ -389,7 +389,7 @@ } static int -s3lfb_mmap(video_adapter_t *adp, vm_offset_t offset, vm_offset_t *paddr, +s3lfb_mmap(video_adapter_t *adp, vm_offset_t offset, vm_paddr_t *paddr, int prot) { return (*prevvidsw->mmap)(adp, offset, paddr, prot); ==== //depot/projects/vap/usr.bin/cpio/cpio.c#8 (text+ko) ==== @@ -26,7 +26,7 @@ #include "cpio_platform.h" -__FBSDID("$FreeBSD: src/usr.bin/cpio/cpio.c,v 1.13 2008/09/04 05:20:46 kientzle Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/cpio/cpio.c,v 1.14 2008/11/29 20:22:02 kientzle Exp $"); #include #include @@ -41,6 +41,12 @@ #ifdef HAVE_FCNTL_H #include #endif +#ifdef HAVE_GRP_H +#include +#endif +#ifdef HAVE_PWD_H +#include +#endif #ifdef HAVE_STDARG_H #include #endif @@ -58,11 +64,32 @@ #include "cpio.h" #include "matching.h" +/* Fixed size of uname/gname caches. */ +#define name_cache_size 101 + +struct name_cache { + int probes; + int hits; + size_t size; + struct { + id_t id; + char *name; + } cache[name_cache_size]; +}; + static int copy_data(struct archive *, struct archive *); static const char *cpio_rename(const char *name); static int entry_to_archive(struct cpio *, struct archive_entry *); static int file_to_archive(struct cpio *, const char *); +static void free_cache(struct name_cache *cache); +static void list_item_verbose(struct cpio *, struct archive_entry *); static void long_help(void); +static const char *lookup_gname(struct cpio *, gid_t gid); +static int lookup_gname_helper(struct cpio *, + const char **name, id_t gid); +static const char *lookup_uname(struct cpio *, uid_t uid); +static int lookup_uname_helper(struct cpio *, + const char **name, id_t uid); static void mode_in(struct cpio *); static void mode_list(struct cpio *); static void mode_out(struct cpio *); @@ -271,6 +298,8 @@ "Must specify at least one of -i, -o, or -p"); } + free_cache(cpio->gname_cache); + free_cache(cpio->uname_cache); return (0); } @@ -805,18 +834,9 @@ } if (excluded(cpio, archive_entry_pathname(entry))) continue; - if (cpio->verbose) { - /* TODO: uname/gname lookups */ - /* TODO: Clean this up. */ - fprintf(stdout, - "%s%3d %8s%8s " CPIO_FILESIZE_PRINTF " %s\n", - archive_entry_strmode(entry), - archive_entry_nlink(entry), - archive_entry_uname(entry), - archive_entry_gname(entry), - (CPIO_FILESIZE_TYPE)archive_entry_size(entry), - archive_entry_pathname(entry)); - } else + if (cpio->verbose) + list_item_verbose(cpio, entry); + else fprintf(stdout, "%s\n", archive_entry_pathname(entry)); } r = archive_read_close(a); @@ -832,7 +852,74 @@ exit(0); } +/* + * Display information about the current file. + * + * The format here roughly duplicates the output of 'ls -l'. + * This is based on SUSv2, where 'tar tv' is documented as + * listing additional information in an "unspecified format," + * and 'pax -l' is documented as using the same format as 'ls -l'. + */ static void +list_item_verbose(struct cpio *cpio, struct archive_entry *entry) +{ + char size[32]; + char date[32]; + const char *uname, *gname; + FILE *out = stdout; + const struct stat *st; + const char *fmt; + time_t tim; + static time_t now; + + st = archive_entry_stat(entry); + + if (!now) + time(&now); + + /* Use uname if it's present, else uid. */ + uname = archive_entry_uname(entry); + if (uname == NULL) + uname = lookup_uname(cpio, archive_entry_uid(entry)); + + /* Use gname if it's present, else gid. */ + gname = archive_entry_gname(entry); + if (gname == NULL) + gname = lookup_gname(cpio, archive_entry_gid(entry)); + + /* Print device number or file size. */ + if (S_ISCHR(st->st_mode) || S_ISBLK(st->st_mode)) { + snprintf(size, sizeof(size), "%lu,%lu", + (unsigned long)major(st->st_rdev), + (unsigned long)minor(st->st_rdev)); /* ls(1) also casts here. */ + } else { + snprintf(size, sizeof(size), CPIO_FILESIZE_PRINTF, + (CPIO_FILESIZE_TYPE)st->st_size); + } + + /* Format the time using 'ls -l' conventions. */ + tim = (time_t)st->st_mtime; + if (abs(tim - now) > (365/2)*86400) + fmt = cpio->day_first ? "%e %b %Y" : "%b %e %Y"; + else + fmt = cpio->day_first ? "%e %b %H:%M" : "%b %e %H:%M"; + strftime(date, sizeof(date), fmt, localtime(&tim)); + + fprintf(out, "%s%3d %-8s %-8s %8s %12s %s", + archive_entry_strmode(entry), + archive_entry_nlink(entry), + uname, gname, size, date, + archive_entry_pathname(entry)); + + /* Extra information for links. */ + if (archive_entry_hardlink(entry)) /* Hard link */ + fprintf(out, " link to %s", archive_entry_hardlink(entry)); + else if (archive_entry_symlink(entry)) /* Symbolic link */ + fprintf(out, " -> %s", archive_entry_symlink(entry)); + fprintf(out, "\n"); +} + +static void mode_pass(struct cpio *cpio, const char *destdir) { unsigned long blocks; @@ -1040,3 +1127,123 @@ free(lr->pathname); free(lr); } + +static void +free_cache(struct name_cache *cache) +{ + size_t i; + + if (cache != NULL) { + for (i = 0; i < cache->size; i++) + free(cache->cache[i].name); + free(cache); + } +} + +/* + * Lookup uname/gname from uid/gid, return NULL if no match. + */ +static const char * +lookup_name(struct cpio *cpio, struct name_cache **name_cache_variable, + int (*lookup_fn)(struct cpio *, const char **, id_t), id_t id) +{ + char asnum[16]; + struct name_cache *cache; + const char *name; + int slot; + + + if (*name_cache_variable == NULL) { + *name_cache_variable = malloc(sizeof(struct name_cache)); + if (*name_cache_variable == NULL) + cpio_errc(1, ENOMEM, "No more memory"); + memset(*name_cache_variable, 0, sizeof(struct name_cache)); + (*name_cache_variable)->size = name_cache_size; + } + + cache = *name_cache_variable; + cache->probes++; + + slot = id % cache->size; + if (cache->cache[slot].name != NULL) { + if (cache->cache[slot].id == id) { + cache->hits++; + return (cache->cache[slot].name); + } + free(cache->cache[slot].name); + cache->cache[slot].name = NULL; + } + + if (lookup_fn(cpio, &name, id) == 0) { + if (name == NULL || name[0] == '\0') { + /* If lookup failed, format it as a number. */ + snprintf(asnum, sizeof(asnum), "%u", (unsigned)id); + name = asnum; + } + cache->cache[slot].name = strdup(name); + if (cache->cache[slot].name != NULL) { + cache->cache[slot].id = id; + return (cache->cache[slot].name); + } + /* + * Conveniently, NULL marks an empty slot, so + * if the strdup() fails, we've just failed to + * cache it. No recovery necessary. + */ + } + return (NULL); +} + +static const char * +lookup_uname(struct cpio *cpio, uid_t uid) +{ + return (lookup_name(cpio, &cpio->uname_cache, + &lookup_uname_helper, (id_t)uid)); +} + +static int +lookup_uname_helper(struct cpio *cpio, const char **name, id_t id) +{ + struct passwd *pwent; + + (void)cpio; /* UNUSED */ + + errno = 0; + pwent = getpwuid((uid_t)id); + if (pwent == NULL) { + *name = NULL; + if (errno != 0) + cpio_warnc(errno, "getpwuid(%d) failed", id); + return (errno); + } + + *name = pwent->pw_name; + return (0); +} + +static const char * +lookup_gname(struct cpio *cpio, gid_t gid) +{ + return (lookup_name(cpio, &cpio->gname_cache, + &lookup_gname_helper, (id_t)gid)); +} + +static int +lookup_gname_helper(struct cpio *cpio, const char **name, id_t id) +{ + struct group *grent; + + (void)cpio; /* UNUSED */ + + errno = 0; + grent = getgrgid((gid_t)id); + if (grent == NULL) { + *name = NULL; + if (errno != 0) + cpio_warnc(errno, "getgrgid(%d) failed", id); + return (errno); + } + + *name = grent->gr_name; + return (0); +} ==== //depot/projects/vap/usr.bin/cpio/cpio.h#5 (text+ko) ==== @@ -22,7 +22,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/usr.bin/cpio/cpio.h,v 1.4 2008/08/04 01:25:48 cperciva Exp $ + * $FreeBSD: src/usr.bin/cpio/cpio.h,v 1.5 2008/11/29 20:22:02 kientzle Exp $ */ #ifndef CPIO_H_INCLUDED @@ -65,6 +65,7 @@ char *pass_destpath; int uid_override; int gid_override; + int day_first; /* true if locale prefers day/mon */ /* If >= 0, then close this when done. */ int fd; @@ -76,6 +77,9 @@ int return_value; /* Value returned by main() */ struct archive_entry_linkresolver *linkresolver; + struct name_cache *uname_cache; + struct name_cache *gname_cache; + /* Work data. */ struct matching *matching; char *buff; ==== //depot/projects/vap/usr.bin/cpio/test/test_option_tv.stdout.uu#2 (text+ko) ==== @@ -1,5 +1,6 @@ -$FreeBSD: src/usr.bin/cpio/test/test_option_tv.stdout.uu,v 1.1 2008/05/26 17:15:35 kientzle Exp $ +$FreeBSD: src/usr.bin/cpio/test/test_option_tv.stdout.uu,v 1.2 2008/11/29 20:22:02 kientzle Exp $ begin 644 test_option_tv.stdout -G+7)W+7(M+7(M+2`@(#$@("`H;G5L;"D@("AN=6QL*2`P(&9I;&4* +M+7)W+7(M+7(M+2`@(#$@=&EM("`@("`@=&EM("`@("`@("`@("`@(#`@1&5C +/(#,Q("`Q.38Y(&9I;&4* ` end ==== //depot/projects/vap/usr.bin/tar/config_freebsd.h#9 (text+ko) ==== @@ -22,7 +22,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/usr.bin/tar/config_freebsd.h,v 1.7 2008/11/08 04:43:24 kientzle Exp $ + * $FreeBSD: src/usr.bin/tar/config_freebsd.h,v 1.8 2008/11/29 20:06:53 kientzle Exp $ */ /* A default configuration for FreeBSD, used if there is no config.h. */ @@ -101,6 +101,7 @@ #define HAVE_UNISTD_H 1 #define HAVE_UNSIGNED_LONG_LONG #define HAVE_VPRINTF 1 +#define HAVE_WCTYPE_H 1 #define HAVE_ZLIB_H 1 #undef MAJOR_IN_MKDEV #define STDC_HEADERS 1 ==== //depot/projects/vap/usr.bin/tar/util.c#7 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include "bsdtar_platform.h" -__FBSDID("$FreeBSD: src/usr.bin/tar/util.c,v 1.21 2008/11/10 05:04:55 kientzle Exp $"); +__FBSDID("$FreeBSD: src/usr.bin/tar/util.c,v 1.22 2008/11/29 20:06:53 kientzle Exp $"); #ifdef HAVE_SYS_STAT_H #include @@ -46,92 +46,161 @@ #ifdef HAVE_STRING_H #include #endif +#ifdef HAVE_WCTYPE_H +#include +#else +/* If we don't have wctype, we need to hack up some version of iswprint(). */ +#define iswprint isprint +#endif #include "bsdtar.h" static void bsdtar_vwarnc(struct bsdtar *, int code, const char *fmt, va_list ap); +static size_t bsdtar_expand_char(char *, size_t, char); static const char *strip_components(const char *path, int elements); +/* TODO: Hack up a version of mbtowc for platforms with no wide + * character support at all. I think the following might suffice, + * but it needs careful testing. + * #if !HAVE_MBTOWC + * #define mbtowc(wcp, p, n) ((*wcp = *p), 1) + * #endif + */ + /* * Print a string, taking care with any non-printable characters. + * + * Note that we use a stack-allocated buffer to receive the formatted + * string if we can. This is partly performance (avoiding a call to + * malloc()), partly out of expedience (we have to call vsnprintf() + * before malloc() anyway to find out how big a buffer we need; we may + * as well point that first call at a small local buffer in case it + * works), but mostly for safety (so we can use this to print messages + * about out-of-memory conditions). */ void safe_fprintf(FILE *f, const char *fmt, ...) { - char *buff; - char *buff_heap; - int buff_length; + char fmtbuff_stack[256]; /* Place to format the printf() string. */ + char outbuff[256]; /* Buffer for outgoing characters. */ + char *fmtbuff_heap; /* If fmtbuff_stack is too small, we use malloc */ + char *fmtbuff; /* Pointer to fmtbuff_stack or fmtbuff_heap. */ + int fmtbuff_length; int length; va_list ap; - char *p; + const char *p; unsigned i; - char buff_stack[256]; - char copy_buff[256]; + wchar_t wc; + char try_wc; /* Use a stack-allocated buffer if we can, for speed and safety. */ - buff_heap = NULL; - buff_length = sizeof(buff_stack); - buff = buff_stack; + fmtbuff_heap = NULL; + fmtbuff_length = sizeof(fmtbuff_stack); + fmtbuff = fmtbuff_stack; + /* Try formatting into the stack buffer. */ va_start(ap, fmt); - length = vsnprintf(buff, buff_length, fmt, ap); + length = vsnprintf(fmtbuff, fmtbuff_length, fmt, ap); va_end(ap); - /* If the result is too large, allocate a buffer on the heap. */ - if (length >= buff_length) { - buff_length = length+1; - buff_heap = malloc(buff_length); - /* Failsafe: use the truncated string if malloc fails. */ - if (buff_heap != NULL) { - buff = buff_heap; + + /* If the result was too large, allocate a buffer on the heap. */ + if (length >= fmtbuff_length) { + fmtbuff_length = length+1; + fmtbuff_heap = malloc(fmtbuff_length); + + /* Reformat the result into the heap buffer if we can. */ + if (fmtbuff_heap != NULL) { + fmtbuff = fmtbuff_heap; va_start(ap, fmt); - length = vsnprintf(buff, buff_length, fmt, ap); + length = vsnprintf(fmtbuff, fmtbuff_length, fmt, ap); va_end(ap); + } else { + /* Leave fmtbuff pointing to the truncated + * string in fmtbuff_stack. */ + length = sizeof(fmtbuff_stack) - 1; } } + /* Note: mbrtowc() has a cleaner API, but mbtowc() seems a bit + * more portable, so we use that here instead. */ + mbtowc(NULL, NULL, 0); /* Reset the shift state. */ + /* Write data, expanding unprintable characters. */ - p = buff; + p = fmtbuff; i = 0; + try_wc = 1; while (*p != '\0') { - unsigned char c = *p++; + int n; - if (isprint(c) && c != '\\') - copy_buff[i++] = c; - else { - copy_buff[i++] = '\\'; - switch (c) { - case '\a': copy_buff[i++] = 'a'; break; - case '\b': copy_buff[i++] = 'b'; break; - case '\f': copy_buff[i++] = 'f'; break; - case '\n': copy_buff[i++] = 'n'; break; -#if '\r' != '\n' - /* On some platforms, \n and \r are the same. */ - case '\r': copy_buff[i++] = 'r'; break; -#endif - case '\t': copy_buff[i++] = 't'; break; - case '\v': copy_buff[i++] = 'v'; break; - case '\\': copy_buff[i++] = '\\'; break; - default: - sprintf(copy_buff + i, "%03o", c); - i += 3; + /* Convert to wide char, test if the wide + * char is printable in the current locale. */ + if (try_wc && (n = mbtowc(&wc, p, length)) != -1) { + length -= n; + if (iswprint(wc) && wc != L'\\') { + /* Printable, copy the bytes through. */ + while (n-- > 0) + outbuff[i++] = *p++; + } else { + /* Not printable, format the bytes. */ + while (n-- > 0) + i += bsdtar_expand_char( + outbuff, i, *p++); } + } else { + /* After any conversion failure, don't bother + * trying to convert the rest. */ + i += bsdtar_expand_char(outbuff, i, *p++); + try_wc = 0; } - /* If our temp buffer is full, dump it and keep going. */ - if (i > (sizeof(copy_buff) - 8)) { - copy_buff[i++] = '\0'; - fprintf(f, "%s", copy_buff); + /* If our output buffer is full, dump it and keep going. */ + if (i > (sizeof(outbuff) - 20)) { + outbuff[i++] = '\0'; + fprintf(f, "%s", outbuff); i = 0; } } - copy_buff[i++] = '\0'; - fprintf(f, "%s", copy_buff); + outbuff[i++] = '\0'; + fprintf(f, "%s", outbuff); + + /* If we allocated a heap-based formatting buffer, free it now. */ + if (fmtbuff_heap != NULL) + free(fmtbuff_heap); +} + +/* + * Render an arbitrary sequence of bytes into printable ASCII characters. + */ +static size_t +bsdtar_expand_char(char *buff, size_t offset, char c) +{ + size_t i = offset; + + if (isprint(c) && c != '\\') + buff[i++] = c; + else { + buff[i++] = '\\'; + switch (c) { + case '\a': buff[i++] = 'a'; break; + case '\b': buff[i++] = 'b'; break; + case '\f': buff[i++] = 'f'; break; + case '\n': buff[i++] = 'n'; break; +#if '\r' != '\n' + /* On some platforms, \n and \r are the same. */ + case '\r': buff[i++] = 'r'; break; +#endif + case '\t': buff[i++] = 't'; break; + case '\v': buff[i++] = 'v'; break; + case '\\': buff[i++] = '\\'; break; + default: + sprintf(buff + i, "%03o", 0xFF & (int)c); + i += 3; + } + } - /* If we allocated a heap-based buffer, free it now. */ - if (buff_heap != NULL) - free(buff_heap); + return (i - offset); } static void From owner-p4-projects@FreeBSD.ORG Sat Nov 29 23:34:17 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 5B5511065675; Sat, 29 Nov 2008 23:34:17 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1EE0E1065672 for ; Sat, 29 Nov 2008 23:34:17 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 106148FC0C for ; Sat, 29 Nov 2008 23:34:17 +0000 (UTC) (envelope-from pgj@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mATNYH4V023325 for ; Sat, 29 Nov 2008 23:34:17 GMT (envelope-from pgj@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mATNYGW1023323 for perforce@freebsd.org; Sat, 29 Nov 2008 23:34:16 GMT (envelope-from pgj@FreeBSD.org) Date: Sat, 29 Nov 2008 23:34:16 GMT Message-Id: <200811292334.mATNYGW1023323@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to pgj@FreeBSD.org using -f From: Gabor Pali To: Perforce Change Reviews Cc: Subject: PERFORCE change 153799 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, 29 Nov 2008 23:34:17 -0000 http://perforce.freebsd.org/chv.cgi?CH=153799 Change 153799 by pgj@kolbasz on 2008/11/29 23:33:35 IFC Affected files ... .. //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#19 integrate .. //depot/projects/docproj_hu/doc/share/pgpkeys/tabthorpe.key#2 integrate .. //depot/projects/docproj_hu/doc/share/sgml/freebsd.ent#6 integrate .. //depot/projects/docproj_hu/doc/share/sgml/urls.ent#2 integrate .. //depot/projects/docproj_hu/src_7/release/doc/en_US.ISO8859-1/hardware/article.sgml#4 integrate .. //depot/projects/docproj_hu/src_7/release/doc/en_US.ISO8859-1/relnotes/article.sgml#6 integrate .. //depot/projects/docproj_hu/www/en/cgi/man.cgi#8 integrate .. //depot/projects/docproj_hu/www/en/platforms/amd64/motherboards.sgml#4 integrate .. //depot/projects/docproj_hu/www/en/releases/6.4R/Makefile#3 integrate .. //depot/projects/docproj_hu/www/en/releases/6.4R/announce.sgml#2 integrate .. //depot/projects/docproj_hu/www/en/releases/6.4R/relnotes-alpha.html#2 integrate .. //depot/projects/docproj_hu/www/en/releases/6.4R/relnotes-amd64.html#2 integrate .. //depot/projects/docproj_hu/www/en/releases/6.4R/relnotes-i386.html#2 integrate .. //depot/projects/docproj_hu/www/en/releases/6.4R/relnotes-pc98.html#2 integrate .. //depot/projects/docproj_hu/www/en/releases/6.4R/relnotes-sparc64.html#2 integrate .. //depot/projects/docproj_hu/www/en/releases/6.4R/relnotes.sgml#2 integrate .. //depot/projects/docproj_hu/www/en/releases/6.4R/schedule.sgml#10 integrate .. //depot/projects/docproj_hu/www/en/releases/index.sgml#3 integrate .. //depot/projects/docproj_hu/www/en/releng/index.sgml#9 integrate .. //depot/projects/docproj_hu/www/en/search/opensearch/cvsweb.xml#2 integrate .. //depot/projects/docproj_hu/www/en/search/opensearch/man.xml#2 integrate .. //depot/projects/docproj_hu/www/en/search/opensearch/markmail.xml#2 integrate .. //depot/projects/docproj_hu/www/en/search/opensearch/message-id.xml#2 integrate .. //depot/projects/docproj_hu/www/en/search/opensearch/ports.xml#2 integrate .. //depot/projects/docproj_hu/www/en/search/opensearch/query-pr.xml#2 integrate .. //depot/projects/docproj_hu/www/en/search/opensearch/rambler.xml#2 integrate .. //depot/projects/docproj_hu/www/en/search/opensearch/web-all.xml#2 integrate .. //depot/projects/docproj_hu/www/en/search/opensearch/web.xml#2 integrate .. //depot/projects/docproj_hu/www/en/security/security.sgml#4 integrate .. //depot/projects/docproj_hu/www/share/sgml/advisories.xml#5 integrate .. //depot/projects/docproj_hu/www/share/sgml/events.xml#9 integrate .. //depot/projects/docproj_hu/www/share/sgml/navibar.ent#4 integrate .. //depot/projects/docproj_hu/www/share/sgml/news.xml#29 integrate .. //depot/projects/docproj_hu/www/share/sgml/release.ent#6 integrate Differences ... ==== //depot/projects/docproj_hu/doc/en_US.ISO8859-1/share/sgml/authors.ent#19 (text+ko) ==== @@ -13,7 +13,7 @@ builds for the other languages, and we will poke fun of you in public. - $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.466 2008/11/20 11:15:54 koitsu Exp $ + $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.467 2008/11/24 06:38:24 pgj Exp $ --> aaron@FreeBSD.org"> @@ -578,6 +578,8 @@ knu@FreeBSD.org"> +koitsu@FreeBSD.org"> + krion@FreeBSD.org"> kris@FreeBSD.org"> ==== //depot/projects/docproj_hu/doc/share/pgpkeys/tabthorpe.key#2 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -6,13 +6,13 @@ pub 1024D/D069F2A0 2005-07-06 Key fingerprint = 62EB 68F5 C1A4 8FCE 5A87 BE22 E469 BF8C D069 F2A0 uid Thomas Abthorpe (FreeBSD Committer) -uid Thomas Abthorpe +uid Thomas Abthorpe uid Thomas Abthorpe uid Thomas Abthorpe +uid Thomas Abthorpe +uid Thomas Abthorpe +uid Thomas Abthorpe uid Thomas Abthorpe -uid Thomas Abthorpe -uid Thomas Abthorpe -uid Thomas Abthorpe sub 2048g/16752D82 2005-07-06 ]]> ==== //depot/projects/docproj_hu/doc/share/sgml/freebsd.ent#6 (text+ko) ==== @@ -1,7 +1,7 @@ - - + + ==== //depot/projects/docproj_hu/doc/share/sgml/urls.ent#2 (text+ko) ==== @@ -1,4 +1,4 @@ - + @@ -86,10 +86,14 @@ + + + + @@ -98,6 +102,8 @@ + + @@ -120,16 +126,26 @@ + + + + - - + + + + + + + + @@ -140,6 +156,8 @@ + + @@ -158,6 +176,8 @@ + + @@ -170,5 +190,7 @@ + + ==== //depot/projects/docproj_hu/src_7/release/doc/en_US.ISO8859-1/hardware/article.sgml#4 (text+ko) ==== @@ -18,7 +18,7 @@ The &os; Documentation Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.326.2.4 2008/11/20 00:43:41 delphij Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.326.2.5 2008/11/24 20:05:14 delphij Exp $ 2000 @@ -615,6 +615,8 @@ Ethernet Interfaces + &hwlist.ale; + &hwlist.aue; &hwlist.axe; ==== //depot/projects/docproj_hu/src_7/release/doc/en_US.ISO8859-1/relnotes/article.sgml#6 (text+ko) ==== @@ -17,7 +17,7 @@ The &os; Project - $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1068.2.29 2008/11/20 00:43:41 delphij Exp $ + $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1068.2.30 2008/11/24 20:05:14 delphij Exp $ 2000 @@ -198,6 +198,11 @@ Network Interface Support + The &man.ale.4; driver has been added to provide support + for Atheros AR8121/AR8113/AR8114 Gigabit/Fast Ethernet controllers. + This driver is not enabled in GENERIC + kernels for this release. + The &man.em.4; driver has been split into two drivers with some common parts. The &man.em.4; driver will continue to support adapters up to the 82575, as well as new ==== //depot/projects/docproj_hu/www/en/cgi/man.cgi#8 (text+ko) ==== @@ -34,7 +34,7 @@ # Dual CGI/Plexus mode and new interface by sanders@bsdi.com 9/22/1995 # # $Id: man.cgi,v 1.172 2007/11/28 18:51:29 hrs Exp $ -# $FreeBSD: www/en/cgi/man.cgi,v 1.224 2008/11/09 18:29:53 wosch Exp $ +# $FreeBSD: www/en/cgi/man.cgi,v 1.225 2008/11/29 14:47:06 wosch Exp $ ############################################################################ # !!! man.cgi is stale perl4 code !!! @@ -164,8 +164,8 @@ %manPath = ( 'FreeBSD 7.0-RELEASE and Ports', "$manLocalDir/FreeBSD-7.0-RELEASE/man:$manLocalDir/FreeBSD-7.0-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports", - 'FreeBSD 6.3-RELEASE and Ports', -"$manLocalDir/FreeBSD-6.3-RELEASE/man:$manLocalDir/FreeBSD-6.3-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports", + 'FreeBSD 6.4-RELEASE and Ports', +"$manLocalDir/FreeBSD-6.4-RELEASE/man:$manLocalDir/FreeBSD-6.4-RELEASE/openssl/man:$manLocalDir/FreeBSD-ports", 'FreeBSD 8-current', "$manLocalDir/FreeBSD-8-current", @@ -174,7 +174,9 @@ "$manLocalDir/FreeBSD-7.0-RELEASE/man:$manLocalDir/FreeBSD-7.0-RELEASE/openssl/man", 'FreeBSD Ports 7.0-RELEASE', "$manLocalDir/FreeBSD-ports-7.0-RELEASE", - 'FreeBSD 6.3-stable', "$manLocalDir/FreeBSD-6.3-stable", + 'FreeBSD 6.4-stable', "$manLocalDir/FreeBSD-6.4-stable", + 'FreeBSD 6.4-RELEASE', +"$manLocalDir/FreeBSD-6.4-RELEASE/man:$manLocalDir/FreeBSD-6.4-RELEASE/openssl/man", 'FreeBSD 6.3-RELEASE', "$manLocalDir/FreeBSD-6.3-RELEASE/man:$manLocalDir/FreeBSD-6.3-RELEASE/openssl/man", @@ -464,7 +466,7 @@ 'freebsd-stable', 'FreeBSD 7.0-stable', 'freebsd-stable7', 'FreeBSD 7.0-stable', - 'freebsd-stable6', 'FreeBSD 6.3-stable', + 'freebsd-stable6', 'FreeBSD 6.4-stable', 'freebsd-current', 'FreeBSD 8-current', 'freebsd-release-ports', 'FreeBSD 7.0-RELEASE and Ports', @@ -1373,7 +1375,7 @@ } local $id = - '$FreeBSD: www/en/cgi/man.cgi,v 1.224 2008/11/09 18:29:53 wosch Exp $'; + '$FreeBSD: www/en/cgi/man.cgi,v 1.225 2008/11/29 14:47:06 wosch Exp $'; return qq{\ 
     Copyright (c) 1996-2008 Wolfram Schneider

==== //depot/projects/docproj_hu/www/en/platforms/amd64/motherboards.sgml#4 (text+ko) ====

@@ -1,6 +1,6 @@
 
-
+
 
 
 
@@ -15,8 +15,10 @@
     know about it.  Please submit new entries or correction of existing
     entries using
     send-pr(1)
-    or web form.  Please set category
-    to www.
    
+    or web form.  Please give details
+    on which peripherals have been tested (network, sound etc), provide
+    the output of pciconf -lv and dmesg, and set the
+    PR category to www.
    
 
   
@@ -632,6 +634,27 @@
     
+      
+      
+      
+      
+      
+    
+    
+      
+      
+      
+      
+      
+      
+    
+    
+      
+      
+      
+      
+      
+      
+    
+    
+      
@@ -1133,6 +1166,16 @@
     
+      
+      
+      
+      
+      
+    
+    
+      
+      
+      
+      
+      
+      
+    
+    

==== //depot/projects/docproj_hu/www/en/releases/6.4R/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: www/en/releases/6.4R/Makefile,v 1.2 2008/11/06 15:47:57 hrs Exp $
+# $FreeBSD: www/en/releases/6.4R/Makefile,v 1.5 2008/11/28 18:08:16 hrs Exp $
 
 .if exists(../Makefile.conf)
 .include "../Makefile.conf"
@@ -7,13 +7,13 @@
 .include "../Makefile.inc"
 .endif
 
-#DOCS=	announce.sgml
-DOCS=	relnotes.sgml
+DOCS=	announce.sgml
+DOCS+=	relnotes.sgml
 DOCS+=	hardware.sgml
 DOCS+=	installation.sgml
 DOCS+=	schedule.sgml
 
-DATA+=	errata.html
+DATA=	errata.html
 DATA+=	hardware-alpha.html
 DATA+=	hardware-amd64.html
 DATA+=	hardware-i386.html
@@ -34,6 +34,6 @@
 DATA+=	relnotes-powerpc.html
 DATA+=	relnotes-sparc64.html
 
-DATA=	docbook.css
+DATA+=	docbook.css
 
 .include "${WEB_PREFIX}/share/mk/web.site.mk"

==== //depot/projects/docproj_hu/www/en/releases/6.4R/announce.sgml#2 (text+ko) ====

@@ -1,13 +1,327 @@
 
-
+
 ]>
 
 &header;
 
-
    Not yet announced.
    
+  
    The FreeBSD Release Engineering Team is pleased to announce the availability
+    of FreeBSD 6.4-RELEASE.  At this time 6.4-RELEASE is expected to be the
+    last of the 6-STABLE releases.  Some of the highlights:
    
+
+  
      
+    
    • New and much-improved NFS Lock Manager (NLM)
+      client
      • 
+    
    • Support for the Camellia cipher
      • 
+    
    • boot loader changes allow, among other things, booting
+      from USB devices and booting from GPT-labeled devices with
+      GPT-enabled BIOSes
      • 
+    
    • DVD install ISO images for amd64/i386
      • 
+    
    • KDE updated to 3.5.10, GNOME updated to 2.22.3
      • 
+    
    • Updates for BIND, sendmail, OpenPAM, and others
      • 
+  
    
+
+  
    For a complete list of new features and known problems, please see the
+    online release notes and errata list, available at:
    
+
+  
+
+  
    For more information about FreeBSD release engineering activities,
+    please see:
    
+
+  
    http://www.FreeBSD.org/releng/
    
+
+  
    The FreeBSD Security Team intends to support 6.4-RELEASE until
+    November 30th, 2010.
    
+
+  
    Availability
    
+
+  
    FreeBSD 6.4-RELEASE is now available for the amd64, i386, pc98, and sparc64
+    architectures.  The builds for the alpha architecture have not completed
+    yet and will be announced later.  FreeBSD 6.4-RELEASE can be installed
+    from bootable ISO images or over the network; the required files can be
+    downloaded via FTP or BitTorrent as described in the sections below.
+    While some of the smaller FTP mirrors may not carry all architectures,
+    they will all generally contain the more common ones, such as i386 and
+    amd64.
    
+
+  
    MD5 and SHA256 hashes for the release ISO images are included at the
+    bottom of this message.
    
+
+  
    The contents of the ISO images provided as part of the release has changed
+    for most of the architectures.  Using the i386 architecture as an example,
+    there are ISO images named "bootonly", "disc1", "disc2", "disc3", "docs",
+    and "dvd1".  The "bootonly" image is suitable for booting a machine to do
+    a network based installation using FTP or NFS.  The "disc1", "disc2", and
+    "disc3" images are CDROM-sized (700MB media) and are used to do a full
+    installation that includes a basic set of packages and does not require
+    network access to an FTP or NFS server during the installation.  In addition,
+    "disc1" supports booting into a "live CD-based filesystem" and system rescue
+    mode.  The "docs" image has all of the documentation for all supported
+    languages.  The "dvd1" image is DVD-sized and includes everything that is
+    on the CDROM discs.  So "dvd1" can be used to do a full installation that
+    includes a basic set of packages, it has all of the documentation for all
+    supported languages, and it can be used for booting into a "live CD-based
+    filesystem" and system rescue mode.  Most people will find that "disc1",
+    "disc2" and "disc3" are all that are needed if their machine does not have
+    a DVD-capable drive.  For people with machines that do have a DVD-capable
+    drive "dvd1" should be all that is required.  If you intend to install ports
+    from source instead of using the pre-built packages included with the release
+    only "disc1" is needed.
    
+
+  
    FreeBSD 6.4-RELEASE can also be purchased on CD-ROM from several
+    vendors.  One of the vendors that will be offering FreeBSD 6.4-based
+    products is:
    
+
+  
+
+
+  
    BitTorrent
    
+
+  
    6.4-RELEASE ISOs are available via BitTorrent.  A collection of torrent
+    files to download the images is available at:
    
+
+  
    http://torrents.freebsd.org:8080
    
+
+  
    FTP
    
+
+  
    At the time of this announcement the following FTP sites have
+    FreeBSD 6.4-RELEASE available.
    
+
+  
+
+  
    However before trying these sites you may want to check your regional
+    mirror(s) first by going to:
    
+
+  
    ftp://ftp.<yourdomain>.FreeBSD.org/pub/FreeBSD
    
+
+  
    Any additional mirror sites will be labeled ftp2,
+    ftp3 and so on.
    
+
+  
    More information about FreeBSD mirror sites can be found at:
    
+
+  
    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/mirrors-ftp.html
    
+
+  
    For instructions on installing FreeBSD, please see Chapter 2 of The
+    FreeBSD Handbook.  It provides a complete installation walk-through
+    for users new to FreeBSD, and can be found online at:
    
+
+  
    http://www.FreeBSD.org/doc/en_US.ISO8859-1/books/handbook/install.html
    
+
+  
    FreeBSD Update
    
+
+  
    The freebsd-update(8) utility supports binary upgrades of i386 and amd64
+    systems running earlier FreeBSD releases.  Systems running 6.3-RELEASE,
+    6.4-BETA, 6.4-RC1, or 6.4-RC2 can upgrade as follows:
    
+
+  
    # freebsd-update upgrade -r 6.4-RELEASE
    
+
+  
    During this process, FreeBSD Update may ask the user to help by merging
+    some configuration files or by confirming that the automatically performed
+    merging was done correctly.
    
+
+  
    # freebsd-update install
    
+
+  
    The system must be rebooted with the newly installed kernel before continuing.
    
+
+  
    # shutdown -r now
    
+
+  
    After rebooting, freebsd-update needs to be run again to install the new
+    userland components, and the system needs to be rebooted again:
    
+
+  
    # freebsd-update install
    
+  
    # shutdown -r now
    
+
+  
    Note that FreeBSD Update stores downloaded upgrades in /var/db/freebsd-update,
+    so at least 400MB should be free in /var before running freebsd-update; if
+    the /var partition is too small, the -d option to freebsd-update can be used
+    to indicate that the upgrades should be stored in a different directory.
    
+
+  
    For more information, see:
    
+
+  
    http://www.daemonology.net/blog/2007-11-10-freebsd-minor-version-upgrade.html
    
+
+  
    Acknowledgments
    
+
+  
    Many companies donated equipment, network access, or man-hours to
+    finance the release engineering activities for FreeBSD 6.4 including
+    The FreeBSD Foundation, FreeBSD Systems, Hewlett-Packard, Yahoo!,
+    Network Appliances, and Sentex Communications.
    
+
+  
    The release engineering team for 6.4-RELEASE includes:
    
+
+  
    
     
    
     
    
       GigabyteGA-MA790X-DS4AMD 790X / Socket AM2Terry R. Friedrichsen
+	  (dmesg)7.0-RELEASETested with Quad-core AMD Phenom (9750), 4Gb RAM.  SATA and IDE works,
+	 on-board Ethernet flaky but additional PCI network card works fine.
+	 Sound, serial, USB, Firewire and RAID untested.
    GigabyteGA-P35-DS3LIntel P35 / Socket 775Ben Kaduk
+	  (dmesg, pciconf)7.0-STABLE (May 2008)Tested with 4Gb RAM and Intel Q6600 Core 2 quad core CPU.
+          SATA/PATA and onboard network card work well, sound untested.
    Gigabyte
       GA-P35-DS4
       Intel P35 / Socket 775
       Torsten Hantzsche
@@ -970,6 +993,16 @@
     
    
     
    
       SunFire X2100 M2nVidia nForce 4 / Socket 939Markus Fröhlich
+	  (dmesg, pciconf)7.0-RELEASENo problems reported.  hw.bge.allow_asf=1 needs to be added to
+	  /boot/loader.conf for the eLOM to work.
    Sun
       Fire X4100
       AMD 8111/8131 / Socket 940 - 2x Opteron
       Vivek Khera
    
     
    
       TyanTiger K9HE (S3970)ServerWorks BCM5785 (HT1000) / AMD Socket F (1207)Chris Shenton
+	  (dmesg, pciconf)7.0-RELEASE and 7-STABLE (June 2008)On board NICs, video and SATA work well.  Tested in a Tyan Transport GT20
+	  (B3970-U) server.
    Tyan
       Tomcat h1000S (S3950)
       Broadcom HT-1000 / Socket AM2
       Philipp Wuensche
@@ -1214,6 +1257,17 @@
 	  supported under ndis.  Modem and flash card reader not supported.
     
    
     
    SonyVaio VGN-TZ31WN/BGavin Atkinson
+	  (dmesg, pciconf)7.0-STABLE-200807Wired network, sound and video work fine, Xorg works nicely.  Camera,
+	  bluetooth, fingerprint reader and built in modems untested.  Wireless
+	  network card works with iwn(4) driver from CURRENT so should work in
+	  7.x when the driver is MFC'd.
    
       Toshiba
       A135-S4517
       Jeff Palmer
 
 
    
+    
+      
+	
+        
+      
+
+      
+	
+	
+      
+
+      
+	
+	
+      
+
+      
+	
+	
+      
+
+      
+	
+	
+      
+
+      
+	
+	
+      
+
+      
+	
+	
+      
+
+      
+	
+	
+      
+
+      
+	
+	
+      
+
+      
+	
+	
+      
+
+      
+	
+	
+      
+
+      
+	
+        
+      
+
+      
+	
+	
+      
+
+      
+	
+	
+      
+
+      
+	
+	
+      
+
+      
+	
+	
+      
+
+      
+	
+	
+      
+
+      
+	
+	
+      
+    
+  
    Ken Smith <kensmith@FreeBSD.org>Release Engineering,
+	  amd64, i386, sparc64 Release Building,
+	  Mirror Site Coordination
    Robert Watson <rwatson@FreeBSD.org>Release Engineering, Security
    Konstantin Belousov <kib@FreeBSD.org>Release Engineering
    Marc Fonvieille <blackend@FreeBSD.org>Release Engineering, Documentation
    Maxime Henrion <mux@FreeBSD.org>Release Engineering
    Bruce A. Mah <bmah@FreeBSD.org>Release Engineering, Documentation
    George Neville-Neil <gnn@FreeBSD.org>Release Engineering
    Hiroki Sato <hrs@FreeBSD.org>Release Engineering, Documentation
    Murray Stokely <murray@FreeBSD.org>Release Engineering
    Wilko Bulte <wilko@FreeBSD.org>Alpha Release Building
    Takahashi Yoshihiro <nyan@FreeBSD.org>PC98 Release Building
    Kris Kennaway <kris@FreeBSD.org>Package Building
    Joe Marcus Clarke <marcus@FreeBSD.org>Package Building
    Erwin Lansing <erwin@FreeBSD.org>Package Building
    Mark Linimon <linimon@FreeBSD.org>Package Building
    Pav Lucistnik <pav@FreeBSD.org>Package Building
    Colin Percival <cperciva@FreeBSD.org>Security Officer
    Peter Wemm <peter@FreeBSD.org>Bittorrent Coordination
    
+
+  
    Trademark
    
+
+  
    FreeBSD is a registered trademark of The FreeBSD Foundation.
    
+
+  
    ISO Image Checksums
    
+
+  
    MD5 (6.4-RELEASE-amd64-bootonly.iso) = 922fa2b990b3fd58bc558e08707dec47
+MD5 (6.4-RELEASE-amd64-disc1.iso) = 33e9801d546a9bd379d97c4dc9bf833f
+MD5 (6.4-RELEASE-amd64-disc2.iso) = 10e4a74cd4e80b52845adbabeb017532
+MD5 (6.4-RELEASE-amd64-disc3.iso) = 986d99df8a44cb3e8647b53e1551a56b
+MD5 (6.4-RELEASE-amd64-docs.iso) = be48876a37812fa19fb67aebe0c847de
+MD5 (6.4-RELEASE-amd64-dvd1.iso) = efd0dd71c5b13b8464d8a7fce8a90cbc
+
+MD5 (6.4-RELEASE-i386-bootonly.iso) = d3704b309b224fadeba29423511fbcff
+MD5 (6.4-RELEASE-i386-disc1.iso) = 3bf0054bf0d650c1c7289e3076f2a24f
+MD5 (6.4-RELEASE-i386-disc2.iso) = 2e5c68f0e8e82907e28394248973f2f6
+MD5 (6.4-RELEASE-i386-disc3.iso) = 75c4b9ed4bfc836471ca6aad7ff071db
+MD5 (6.4-RELEASE-i386-docs.iso) = a7e89a2006b34d5904ce74c907932918
+MD5 (6.4-RELEASE-i386-dvd1.iso) = 01d1b4445bbb70e643e7a096562ca4a3
+
+MD5 (6.4-RELEASE-pc98-bootonly.iso) = 6137dac091894d4eb620b02a94e3ddb6
+MD5 (6.4-RELEASE-pc98-disc1.iso) = 1ac648575affdb79e6f345b1210fee1b
+
+MD5 (6.4-RELEASE-sparc64-bootonly.iso) = 060cdc6c4fbcc96dcc13a88c09005079
+MD5 (6.4-RELEASE-sparc64-disc1.iso) = 2e2f264f9cdbfd73c531943631174dac
+MD5 (6.4-RELEASE-sparc64-docs.iso) = 33187d3f0459dbb2d1145aa8a4731497
+
+SHA256 (6.4-RELEASE-amd64-bootonly.iso) = 228cfe8b5d06bdf3131a656972d94919b594371464e5f1c68e068af17b88f382
+SHA256 (6.4-RELEASE-amd64-disc1.iso) = 6e8f24e153d78518268129db62e5efd3cd7b75e428a3c22bddf89eb901efa79e
+SHA256 (6.4-RELEASE-amd64-disc2.iso) = 33697f3290e9754baada1feeb560f5797a8794f80ea36ecc8b0305c0ab32f07a
+SHA256 (6.4-RELEASE-amd64-disc3.iso) = 59905ac81bc49be620e6a1465aba667be78b9276d999d820cca30357b073c263
+SHA256 (6.4-RELEASE-amd64-docs.iso) = 1bf1445e2cf19c108adfa973cab26891c3c9ee19664de3650f38fc11c67d9f9e
+SHA256 (6.4-RELEASE-amd64-dvd1.iso) = 88a0bd7818ecc2c26a6d304bffa9257f9bd192d6fb3b51ab1b538a5ef0e78130
+
+SHA256 (6.4-RELEASE-i386-bootonly.iso) = 82377be5c922610e7613f70066919da6d39c1e3fc753b6b925eae9bdd22ac946
+SHA256 (6.4-RELEASE-i386-disc1.iso) = c4f688013a27632e97caefc71296f59c9597abdb4e724385130d72dbd9abd218
+SHA256 (6.4-RELEASE-i386-disc2.iso) = 4936aaede7c55c29f1acb07724a86690ae220f53ba2f67b441f15fa0a4b282e8
+SHA256 (6.4-RELEASE-i386-disc3.iso) = 0c0ea48e2a07f2fc78c7d9448ad7cc24ffd224bbe4a9c1f7731358d7ce00d377
+SHA256 (6.4-RELEASE-i386-docs.iso) = 13ef3a3fe8799b71130ac2041e63156b30751d292d9d2df68f2b4a4318cbcc98
+SHA256 (6.4-RELEASE-i386-dvd1.iso) = 40b70eb8b36a5a13ef012592335d8e53cb9dea129a8b59971a999e84659ec6a8
+
+SHA256 (6.4-RELEASE-pc98-bootonly.iso) = 2d0fc39c377c8bf6e3ff1ab61b8ecd9b94231e3331bc442be7f26b37ed4cf59d
+SHA256 (6.4-RELEASE-pc98-disc1.iso) = dd2679fe503f7936fd4f7a6f5aa30e9c699d7eb78d382bef46eb9106dd0ab892
+
+SHA256 (6.4-RELEASE-sparc64-bootonly.iso) = eeabf33aa11cc764f41ea9bb50ae9109817953a60d22ed4af8c6bf61885ed648
+SHA256 (6.4-RELEASE-sparc64-disc1.iso) = c20f0a43732d72071cfdc17d788f3e04c1ac33e5ba122ce82fbd705ade482860
+SHA256 (6.4-RELEASE-sparc64-docs.iso) = 1728658de8be72e62afbc10bc50243cf07c532b8b4cf7426c5f74f09dc5b8243
    
 
 	    &footer;
   

==== //depot/projects/docproj_hu/www/en/releases/6.4R/relnotes-alpha.html#2 (text+ko) ====

@@ -21,8 +21,8 @@
 2008 The FreeBSD Documentation Project
    
 
 
    $FreeBSD:
-releng/6.4/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml 184446 2008-10-29
-19:11:03Z hrs $
    
+releng/6.4/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml 185279 2008-11-25
+02:19:13Z hrs $
    
 
    
 
 
    
@@ -223,6 +223,18 @@
 
    IPv6 Neighbor Discovery Protocol routing vulnerability
    
 
 
+
+
+SA-08:11.arc4random
+24 November 2008
+
+
    
+arc4random(9)
+predictable sequence vulnerability
    
+
+
 
 
 
    
@@ -268,7 +280,10 @@
 library. It also implements recovery from server restarts and ensures that dirty cache
 blocks are written to the server before obtaining locks (allowing multiple clients to use
 file locking to safely share data). Also, a new kernel option options
-NFSLOCKD has been added and enabled by default.
    
+NFSLOCKD has been added and enabled by default. If the kernel support is enabled, 
+rpc.lockd(8)
+automatically detects and uses the functionality.
    
 
 
    
 
    

==== //depot/projects/docproj_hu/www/en/releases/6.4R/relnotes-amd64.html#2 (text+ko) ====

@@ -21,8 +21,8 @@
 2008 The FreeBSD Documentation Project
    
 
 
    $FreeBSD:
-releng/6.4/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml 184446 2008-10-29
-19:11:03Z hrs $
    
+releng/6.4/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml 185279 2008-11-25
+02:19:13Z hrs $
    
 
    
 
 
    
@@ -223,6 +223,18 @@
 
    IPv6 Neighbor Discovery Protocol routing vulnerability
    
 
 
+
+
+SA-08:11.arc4random
+24 November 2008
+
+
    
+arc4random(9)
+predictable sequence vulnerability
    
+
+
 
 
 
    
@@ -268,7 +280,10 @@
 library. It also implements recovery from server restarts and ensures that dirty cache
 blocks are written to the server before obtaining locks (allowing multiple clients to use
 file locking to safely share data). Also, a new kernel option options
-NFSLOCKD has been added and enabled by default.
    
+NFSLOCKD has been added and enabled by default. If the kernel support is enabled, 
+rpc.lockd(8)
+automatically detects and uses the functionality.
    
 
 
    
 
    

==== //depot/projects/docproj_hu/www/en/releases/6.4R/relnotes-i386.html#2 (text+ko) ====

@@ -21,8 +21,8 @@
 2008 The FreeBSD Documentation Project
    

>>> TRUNCATED FOR MAIL (1000 lines) <<<

From owner-p4-projects@FreeBSD.ORG  Sat Nov 29 23:38:21 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9CCD91065675; Sat, 29 Nov 2008 23:38:21 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 612D91065672
	for ; Sat, 29 Nov 2008 23:38:21 +0000 (UTC)
	(envelope-from csjp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 535E18FC14
	for ; Sat, 29 Nov 2008 23:38:21 +0000 (UTC)
	(envelope-from csjp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mATNcLLx023646
	for ; Sat, 29 Nov 2008 23:38:21 GMT
	(envelope-from csjp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mATNcLV4023644
	for perforce@freebsd.org; Sat, 29 Nov 2008 23:38:21 GMT
	(envelope-from csjp@freebsd.org)
Date: Sat, 29 Nov 2008 23:38:21 GMT
Message-Id: <200811292338.mATNcLV4023644@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 153800 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, 29 Nov 2008 23:38:21 -0000

http://perforce.freebsd.org/chv.cgi?CH=153800

Change 153800 by csjp@hvm02 on 2008/11/29 23:37:23

	Fix a bug in how we calculate the total length or size for the token.
	We accounted for the NULL termination characters twice.

Affected files ...

.. //depot/projects/trustedbsd/openbsm/NEWS#13 edit
.. //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#75 edit

Differences ...

==== //depot/projects/trustedbsd/openbsm/NEWS#13 (text+ko) ====

@@ -1,5 +1,9 @@
 OpenBSM Version History
 
+- Fix a bug how au_to_exec_args(3) and au_to_exec_env(3) calculates the total
+  size for the token.  This bug resulted in "unknown" tokens being printed
+  after the exec args/env tokens.
+
 OpenBSM 1.1 alpha 3
 
 - Add two new functions, au_bsm_to_errno() and au_errno_to_bsm(), to map
@@ -356,4 +360,4 @@
   to support reloading of kernel event table.
 - Allow comments in /etc/security configuration files.
 
-$P4: //depot/projects/trustedbsd/openbsm/NEWS#12 $
+$P4: //depot/projects/trustedbsd/openbsm/NEWS#13 $

==== //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#75 (text+ko) ====

@@ -30,7 +30,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/bsm_token.c#74 $
+ * $P4: //depot/projects/trustedbsd/openbsm/libbsm/bsm_token.c#75 $
  */
 
 #include 
@@ -1207,7 +1207,6 @@
 		nextarg = *(argv + count);
 	}
 
-	totlen += count * sizeof(char);	/* nul terminations. */
 	GET_TOKEN_AREA(t, dptr, sizeof(u_char) + sizeof(u_int32_t) + totlen);
 	if (t == NULL)
 		return (NULL);
@@ -1269,7 +1268,6 @@
 		nextenv = *(envp + count);
 	}
 
-	totlen += sizeof(char) * count;
 	GET_TOKEN_AREA(t, dptr, sizeof(u_char) + sizeof(u_int32_t) + totlen);
 	if (t == NULL)
 		return (NULL);

From owner-p4-projects@FreeBSD.ORG  Sat Nov 29 23:50:34 2008
Return-Path: 
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 4F4991065673; Sat, 29 Nov 2008 23:50:34 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1347D1065670
	for ; Sat, 29 Nov 2008 23:50:34 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 04FF58FC19
	for ; Sat, 29 Nov 2008 23:50:34 +0000 (UTC)
	(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id mATNoXLx024577
	for ; Sat, 29 Nov 2008 23:50:33 GMT
	(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.3/8.14.3/Submit) id mATNoXmW024575
	for perforce@freebsd.org; Sat, 29 Nov 2008 23:50:33 GMT
	(envelope-from pgj@FreeBSD.org)
Date: Sat, 29 Nov 2008 23:50:33 GMT
Message-Id: <200811292350.mATNoXmW024575@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	pgj@FreeBSD.org using -f
From: Gabor Pali 
To: Perforce Change Reviews 
Cc: 
Subject: PERFORCE change 153801 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, 29 Nov 2008 23:50:34 -0000

http://perforce.freebsd.org/chv.cgi?CH=153801

Change 153801 by pgj@kolbasz on 2008/11/29 23:50:33

	MFen (www):
	    1.21       -> 1.23       hu/share/sgml/navibar.l10n.ent

Affected files ...

.. //depot/projects/docproj_hu/www/hu/share/sgml/navibar.l10n.ent#14 edit

Differences ...

==== //depot/projects/docproj_hu/www/hu/share/sgml/navibar.l10n.ent#14 (text+ko) ====

@@ -4,7 +4,7 @@
 
 
 
@@ -24,6 +24,7 @@
     
  • Hírek
    • 
     
  • Események
    • 
     
  • Sajtó
    • 
+    
  • Multimédia anyagok
    • 
     
  • Illusztrációk
    • 
     
  • Logó
    • 
     
  • Adományok
    • 
@@ -41,6 +42,7 @@