Date: Sun, 14 Apr 2013 09:38:28 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r249467 - in projects/camlock: contrib/ldns/compat contrib/ldns/ldns lib/libldns sys/amd64/amd64 sys/amd64/vmm/intel sys/arm/allwinner sys/arm/broadcom/bcm2835 sys/arm/freescale/imx sys... Message-ID: <201304140938.r3E9cS1Z020194@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Sun Apr 14 09:38:28 2013 New Revision: 249467 URL: http://svnweb.freebsd.org/changeset/base/249467 Log: MFC @ r249466 Modified: projects/camlock/contrib/ldns/compat/b32_ntop.c projects/camlock/contrib/ldns/compat/b32_pton.c projects/camlock/contrib/ldns/compat/b64_ntop.c projects/camlock/contrib/ldns/compat/b64_pton.c projects/camlock/contrib/ldns/ldns/config.h projects/camlock/contrib/ldns/ldns/util.h projects/camlock/lib/libldns/Makefile projects/camlock/sys/amd64/amd64/support.S projects/camlock/sys/amd64/vmm/intel/vmx.c projects/camlock/sys/arm/allwinner/a10_gpio.c projects/camlock/sys/arm/broadcom/bcm2835/bcm2835_gpio.c projects/camlock/sys/arm/freescale/imx/imx51_gpio.c projects/camlock/sys/arm/xscale/ixp425/avila_gpio.c projects/camlock/sys/arm/xscale/ixp425/cambria_gpio.c projects/camlock/sys/dev/hwpmc/hwpmc_core.c projects/camlock/sys/dev/ips/ips.c projects/camlock/sys/geom/nop/g_nop.c projects/camlock/sys/geom/nop/g_nop.h projects/camlock/sys/i386/i386/support.s projects/camlock/sys/mips/atheros/ar71xx_gpio.c projects/camlock/sys/mips/cavium/octeon_gpio.c projects/camlock/sys/mips/rt305x/rt305x_gpio.c projects/camlock/usr.bin/calendar/calendars/calendar.birthday projects/camlock/usr.bin/calendar/calendars/calendar.history Directory Properties: projects/camlock/ (props changed) projects/camlock/contrib/ldns/ (props changed) projects/camlock/sys/ (props changed) projects/camlock/sys/amd64/vmm/ (props changed) projects/camlock/usr.bin/calendar/ (props changed) Modified: projects/camlock/contrib/ldns/compat/b32_ntop.c ============================================================================== --- projects/camlock/contrib/ldns/compat/b32_ntop.c Sun Apr 14 09:28:14 2013 (r249466) +++ projects/camlock/contrib/ldns/compat/b32_ntop.c Sun Apr 14 09:38:28 2013 (r249467) @@ -40,6 +40,7 @@ * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES. */ #include <ldns/config.h> +#ifndef HAVE_B32_NTOP #include <sys/types.h> #include <sys/param.h> @@ -61,6 +62,8 @@ #include <assert.h> +#include <ldns/util.h> + static const char Base32[] = "abcdefghijklmnopqrstuvwxyz234567"; /* "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";*/ @@ -171,7 +174,7 @@ static const char Pad32 = '='; */ -int +static int ldns_b32_ntop_ar(uint8_t const *src, size_t srclength, char *target, size_t targsize, const char B32_ar[]) { size_t datalength = 0; uint8_t input[5]; @@ -331,3 +334,4 @@ b32_ntop_extended_hex(uint8_t const *src return ldns_b32_ntop_ar(src, srclength, target, targsize, Base32_extended_hex); } +#endif /* !HAVE_B32_NTOP */ Modified: projects/camlock/contrib/ldns/compat/b32_pton.c ============================================================================== --- projects/camlock/contrib/ldns/compat/b32_pton.c Sun Apr 14 09:28:14 2013 (r249466) +++ projects/camlock/contrib/ldns/compat/b32_pton.c Sun Apr 14 09:38:28 2013 (r249467) @@ -40,6 +40,7 @@ * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES. */ #include <ldns/config.h> +#ifndef HAVE_B32_PTON #include <sys/types.h> #include <sys/param.h> @@ -59,6 +60,8 @@ #include <stdlib.h> #include <string.h> +#include <ldns/util.h> + /* "ABCDEFGHIJKLMNOPQRSTUVWXYZ234567";*/ static const char Base32[] = "abcdefghijklmnopqrstuvwxyz234567"; @@ -174,7 +177,7 @@ static const char Pad32 = '='; it returns the number of data bytes stored at the target, or -1 on error. */ -int +static int ldns_b32_pton_ar(char const *src, size_t hashed_owner_str_len, uint8_t *target, size_t targsize, const char B32_ar[]) { int tarindex, state, ch; @@ -385,3 +388,5 @@ b32_pton_extended_hex(char const *src, s { return ldns_b32_pton_ar(src, hashed_owner_str_len, target, targsize, Base32_extended_hex); } + +#endif /* !HAVE_B32_PTON */ Modified: projects/camlock/contrib/ldns/compat/b64_ntop.c ============================================================================== --- projects/camlock/contrib/ldns/compat/b64_ntop.c Sun Apr 14 09:28:14 2013 (r249466) +++ projects/camlock/contrib/ldns/compat/b64_ntop.c Sun Apr 14 09:38:28 2013 (r249467) @@ -40,6 +40,7 @@ * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES. */ #include <ldns/config.h> +#ifndef HAVE_B64_NTOP #include <sys/types.h> #include <sys/param.h> @@ -59,6 +60,8 @@ #include <stdlib.h> #include <string.h> +#include <ldns/util.h> + #define Assert(Cond) if (!(Cond)) abort() static const char Base64[] = @@ -200,3 +203,5 @@ ldns_b64_ntop(uint8_t const *src, size_t target[datalength] = '\0'; /* Returned value doesn't count \0. */ return (int) (datalength); } + +#endif /* !HAVE_B64_NTOP */ Modified: projects/camlock/contrib/ldns/compat/b64_pton.c ============================================================================== --- projects/camlock/contrib/ldns/compat/b64_pton.c Sun Apr 14 09:28:14 2013 (r249466) +++ projects/camlock/contrib/ldns/compat/b64_pton.c Sun Apr 14 09:38:28 2013 (r249467) @@ -40,6 +40,7 @@ * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES. */ #include <ldns/config.h> +#ifndef HAVE_B64_PTON #include <sys/types.h> #include <sys/param.h> @@ -59,7 +60,7 @@ #include <stdlib.h> #include <string.h> -#define Assert(Cond) if (!(Cond)) abort() +#include <ldns/util.h> static const char Base64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; @@ -258,3 +259,5 @@ ldns_b64_pton(char const *src, uint8_t * return (tarindex); } + +#endif /* !HAVE_B64_PTON */ Modified: projects/camlock/contrib/ldns/ldns/config.h ============================================================================== --- projects/camlock/contrib/ldns/ldns/config.h Sun Apr 14 09:28:14 2013 (r249466) +++ projects/camlock/contrib/ldns/ldns/config.h Sun Apr 14 09:38:28 2013 (r249467) @@ -489,30 +489,6 @@ extern "C" { #endif -#ifndef B64_PTON -int ldns_b64_ntop(uint8_t const *src, size_t srclength, - char *target, size_t targsize); -/** - * calculates the size needed to store the result of b64_ntop - */ -/*@unused@*/ -static inline size_t ldns_b64_ntop_calculate_size(size_t srcsize) -{ - return ((((srcsize + 2) / 3) * 4) + 1); -} -#endif /* !B64_PTON */ -#ifndef B64_NTOP -int ldns_b64_pton(char const *src, uint8_t *target, size_t targsize); -/** - * calculates the size needed to store the result of ldns_b64_pton - */ -/*@unused@*/ -static inline size_t ldns_b64_pton_calculate_size(size_t srcsize) -{ - return (((((srcsize + 3) / 4) * 3)) + 1); -} -#endif /* !B64_NTOP */ - #ifndef HAVE_SLEEP /* use windows sleep, in millisecs, instead */ #define sleep(x) Sleep((x)*1000) Modified: projects/camlock/contrib/ldns/ldns/util.h ============================================================================== --- projects/camlock/contrib/ldns/ldns/util.h Sun Apr 14 09:28:14 2013 (r249466) +++ projects/camlock/contrib/ldns/ldns/util.h Sun Apr 14 09:38:28 2013 (r249467) @@ -325,7 +325,7 @@ uint16_t ldns_get_random(void); */ char *ldns_bubblebabble(uint8_t *data, size_t len); -#ifndef B32_NTOP +#ifndef HAVE_B32_NTOP int ldns_b32_ntop(uint8_t const *src, size_t srclength, char *target, size_t targsize); int b32_ntop(uint8_t const *src, size_t srclength, @@ -343,8 +343,8 @@ INLINE size_t ldns_b32_ntop_calculate_si size_t result = ((((srcsize / 5) * 8) - 2) + 2); return result; } -#endif /* !B32_NTOP */ -#ifndef B32_PTON +#endif /* !HAVE_B32_NTOP */ +#ifndef HAVE_B32_PTON int ldns_b32_pton(char const *src, size_t hashed_owner_str_len, uint8_t *target, size_t targsize); int b32_pton(char const *src, size_t hashed_owner_str_len, uint8_t *target, size_t targsize); int ldns_b32_pton_extended_hex(char const *src, size_t hashed_owner_str_len, uint8_t *target, size_t targsize); @@ -358,7 +358,30 @@ INLINE size_t ldns_b32_pton_calculate_si size_t result = ((((srcsize) / 8) * 5)); return result; } -#endif /* !B32_PTON */ +#endif /* !HAVE_B32_PTON */ +#ifndef HAVE_B64_NTOP +int ldns_b64_ntop(uint8_t const *src, size_t srclength, + char *target, size_t targsize); +/** + * calculates the size needed to store the result of b64_ntop + */ +/*@unused@*/ +static inline size_t ldns_b64_ntop_calculate_size(size_t srcsize) +{ + return ((((srcsize + 2) / 3) * 4) + 1); +} +#endif /* !HAVE_B64_NTOP */ +#ifndef HAVE_B64_PTON +int ldns_b64_pton(char const *src, uint8_t *target, size_t targsize); +/** + * calculates the size needed to store the result of ldns_b64_pton + */ +/*@unused@*/ +static inline size_t ldns_b64_pton_calculate_size(size_t srcsize) +{ + return (((((srcsize + 3) / 4) * 3)) + 1); +} +#endif /* !HAVE_B64_PTON */ INLINE time_t ldns_time(time_t *t) { return time(t); } Modified: projects/camlock/lib/libldns/Makefile ============================================================================== --- projects/camlock/lib/libldns/Makefile Sun Apr 14 09:28:14 2013 (r249466) +++ projects/camlock/lib/libldns/Makefile Sun Apr 14 09:38:28 2013 (r249467) @@ -3,42 +3,20 @@ # Vendor sources and generated files LDNSDIR = ${.CURDIR}/../../contrib/ldns -.PATH: ${LDNSDIR} +.PATH: ${LDNSDIR} ${LDNSDIR}/compat -LIB = ldns -INTERNALLIB = true +LIB= ldns +INTERNALLIB= true -CFLAGS += -I${LDNSDIR} +CFLAGS+= -I${LDNSDIR} -SRCS += buffer.c -SRCS += dane.c -SRCS += dname.c -SRCS += dnssec.c -SRCS += dnssec_sign.c -SRCS += dnssec_verify.c -SRCS += dnssec_zone.c -SRCS += duration.c -SRCS += error.c -SRCS += higher.c -SRCS += host2str.c -SRCS += host2wire.c -SRCS += keys.c -SRCS += net.c -SRCS += packet.c -SRCS += parse.c -SRCS += rbtree.c -SRCS += rdata.c -SRCS += resolver.c -SRCS += rr.c -SRCS += rr_functions.c -SRCS += sha1.c -SRCS += sha2.c -SRCS += str2host.c -SRCS += tsig.c -SRCS += update.c -SRCS += util.c -SRCS += wire2host.c -SRCS += zone.c +SRCS= buffer.c dane.c dname.c dnssec.c dnssec_sign.c dnssec_verify.c \ + dnssec_zone.c duration.c error.c higher.c host2str.c host2wire.c \ + keys.c net.c packet.c parse.c rbtree.c rdata.c resolver.c rr.c \ + rr_functions.c sha1.c sha2.c str2host.c tsig.c update.c util.c \ + wire2host.c zone.c + +SRCS+= b32_ntop.c b32_pton.c b64_ntop.c b64_pton.c WARNS ?= 3 Modified: projects/camlock/sys/amd64/amd64/support.S ============================================================================== --- projects/camlock/sys/amd64/amd64/support.S Sun Apr 14 09:28:14 2013 (r249466) +++ projects/camlock/sys/amd64/amd64/support.S Sun Apr 14 09:38:28 2013 (r249467) @@ -200,9 +200,9 @@ END(fillw) * Access user memory from inside the kernel. These routines should be * the only places that do this. * - * These routines set curpcb->onfault for the time they execute. When a + * These routines set curpcb->pcb_onfault for the time they execute. When a * protection violation occurs inside the functions, the trap handler - * returns to *curpcb->onfault instead of the function. + * returns to *curpcb->pcb_onfault instead of the function. */ /* Modified: projects/camlock/sys/amd64/vmm/intel/vmx.c ============================================================================== --- projects/camlock/sys/amd64/vmm/intel/vmx.c Sun Apr 14 09:28:14 2013 (r249466) +++ projects/camlock/sys/amd64/vmm/intel/vmx.c Sun Apr 14 09:38:28 2013 (r249467) @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$"); #include <sys/malloc.h> #include <sys/pcpu.h> #include <sys/proc.h> +#include <sys/sysctl.h> #include <vm/vm.h> #include <vm/pmap.h> @@ -116,6 +117,9 @@ __FBSDID("$FreeBSD$"); MALLOC_DEFINE(M_VMX, "vmx", "vmx"); +SYSCTL_DECL(_hw_vmm); +SYSCTL_NODE(_hw_vmm, OID_AUTO, vmx, CTLFLAG_RW, NULL, NULL); + int vmxon_enabled[MAXCPU]; static char vmxon_region[MAXCPU][PAGE_SIZE] __aligned(PAGE_SIZE); @@ -123,12 +127,25 @@ static uint32_t pinbased_ctls, procbased static uint32_t exit_ctls, entry_ctls; static uint64_t cr0_ones_mask, cr0_zeros_mask; +SYSCTL_ULONG(_hw_vmm_vmx, OID_AUTO, cr0_ones_mask, CTLFLAG_RD, + &cr0_ones_mask, 0, NULL); +SYSCTL_ULONG(_hw_vmm_vmx, OID_AUTO, cr0_zeros_mask, CTLFLAG_RD, + &cr0_zeros_mask, 0, NULL); + static uint64_t cr4_ones_mask, cr4_zeros_mask; +SYSCTL_ULONG(_hw_vmm_vmx, OID_AUTO, cr4_ones_mask, CTLFLAG_RD, + &cr4_ones_mask, 0, NULL); +SYSCTL_ULONG(_hw_vmm_vmx, OID_AUTO, cr4_zeros_mask, CTLFLAG_RD, + &cr4_zeros_mask, 0, NULL); static volatile u_int nextvpid; static int vmx_no_patmsr; +static int vmx_initialized; +SYSCTL_INT(_hw_vmm_vmx, OID_AUTO, initialized, CTLFLAG_RD, + &vmx_initialized, 0, "Intel VMX initialized"); + /* * Virtual NMI blocking conditions. * @@ -593,6 +610,8 @@ vmx_init(void) /* enable VMX operation */ smp_rendezvous(NULL, vmx_enable, NULL, NULL); + vmx_initialized = 1; + return (0); } Modified: projects/camlock/sys/arm/allwinner/a10_gpio.c ============================================================================== --- projects/camlock/sys/arm/allwinner/a10_gpio.c Sun Apr 14 09:28:14 2013 (r249466) +++ projects/camlock/sys/arm/allwinner/a10_gpio.c Sun Apr 14 09:38:28 2013 (r249467) @@ -300,8 +300,8 @@ a10_gpio_pin_setflags(device_t dev, uint if (i >= sc->sc_gpio_npins) return (EINVAL); - /* Filter out unwanted flags. */ - if ((flags &= sc->sc_gpio_pins[i].gp_caps) != flags) + /* Check for unwanted flags. */ + if ((flags & sc->sc_gpio_pins[i].gp_caps) != flags) return (EINVAL); /* Can't mix input/output together. */ Modified: projects/camlock/sys/arm/broadcom/bcm2835/bcm2835_gpio.c ============================================================================== --- projects/camlock/sys/arm/broadcom/bcm2835/bcm2835_gpio.c Sun Apr 14 09:28:14 2013 (r249466) +++ projects/camlock/sys/arm/broadcom/bcm2835/bcm2835_gpio.c Sun Apr 14 09:38:28 2013 (r249467) @@ -385,8 +385,8 @@ bcm_gpio_pin_setflags(device_t dev, uint if (bcm_gpio_pin_is_ro(sc, pin)) return (EINVAL); - /* Filter out unwanted flags. */ - if ((flags &= sc->sc_gpio_pins[i].gp_caps) != flags) + /* Check for unwanted flags. */ + if ((flags & sc->sc_gpio_pins[i].gp_caps) != flags) return (EINVAL); /* Can't mix input/output together. */ Modified: projects/camlock/sys/arm/freescale/imx/imx51_gpio.c ============================================================================== --- projects/camlock/sys/arm/freescale/imx/imx51_gpio.c Sun Apr 14 09:28:14 2013 (r249466) +++ projects/camlock/sys/arm/freescale/imx/imx51_gpio.c Sun Apr 14 09:38:28 2013 (r249467) @@ -261,8 +261,8 @@ imx51_gpio_pin_setflags(device_t dev, ui if (i >= sc->gpio_npins) return (EINVAL); - /* Filter out unwanted flags */ - if ((flags &= sc->gpio_pins[i].gp_caps) != flags) + /* Check for unwanted flags. */ + if ((flags & sc->gpio_pins[i].gp_caps) != flags) return (EINVAL); /* Can't mix input/output together */ Modified: projects/camlock/sys/arm/xscale/ixp425/avila_gpio.c ============================================================================== --- projects/camlock/sys/arm/xscale/ixp425/avila_gpio.c Sun Apr 14 09:28:14 2013 (r249466) +++ projects/camlock/sys/arm/xscale/ixp425/avila_gpio.c Sun Apr 14 09:38:28 2013 (r249467) @@ -220,8 +220,8 @@ avila_gpio_pin_setflags(device_t dev, ui if (pin >= IXP4XX_GPIO_PINS || !(sc->sc_valid & mask)) return (EINVAL); - /* Filter out unwanted flags */ - if ((flags &= sc->sc_pins[pin].gp_caps) != flags) + /* Check for unwanted flags. */ + if ((flags & sc->sc_pins[pin].gp_caps) != flags) return (EINVAL); /* Can't mix input/output together */ Modified: projects/camlock/sys/arm/xscale/ixp425/cambria_gpio.c ============================================================================== --- projects/camlock/sys/arm/xscale/ixp425/cambria_gpio.c Sun Apr 14 09:28:14 2013 (r249466) +++ projects/camlock/sys/arm/xscale/ixp425/cambria_gpio.c Sun Apr 14 09:38:28 2013 (r249467) @@ -317,8 +317,8 @@ cambria_gpio_pin_setflags(device_t dev, if (pin >= GPIO_PINS) return (EINVAL); - /* Filter out unwanted flags */ - if ((flags &= sc->sc_pins[pin].gp_caps) != flags) + /* Check for unwanted flags. */ + if ((flags & sc->sc_pins[pin].gp_caps) != flags) return (EINVAL); /* Can't mix input/output together */ Modified: projects/camlock/sys/dev/hwpmc/hwpmc_core.c ============================================================================== --- projects/camlock/sys/dev/hwpmc/hwpmc_core.c Sun Apr 14 09:28:14 2013 (r249466) +++ projects/camlock/sys/dev/hwpmc/hwpmc_core.c Sun Apr 14 09:38:28 2013 (r249467) @@ -25,7 +25,7 @@ */ /* - * Intel Core, Core 2 and Atom PMCs. + * Intel Core PMCs. */ #include <sys/cdefs.h> Modified: projects/camlock/sys/dev/ips/ips.c ============================================================================== --- projects/camlock/sys/dev/ips/ips.c Sun Apr 14 09:28:14 2013 (r249466) +++ projects/camlock/sys/dev/ips/ips.c Sun Apr 14 09:38:28 2013 (r249467) @@ -578,7 +578,7 @@ static int ips_copperhead_queue_init(ips { int error; bus_dma_tag_t dmatag; - bus_dmamap_t dmamap; + bus_dmamap_t dmamap = NULL; if (bus_dma_tag_create( /* parent */ sc->adapter_dmatag, /* alignemnt */ 1, /* boundary */ 0, Modified: projects/camlock/sys/geom/nop/g_nop.c ============================================================================== --- projects/camlock/sys/geom/nop/g_nop.c Sun Apr 14 09:28:14 2013 (r249466) +++ projects/camlock/sys/geom/nop/g_nop.c Sun Apr 14 09:38:28 2013 (r249467) @@ -124,7 +124,7 @@ g_nop_start(struct bio *bp) rval = arc4random() % 100; if (rval < failprob) { - G_NOP_LOGREQ(bp, "Returning error=%d.", sc->sc_error); + G_NOP_LOGREQLVL(1, bp, "Returning error=%d.", sc->sc_error); g_io_deliver(bp, sc->sc_error); return; } Modified: projects/camlock/sys/geom/nop/g_nop.h ============================================================================== --- projects/camlock/sys/geom/nop/g_nop.h Sun Apr 14 09:28:14 2013 (r249466) +++ projects/camlock/sys/geom/nop/g_nop.h Sun Apr 14 09:38:28 2013 (r249467) @@ -44,9 +44,10 @@ printf("\n"); \ } \ } while (0) -#define G_NOP_LOGREQ(bp, ...) do { \ - if (g_nop_debug >= 2) { \ - printf("GEOM_NOP[2]: "); \ +#define G_NOP_LOGREQ(bp, ...) G_NOP_LOGREQLVL(2, bp, __VA_ARGS__) +#define G_NOP_LOGREQLVL(lvl, bp, ...) do { \ + if (g_nop_debug >= (lvl)) { \ + printf("GEOM_NOP[%d]: ", (lvl)); \ printf(__VA_ARGS__); \ printf(" "); \ g_print_bio(bp); \ Modified: projects/camlock/sys/i386/i386/support.s ============================================================================== --- projects/camlock/sys/i386/i386/support.s Sun Apr 14 09:28:14 2013 (r249466) +++ projects/camlock/sys/i386/i386/support.s Sun Apr 14 09:38:28 2013 (r249467) @@ -262,9 +262,9 @@ END(memcpy) * write permissions when we are executing with EPL 0. The 486 does check * this if the WP bit is set in CR0, so we can use a simpler version here. * - * These routines set curpcb->onfault for the time they execute. When a + * These routines set curpcb->pcb_onfault for the time they execute. When a * protection violation occurs inside the functions, the trap handler - * returns to *curpcb->onfault instead of the function. + * returns to *curpcb->pcb_onfault instead of the function. */ /* Modified: projects/camlock/sys/mips/atheros/ar71xx_gpio.c ============================================================================== --- projects/camlock/sys/mips/atheros/ar71xx_gpio.c Sun Apr 14 09:28:14 2013 (r249466) +++ projects/camlock/sys/mips/atheros/ar71xx_gpio.c Sun Apr 14 09:38:28 2013 (r249467) @@ -219,8 +219,8 @@ ar71xx_gpio_pin_setflags(device_t dev, u if (i >= sc->gpio_npins) return (EINVAL); - /* Filter out unwanted flags */ - if ((flags &= sc->gpio_pins[i].gp_caps) != flags) + /* Check for unwanted flags. */ + if ((flags & sc->gpio_pins[i].gp_caps) != flags) return (EINVAL); /* Can't mix input/output together */ Modified: projects/camlock/sys/mips/cavium/octeon_gpio.c ============================================================================== --- projects/camlock/sys/mips/cavium/octeon_gpio.c Sun Apr 14 09:28:14 2013 (r249466) +++ projects/camlock/sys/mips/cavium/octeon_gpio.c Sun Apr 14 09:38:28 2013 (r249467) @@ -219,8 +219,8 @@ octeon_gpio_pin_setflags(device_t dev, u if (i >= sc->gpio_npins) return (EINVAL); - /* Filter out unwanted flags */ - if ((flags &= sc->gpio_pins[i].gp_caps) != flags) + /* Check for unwanted flags. */ + if ((flags & sc->gpio_pins[i].gp_caps) != flags) return (EINVAL); /* Can't mix input/output together */ Modified: projects/camlock/sys/mips/rt305x/rt305x_gpio.c ============================================================================== --- projects/camlock/sys/mips/rt305x/rt305x_gpio.c Sun Apr 14 09:28:14 2013 (r249466) +++ projects/camlock/sys/mips/rt305x/rt305x_gpio.c Sun Apr 14 09:38:28 2013 (r249467) @@ -242,8 +242,8 @@ rt305x_gpio_pin_setflags(device_t dev, u if (i >= sc->gpio_npins) return (EINVAL); - /* Filter out unwanted flags */ - if ((flags &= sc->gpio_pins[i].gp_caps) != flags) + /* Check for unwanted flags. */ + if ((flags & sc->gpio_pins[i].gp_caps) != flags) return (EINVAL); /* Can't mix input/output together */ Modified: projects/camlock/usr.bin/calendar/calendars/calendar.birthday ============================================================================== --- projects/camlock/usr.bin/calendar/calendars/calendar.birthday Sun Apr 14 09:28:14 2013 (r249466) +++ projects/camlock/usr.bin/calendar/calendars/calendar.birthday Sun Apr 14 09:38:28 2013 (r249467) @@ -120,7 +120,7 @@ 04/10 William Booth born, 1829, founder of the Salvation Army 04/13 Thomas Jefferson, 3rd President of the United States, born Shadwell Plantation, Albemarle County, Virginia, 1743 -04/14 Christian Huygen born, 1629, physicist & astronomer; +04/14 Christiaan Huygens born, 1629, physicist & astronomer; discovered Saturn's rings 04/15 Leonardo da Vinci born, 1452 04/16 Charles (Charlie) Chaplin (Sir) born in London, 1889 Modified: projects/camlock/usr.bin/calendar/calendars/calendar.history ============================================================================== --- projects/camlock/usr.bin/calendar/calendars/calendar.history Sun Apr 14 09:28:14 2013 (r249466) +++ projects/camlock/usr.bin/calendar/calendars/calendar.history Sun Apr 14 09:38:28 2013 (r249467) @@ -99,7 +99,6 @@ 04/04 Martin Luther King assassinated in Memphis, Tennessee, 1968 04/04 NATO Established, 1949 04/06 Joseph Smith founds Mormon Church, 1830 -04/07 Albert Hofmann synthesizes LSD in Switzerland, 1943 04/07 Alewives run, Cape Cod 04/08 Matthew Flinders and Nicolas Baudin meet in Encounter Bay, 1802 04/09 Lee surrenders to Grant at Appomattox Courthouse, 1865 @@ -420,6 +419,7 @@ from McDonald's), 1971 11/15 Niagara Falls power plant startup, 1896 11/16 Opening of the Suez Canal, 1869 +11/16 Albert Hofmann synthesizes LSD in Switzerland, 1938 11/17 46,000 meteoroids fall over AZ in 20 minutes, 1966 11/17 Richard Nixon says "I am not a crook.", 1973 11/18 First hydrogen bomb blasts Enewetok, 1952
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201304140938.r3E9cS1Z020194>