Date: Wed, 20 Aug 2008 01:49:54 GMT From: Julian Elischer <julian@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 147862 for review Message-ID: <200808200149.m7K1nsE4060681@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=147862 Change 147862 by julian@julian_trafmon1 on 2008/08/20 01:48:54 bring back some format fixes and IFC@147861 Affected files ... .. //depot/projects/vimage/src/sys/arm/at91/at91.c#5 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_pio.c#3 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_piovar.h#2 integrate .. //depot/projects/vimage/src/sys/arm/at91/at91_pmc.c#5 integrate .. //depot/projects/vimage/src/sys/dev/acpi_support/acpi_asus.c#8 integrate .. //depot/projects/vimage/src/sys/net/if.c#33 integrate .. //depot/projects/vimage/src/sys/netgraph/ng_base.c#34 integrate .. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#39 integrate .. //depot/projects/vimage/src/sys/netinet/ip_input.c#30 integrate .. //depot/projects/vimage/src/sys/netinet/ip_mroute.c#11 integrate .. //depot/projects/vimage/src/sys/netinet/raw_ip.c#26 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#21 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_input.c#31 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#46 integrate .. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#35 integrate .. //depot/projects/vimage/src/sys/netinet6/in6.c#20 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_gif.c#12 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#22 integrate .. //depot/projects/vimage/src/sys/netinet6/in6_pcb.c#20 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6.c#29 integrate .. //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#16 integrate .. //depot/projects/vimage/src/sys/sys/sysctl.h#21 integrate .. //depot/projects/vimage/src/sys/vm/vm_meter.c#10 integrate Differences ... ==== //depot/projects/vimage/src/sys/arm/at91/at91.c#5 (text) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.16 2008/04/20 23:29:06 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.17 2008/08/19 22:15:14 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -304,7 +304,7 @@ { "at91_udp", 0, AT91RM92_BASE + AT91RM92_UDP_BASE, AT91RM92_UDP_SIZE, - AT91RM92_IRQ_UDP + AT91RM92_IRQ_UDP, AT91RM92_IRQ_PIOB }, { "at91_mci", 0, ==== //depot/projects/vimage/src/sys/arm/at91/at91_pio.c#3 (text) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pio.c,v 1.5 2007/02/23 12:18:27 piso Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pio.c,v 1.6 2008/08/19 22:17:14 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -349,6 +349,49 @@ PIO[PIO_CODR / 4] = data_mask; } +uint8_t +at91_pio_gpio_get(uint32_t pio, uint32_t data_mask) +{ + uint32_t *PIO = (uint32_t *)(AT91RM92_BASE + pio); + + data_mask &= PIO[PIO_PDSR / 4]; + + return (data_mask ? 1 : 0); +} + +void +at91_pio_gpio_set_deglitch(uint32_t pio, uint32_t data_mask, int use_deglitch) +{ + uint32_t *PIO = (uint32_t *)(AT91RM92_BASE + pio); + + if (use_deglitch) + PIO[PIO_IFER / 4] = data_mask; + else + PIO[PIO_IFDR / 4] = data_mask; + return; +} + +void +at91_pio_gpio_set_interrupt(uint32_t pio, uint32_t data_mask, + int enable_interrupt) +{ + uint32_t *PIO = (uint32_t *)(AT91RM92_BASE + pio); + + if (enable_interrupt) + PIO[PIO_IER / 4] = data_mask; + else + PIO[PIO_IDR / 4] = data_mask; + return; +} + +uint32_t +at91_pio_gpio_clear_interrupt(uint32_t pio) +{ + uint32_t *PIO = (uint32_t *)(AT91RM92_BASE + pio); + /* reading this register will clear the interrupts */ + return (PIO[PIO_ISR / 4]); +} + static device_method_t at91_pio_methods[] = { /* Device interface */ DEVMETHOD(device_probe, at91_pio_probe), ==== //depot/projects/vimage/src/sys/arm/at91/at91_piovar.h#2 (text+ko) ==== @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD: src/sys/arm/at91/at91_piovar.h,v 1.2 2006/07/14 22:22:57 imp Exp $ */ +/* $FreeBSD: src/sys/arm/at91/at91_piovar.h,v 1.3 2008/08/19 22:17:14 imp Exp $ */ #ifndef ARM_AT91_AT91_PIOVAR_H #define ARM_AT91_AT91_PIOVAR_H @@ -35,5 +35,9 @@ int use_pullup); void at91_pio_gpio_set(uint32_t pio, uint32_t data_mask); void at91_pio_gpio_clear(uint32_t pio, uint32_t data_mask); +uint8_t at91_pio_gpio_get(uint32_t pio, uint32_t data_mask); +void at91_pio_gpio_set_deglitch(uint32_t pio, uint32_t data_mask, int use_deglitch); +void at91_pio_gpio_set_interrupt(uint32_t pio, uint32_t data_mask, int enable_interrupt); +uint32_t at91_pio_gpio_clear_interrupt(uint32_t pio); #endif /* ARM_AT91_AT91_PIOVAR_H */ ==== //depot/projects/vimage/src/sys/arm/at91/at91_pmc.c#5 (text) ==== @@ -25,7 +25,7 @@ #include "opt_at91.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pmc.c,v 1.6 2008/07/22 14:04:06 stas Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pmc.c,v 1.7 2008/08/19 22:16:10 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -128,7 +128,7 @@ static struct at91_pmc_clock ohci_clk = { .name = "ohci_clk", .parent = &mck, - .pmc_mask = 1 << AT91RM92_IRQ_UDP, + .pmc_mask = 1 << AT91RM92_IRQ_UHP, .set_mode = &at91_pmc_set_periph_mode }; ==== //depot/projects/vimage/src/sys/dev/acpi_support/acpi_asus.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.37 2008/08/09 11:14:05 des Exp $"); +__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.38 2008/08/19 22:28:24 rpaulo Exp $"); /* * Driver for extra ACPI-controlled gadgets (hotkeys, leds, etc) found on @@ -291,7 +291,7 @@ }, { .name = "L8L" - /* Only has hotkeys, apparantly */ + /* Only has hotkeys, apparently */ }, { .name = "M1A", ==== //depot/projects/vimage/src/sys/net/if.c#33 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * @(#)if.c 8.5 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/net/if.c,v 1.282 2008/08/17 23:27:27 bz Exp $ + * $FreeBSD: src/sys/net/if.c,v 1.283 2008/08/20 01:05:56 julian Exp $ */ #include "opt_compat.h" ==== //depot/projects/vimage/src/sys/netgraph/ng_base.c#34 (text+ko) ==== @@ -38,7 +38,7 @@ * Authors: Julian Elischer <julian@freebsd.org> * Archie Cobbs <archie@freebsd.org> * - * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.161 2008/08/17 23:27:27 bz Exp $ + * $FreeBSD: src/sys/netgraph/ng_base.c,v 1.162 2008/08/20 01:05:56 julian Exp $ * $Whistle: ng_base.c,v 1.39 1999/01/28 23:54:53 julian Exp $ */ ==== //depot/projects/vimage/src/sys/netinet/ip_fw2.c#39 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netinet/ip_fw2.c,v 1.188 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/ip_fw2.c,v 1.189 2008/08/20 01:05:56 julian Exp $"); #define DEB(x) #define DDB(x) x @@ -4123,8 +4123,8 @@ if (bp + i <= ep) { bcopy(rule, bp, i); /* - * XXX HACK. Store the disable mask in the "next" pointer - * in a wild attempt to keep the ABI the same. + * XXX HACK. Store the disable mask in the "next" + * pointer in a wild attempt to keep the ABI the same. * Why do we do this on EVERY rule? */ bcopy(&V_set_disable, @@ -4522,7 +4522,7 @@ } done: callout_reset(&V_ipfw_timeout, V_dyn_keepalive_period * hz, - ipfw_tick, arg); + ipfw_tick, arg); } static int vnet_ipfw_iattach(const void *unused) ==== //depot/projects/vimage/src/sys/netinet/ip_input.c#30 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netinet/ip_input.c,v 1.339 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/ip_input.c,v 1.341 2008/08/20 01:24:55 julian Exp $"); #include "opt_bootp.h" #include "opt_ipfw.h" ==== //depot/projects/vimage/src/sys/netinet/ip_mroute.c#11 (text+ko) ==== @@ -54,7 +54,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netinet/ip_mroute.c,v 1.140 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/ip_mroute.c,v 1.141 2008/08/20 01:05:56 julian Exp $"); #include "opt_inet.h" #include "opt_inet6.h" ==== //depot/projects/vimage/src/sys/netinet/raw_ip.c#26 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netinet/raw_ip.c,v 1.192 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/raw_ip.c,v 1.193 2008/08/20 01:05:56 julian Exp $"); #include "opt_inet6.h" #include "opt_ipsec.h" ==== //depot/projects/vimage/src/sys/netinet/tcp_hostcache.c#21 (text+ko) ==== @@ -58,7 +58,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netinet/tcp_hostcache.c,v 1.18 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/tcp_hostcache.c,v 1.20 2008/08/20 01:24:55 julian Exp $"); #include "opt_inet6.h" @@ -217,8 +217,8 @@ * XXX don't need a separate zone for each hc instance - revisit!!! */ V_tcp_hostcache.zone = - uma_zcreate("hostcache", sizeof(struct hc_metrics), - NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); + uma_zcreate("hostcache", sizeof(struct hc_metrics), + NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0); uma_zone_set_max(V_tcp_hostcache.zone, V_tcp_hostcache.cache_limit); /* @@ -226,7 +226,6 @@ */ callout_init(&V_tcp_hc_callout, CALLOUT_MPSAFE); callout_reset(&V_tcp_hc_callout, V_tcp_hostcache.prune * hz, - tcp_hc_purge, curvnet); } void @@ -657,8 +656,7 @@ for (i = 0; i < V_tcp_hostcache.hashsize; i++) { THC_LOCK(&V_tcp_hostcache.hashbase[i].hch_mtx); TAILQ_FOREACH_SAFE(hc_entry, - &V_tcp_hostcache.hashbase[i].hch_bucket, - rmx_q, hc_next) { + &V_tcp_hostcache.hashbase[i].hch_bucket, rmx_q, hc_next) { if (all || hc_entry->rmx_expire <= 0) { TAILQ_REMOVE(&V_tcp_hostcache.hashbase[i].hch_bucket, hc_entry, rmx_q); ==== //depot/projects/vimage/src/sys/netinet/tcp_input.c#31 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netinet/tcp_input.c,v 1.378 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/tcp_input.c,v 1.379 2008/08/20 01:05:56 julian Exp $"); #include "opt_ipfw.h" /* for ipfw_fwd */ #include "opt_inet.h" ==== //depot/projects/vimage/src/sys/netinet/tcp_subr.c#46 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netinet/tcp_subr.c,v 1.309 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/tcp_subr.c,v 1.311 2008/08/20 01:24:55 julian Exp $"); #include "opt_compat.h" #include "opt_inet.h" @@ -1053,7 +1053,7 @@ INP_INFO_RLOCK(&V_tcbinfo); for (inp = LIST_FIRST(V_tcbinfo.ipi_listhead), i = 0; - inp != NULL && i < n; inp = LIST_NEXT(inp, inp_list)) { + inp != NULL && i < n; inp = LIST_NEXT(inp, inp_list)) { INP_RLOCK(inp); if (inp->inp_gencnt <= gencnt) { /* ==== //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#35 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netinet/tcp_syncache.c,v 1.151 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet/tcp_syncache.c,v 1.152 2008/08/20 01:05:56 julian Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -1552,8 +1552,8 @@ off = sc->sc_iss & 0x7; /* iss was randomized before */ /* Maximum segment size calculation. */ - pmss = max( min(sc->sc_peer_mss, tcp_mssopt(&sc->sc_inc)), - V_tcp_minmss); + pmss = + max( min(sc->sc_peer_mss, tcp_mssopt(&sc->sc_inc)), V_tcp_minmss); for (mss = sizeof(tcp_sc_msstab) / sizeof(int) - 1; mss > 0; mss--) if (tcp_sc_msstab[mss] <= pmss) break; ==== //depot/projects/vimage/src/sys/netinet6/in6.c#20 (text+ko) ==== @@ -61,7 +61,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netinet6/in6.c,v 1.81 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet6/in6.c,v 1.83 2008/08/20 01:24:55 julian Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -2165,7 +2165,7 @@ IFNET_RLOCK(); for (ifp = TAILQ_FIRST(&V_ifnet); ifp; - ifp = TAILQ_NEXT(ifp, if_list)) { + ifp = TAILQ_NEXT(ifp, if_list)) { /* this function can be called during ifnet initialization */ if (!ifp->if_afdata[AF_INET6]) continue; ==== //depot/projects/vimage/src/sys/netinet6/in6_gif.c#12 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netinet6/in6_gif.c,v 1.31 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet6/in6_gif.c,v 1.32 2008/08/20 01:05:56 julian Exp $"); #include "opt_inet.h" #include "opt_inet6.h" ==== //depot/projects/vimage/src/sys/netinet6/in6_ifattach.c#22 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netinet6/in6_ifattach.c,v 1.44 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet6/in6_ifattach.c,v 1.46 2008/08/20 01:24:55 julian Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -886,7 +886,7 @@ bzero(nullbuf, sizeof(nullbuf)); for (ifp = TAILQ_FIRST(&V_ifnet); ifp; - ifp = TAILQ_NEXT(ifp, if_list)) { + ifp = TAILQ_NEXT(ifp, if_list)) { ndi = ND_IFINFO(ifp); if (bcmp(ndi->randomid, nullbuf, sizeof(nullbuf)) != 0) { /* ==== //depot/projects/vimage/src/sys/netinet6/in6_pcb.c#20 (text+ko) ==== @@ -61,7 +61,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netinet6/in6_pcb.c,v 1.94 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet6/in6_pcb.c,v 1.95 2008/08/20 01:05:56 julian Exp $"); #include "opt_inet.h" #include "opt_inet6.h" ==== //depot/projects/vimage/src/sys/netinet6/nd6.c#29 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netinet6/nd6.c,v 1.89 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet6/nd6.c,v 1.91 2008/08/20 01:24:55 julian Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -187,14 +187,13 @@ /* initialization of the default router list */ TAILQ_INIT(&V_nd_defrouter); - - /* start timer */ callout_init(&V_nd6_slowtimo_ch, 0); callout_reset(&V_nd6_slowtimo_ch, ND6_SLOWTIMER_INTERVAL * hz, nd6_slowtimo, curvnet); } + #ifdef VIMAGE void nd6_destroy() @@ -1968,7 +1967,7 @@ nd6_slowtimo, arg); IFNET_RLOCK(); for (ifp = TAILQ_FIRST(&V_ifnet); ifp; - ifp = TAILQ_NEXT(ifp, if_list)) { + ifp = TAILQ_NEXT(ifp, if_list)) { nd6if = ND_IFINFO(ifp); if (nd6if->basereachable && /* already initialized */ (nd6if->recalctm -= ND6_SLOWTIMER_INTERVAL) <= 0) { ==== //depot/projects/vimage/src/sys/netinet6/nd6_rtr.c#16 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/netinet6/nd6_rtr.c,v 1.40 2008/08/17 23:27:27 bz Exp $"); +__FBSDID("$FreeBSD: src/sys/netinet6/nd6_rtr.c,v 1.42 2008/08/20 01:24:55 julian Exp $"); #include "opt_inet.h" #include "opt_inet6.h" @@ -859,7 +859,7 @@ struct nd_prefix *search; for (search = V_nd_prefix.lh_first; - search; search = search->ndpr_next) { + search; search = search->ndpr_next) { if (key->ndpr_ifp == search->ndpr_ifp && key->ndpr_plen == search->ndpr_plen && in6_are_prefix_equal(&key->ndpr_prefix.sin6_addr, ==== //depot/projects/vimage/src/sys/sys/sysctl.h#21 (text+ko) ==== @@ -30,7 +30,7 @@ * SUCH DAMAGE. * * @(#)sysctl.h 8.1 (Berkeley) 6/2/93 - * $FreeBSD: src/sys/sys/sysctl.h,v 1.158 2008/07/21 15:05:25 pjd Exp $ + * $FreeBSD: src/sys/sys/sysctl.h,v 1.160 2008/08/20 01:24:55 julian Exp $ */ #ifndef _SYS_SYSCTL_H_ @@ -246,8 +246,7 @@ #define SYSCTL_NODE(parent, nbr, name, access, handler, descr) \ struct sysctl_oid_list SYSCTL_NODE_CHILDREN(parent, name); \ SYSCTL_OID(parent, nbr, name, CTLTYPE_NODE|(access), \ - (void*)&SYSCTL_NODE_CHILDREN(parent, name), 0, handler, \ - "N", descr) + (void*)&SYSCTL_NODE_CHILDREN(parent, name), 0, handler, "N", descr) #define SYSCTL_ADD_NODE(ctx, parent, nbr, name, access, handler, descr) \ sysctl_add_oid(ctx, parent, nbr, name, CTLTYPE_NODE|(access), \ ==== //depot/projects/vimage/src/sys/vm/vm_meter.c#10 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/vm/vm_meter.c,v 1.98 2008/03/19 06:19:01 jeff Exp $"); +__FBSDID("$FreeBSD: src/sys/vm/vm_meter.c,v 1.99 2008/08/20 01:05:56 julian Exp $"); #include <sys/param.h> #include <sys/systm.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200808200149.m7K1nsE4060681>