CVS commit: src/external/gpl3/gcc/dist/gcc/config/arm
Module Name:src Committed By: matt Date: Tue Feb 5 08:28:18 UTC 2013 Modified Files: src/external/gpl3/gcc/dist/gcc/config/arm: t-netbsd Log Message: Backout setting of UNWIND_H To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd diff -u src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd:1.4 src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd:1.5 --- src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd:1.4 Thu Jan 31 07:11:08 2013 +++ src/external/gpl3/gcc/dist/gcc/config/arm/t-netbsd Tue Feb 5 08:28:15 2013 @@ -23,9 +23,6 @@ TARGET_LIBGCC2_CFLAGS = -fomit-frame-poi LIBGCC2_DEBUG_CFLAGS = -g0 LIB2FUNCS_EXTRA = $(srcdir)/config/floatunsidf.c $(srcdir)/config/floatunsisf.c -# to make compat easier. -UNWIND_H = $(srcdir)/config/arm/unwind-netbsd.h - # This list is from t-arm-elf, but with some things removed. LIB1ASMFUNCS += _udivsi3 _divsi3 _umodsi3 _modsi3 _dvmd_tls _bb_init_func \ _call_via_rX _interwork_call_via_rX \
CVS commit: src/usr.bin/tput
Module Name:src
Committed By: roy
Date: Tue Feb 5 11:31:56 UTC 2013
Modified Files:
src/usr.bin/tput: tput.c
Log Message:
Use putp(3) to output our strings.
Fixes PR lib/47532
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/usr.bin/tput/tput.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/tput/tput.c
diff -u src/usr.bin/tput/tput.c:1.25 src/usr.bin/tput/tput.c:1.26
--- src/usr.bin/tput/tput.c:1.25 Fri Jan 25 12:27:13 2013
+++ src/usr.bin/tput/tput.c Tue Feb 5 11:31:56 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: tput.c,v 1.25 2013/01/25 12:27:13 roy Exp $ */
+/* $NetBSD: tput.c,v 1.26 2013/02/05 11:31:56 roy Exp $ */
/*-
* Copyright (c) 1980, 1988, 1993
@@ -39,7 +39,7 @@ __COPYRIGHT("@(#) Copyright (c) 1980, 19
#if 0
static char sccsid[] = "@(#)tput.c 8.3 (Berkeley) 4/28/95";
#endif
-__RCSID("$NetBSD: tput.c,v 1.25 2013/01/25 12:27:13 roy Exp $");
+__RCSID("$NetBSD: tput.c,v 1.26 2013/02/05 11:31:56 roy Exp $");
#endif /* not lint */
#include
@@ -54,7 +54,6 @@ __RCSID("$NetBSD: tput.c,v 1.25 2013/01/
#include
#include
-static intoutc(int);
static void usage(void) __dead;
static char **process(const char *, const char *, char **);
@@ -93,7 +92,7 @@ main(int argc, char **argv)
if (!strcmp(p, "init")) {
s = tigetstr("is1");
if (s != NULL)
- tputs(s, 0, outc);
+ putp(s);
p = "is2";
}
break;
@@ -107,7 +106,7 @@ main(int argc, char **argv)
if (!strcmp(p, "reset")) {
s = tigetstr("rs1");
if (s != NULL)
- tputs(s, 0, outc);
+ putp(s);
p = "rs2";
}
break;
@@ -181,17 +180,11 @@ process(const char *cap, const char *str
/* And output */
#define p(i) (i <= nparams ? \
(piss[i - 1] ? (long)strs[i - 1] : nums[i - 1]) : 0)
- puts(tparm(str, p(1), p(2), p(3), p(4), p(5), p(6), p(7), p(8), p(9)));
+ putp(tparm(str, p(1), p(2), p(3), p(4), p(5), p(6), p(7), p(8), p(9)));
return argv;
}
-static int
-outc(int c)
-{
- return putchar(c);
-}
-
static void
usage(void)
{
CVS commit: src/crypto/dist/ipsec-tools/src/racoon
Module Name:src
Committed By: tteras
Date: Tue Feb 5 11:36:18 UTC 2013
Modified Files:
src/crypto/dist/ipsec-tools/src/racoon: grabmyaddr.c
Log Message:
Fix source port selection
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 \
src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c:1.29 src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c:1.30
--- src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c:1.29 Sun Jan 1 15:54:51 2012
+++ src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c Tue Feb 5 11:36:17 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: grabmyaddr.c,v 1.29 2012/01/01 15:54:51 tteras Exp $ */
+/* $NetBSD: grabmyaddr.c,v 1.30 2013/02/05 11:36:17 tteras Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* Copyright (C) 2008 Timo Teras .
@@ -274,13 +274,24 @@ myaddr_getsport(addr)
struct sockaddr *addr;
{
struct myaddr *my;
+ int port = 0, wport;
LIST_FOREACH(my, &opened, chain) {
- if (cmpsaddr((struct sockaddr *) &my->addr, addr) <= CMPSADDR_WILDPORT_MATCH)
+ switch (cmpsaddr((struct sockaddr *) &my->addr, addr)) {
+ case CMPSADDR_MATCH:
return extract_port((struct sockaddr *) &my->addr);
+ case CMPSADDR_WILDPORT_MATCH:
+ wport = extract_port((struct sockaddr *) &my->addr);
+ if (port == 0 || wport < port)
+port = wport;
+ break;
+ }
}
- return -1;
+ if (port == 0)
+ port = PORT_ISAKMP;
+
+ return port;
}
void
CVS commit: [ipsec-tools-0_8-branch] src/crypto/dist/ipsec-tools/src/racoon
Module Name:src
Committed By: tteras
Date: Tue Feb 5 11:36:41 UTC 2013
Modified Files:
src/crypto/dist/ipsec-tools/src/racoon [ipsec-tools-0_8-branch]:
grabmyaddr.c
Log Message:
Fix source port selection
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.28.2.1 \
src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c
diff -u src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c:1.28 src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c:1.28.2.1
--- src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c:1.28 Mon Mar 14 17:18:12 2011
+++ src/crypto/dist/ipsec-tools/src/racoon/grabmyaddr.c Tue Feb 5 11:36:41 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: grabmyaddr.c,v 1.28 2011/03/14 17:18:12 tteras Exp $ */
+/* $NetBSD: grabmyaddr.c,v 1.28.2.1 2013/02/05 11:36:41 tteras Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
* Copyright (C) 2008 Timo Teras .
@@ -274,13 +274,24 @@ myaddr_getsport(addr)
struct sockaddr *addr;
{
struct myaddr *my;
+ int port = 0, wport;
LIST_FOREACH(my, &opened, chain) {
- if (cmpsaddr((struct sockaddr *) &my->addr, addr) <= CMPSADDR_WILDPORT_MATCH)
+ switch (cmpsaddr((struct sockaddr *) &my->addr, addr)) {
+ case CMPSADDR_MATCH:
return extract_port((struct sockaddr *) &my->addr);
+ case CMPSADDR_WILDPORT_MATCH:
+ wport = extract_port((struct sockaddr *) &my->addr);
+ if (port == 0 || wport < port)
+port = wport;
+ break;
+ }
}
+
+ if (port == 0)
+ port = PORT_ISAKMP;
- return PORT_ISAKMP;
+ return port;
}
void
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Tue Feb 5 11:56:41 UTC 2013 Modified Files: src/sys/dev/usb: usbdevices.config Log Message: Add atapibus* at umass? and attachments. I have an mp3 player/flash disk that attaches this way. To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/dev/usb/usbdevices.config Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/usbdevices.config diff -u src/sys/dev/usb/usbdevices.config:1.20 src/sys/dev/usb/usbdevices.config:1.21 --- src/sys/dev/usb/usbdevices.config:1.20 Sun Jan 13 01:15:02 2013 +++ src/sys/dev/usb/usbdevices.config Tue Feb 5 11:56:41 2013 @@ -1,4 +1,4 @@ -# $NetBSD: usbdevices.config,v 1.20 2013/01/13 01:15:02 jakllsch Exp $ +# $NetBSD: usbdevices.config,v 1.21 2013/02/05 11:56:41 skrll Exp $ # # This file contains all USB related configuration. # It is suitable for inclusion in a kernel config(5) file. @@ -75,9 +75,16 @@ uhso* at uhub? port ? configuration ? # USB Mass Storage umass* at uhub? port ? configuration ? interface ? scsibus* at umass? +atapibus* at umass? sd* at scsibus? target ? lun ? wd* at umass? +# flags have the same meaning as for IDE drives. +cd* at atapibus? drive ? flags 0x # ATAPI CD-ROM drives +sd* at atapibus? drive ? flags 0x # ATAPI disk drives +st* at atapibus? drive ? flags 0x # ATAPI tape drives +uk* at atapibus? drive ? flags 0x # ATAPI unknown + # USB audio uaudio* at uhub? port ? configuration ? uaudio* at usbifif?
CVS commit: src/usr.sbin/ldpd
Module Name:src
Committed By: kefren
Date: Tue Feb 5 13:02:33 UTC 2013
Modified Files:
src/usr.sbin/ldpd: fsm.c
Log Message:
Stop confusing peer hello source with peer transport address
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/usr.sbin/ldpd/fsm.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/ldpd/fsm.c
diff -u src/usr.sbin/ldpd/fsm.c:1.9 src/usr.sbin/ldpd/fsm.c:1.10
--- src/usr.sbin/ldpd/fsm.c:1.9 Sun Feb 3 19:41:59 2013
+++ src/usr.sbin/ldpd/fsm.c Tue Feb 5 13:02:33 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fsm.c,v 1.9 2013/02/03 19:41:59 kefren Exp $ */
+/* $NetBSD: fsm.c,v 1.10 2013/02/05 13:02:33 kefren Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -56,7 +56,8 @@ run_ldp_hello(struct ldp_pdu * pduid, st
{
struct ldp_peer *peer = NULL;
struct transport_address_tlv *trtlv;
- struct hello_info *hi;
+ struct hello_info *hi = NULL;
+ union sockunion traddr;
if ((!pduid) || (!ht))
return;
@@ -65,32 +66,58 @@ run_ldp_hello(struct ldp_pdu * pduid, st
debugp("Hello: Type: 0x%.4X Length: %.2d ID: %.8X\n", ht->type,
ht->length, ht->messageid);
+ if (ht->length <= 4) /* Common hello parameters */
+ return;
+ ht->ch.type = ntohs(ht->ch.type);
+ ht->ch.length = ntohs(ht->ch.length);
+ ht->ch.holdtime = ntohs(ht->ch.holdtime);
+ ht->ch.res = ntohs(ht->ch.res);
+ debugp("Common hello Type: 0x%.4X Length: %.2d R:%d T:%d"
+ " Hold time: %d\n", ht->ch.type, ht->ch.length,
+ ht->ch.tr / 2, ht->ch.tr % 2, ht->ch.holdtime);
+
+ memset(&traddr, 0, sizeof(traddr));
+ /* Check transport TLV */
+ if (pduid->length - PDU_PAYLOAD_LENGTH -
+ sizeof(struct hello_tlv) >= 8) {
+ trtlv = (struct transport_address_tlv *)(ht + 1);
+ if (trtlv->type == htons(TLV_IPV4_TRANSPORT)) {
+ traddr.sin.sin_family = AF_INET;
+ traddr.sin.sin_len = sizeof(struct sockaddr_in);
+ memcpy(&traddr.sin.sin_addr,
+ &trtlv->address, sizeof(struct in_addr));
+ } else if (trtlv->type == htons(TLV_IPV6_TRANSPORT)) {
+ traddr.sin6.sin6_family = AF_INET6;
+ traddr.sin6.sin6_len = sizeof(struct sockaddr_in6);
+ memcpy(&traddr.sin6.sin6_addr,
+ &trtlv->address, sizeof(struct in6_addr));
+ } else
+ warnp("Unknown AF %x for transport address\n",
+ ntohs(trtlv->type));
+ } else {
+ /* Use LDP ID as transport address */
+ traddr.sin.sin_family = AF_INET;
+ traddr.sin.sin_len = sizeof(struct sockaddr_in);
+ memcpy(&traddr.sin.sin_addr,
+ &pduid->ldp_id, sizeof(struct in_addr));
+ }
/* Add it to hello list or just update timer */
SLIST_FOREACH(hi, &hello_info_head, infos)
- if (hi->ldp_id.s_addr == pduid->ldp_id.s_addr)
+ if (hi->ldp_id.s_addr == pduid->ldp_id.s_addr &&
+ sockaddr_cmp(&hi->transport_address.sa, &traddr.sa) == 0)
break;
if (hi == NULL) {
- hi = malloc(sizeof(*hi));
+ hi = calloc(1, sizeof(*hi));
if (!hi) {
fatalp("Cannot alloc a hello info structure");
return;
}
hi->ldp_id.s_addr = pduid->ldp_id.s_addr;
- hi->transport_address.sa.sa_family = 0;
+ memcpy(&hi->transport_address, &traddr, traddr.sa.sa_len);
SLIST_INSERT_HEAD(&hello_info_head, hi, infos);
- } else
- /* Just update timer */
- hi->keepalive = LDP_HELLO_KEEP;
+ }
- if (ht->length <= 4) /* Common hello parameters */
- return;
- ht->ch.type = ntohs(ht->ch.type);
- ht->ch.length = ntohs(ht->ch.length);
- ht->ch.holdtime = ntohs(ht->ch.holdtime);
- ht->ch.res = ntohs(ht->ch.res);
- debugp("Common hello Type: 0x%.4X Length: %.2d R:%d T:%d"
- " Hold time: %d\n", ht->ch.type, ht->ch.length,
- ht->ch.tr / 2, ht->ch.tr % 2, ht->ch.holdtime);
+ /* Update expire timer */
if (ht->ch.holdtime != 0)
hi->keepalive = ht->ch.holdtime;
else {
@@ -99,44 +126,16 @@ run_ldp_hello(struct ldp_pdu * pduid, st
else
hi->keepalive = LDP_THELLO_KEEP;
}
+
if (!get_ldp_peer_by_id(&pduid->ldp_id)) {
- /* Check transport TLV */
- if (pduid->length - PDU_PAYLOAD_LENGTH -
- sizeof(struct hello_tlv) >= 8) {
- trtlv = (struct transport_address_tlv *)(ht + 1);
- if (trtlv->type == htons(TLV_IPV4_TRANSPORT)) {
-hi->transport_address.sin.sin_family = AF_INET;
-hi->transport_address.sin.sin_len =
-sizeof(struct sockaddr_in);
-memcpy(&hi->transport_address.sin.sin_addr,
-&trtlv->address, sizeof(struct in_addr));
- } else if (trtlv->type == htons(TLV_IPV6_TRANSPORT)) {
-hi->transport_address.sin6.sin6_family =
-AF_INET6;
-hi->transport_address.sin6.sin6_len =
-sizeof(struct sockaddr_in6);
-memcpy(&hi->transport_address.sin6.sin6_addr,
-&trtlv->address, sizeof(struct in6_addr));
- } else
-warnp("Unknown AF %x for transport address\n",
-ntohs(trtlv->type));
- } else {
- trtlv = NULL;
- hi->transport_address.sin.sin_family = AF_INET;
- hi->transport_address.sin.sin_len =
- sizeof(struct sockaddr_in);
- memcpy(&hi
CVS commit: src/lib/libc/sys
Module Name:src Committed By: wiz Date: Tue Feb 5 13:37:00 UTC 2013 Modified Files: src/lib/libc/sys: chdir.2 Log Message: Xref getcwd(3). Sort errors. Bump date. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/lib/libc/sys/chdir.2 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/sys/chdir.2 diff -u src/lib/libc/sys/chdir.2:1.21 src/lib/libc/sys/chdir.2:1.22 --- src/lib/libc/sys/chdir.2:1.21 Mon May 31 12:16:20 2010 +++ src/lib/libc/sys/chdir.2 Tue Feb 5 13:36:59 2013 @@ -1,4 +1,4 @@ -.\" $NetBSD: chdir.2,v 1.21 2010/05/31 12:16:20 njoly Exp $ +.\" $NetBSD: chdir.2,v 1.22 2013/02/05 13:36:59 wiz Exp $ .\" .\" Copyright (c) 1980, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)chdir.2 8.2 (Berkeley) 12/11/93 .\" -.Dd December 11, 1993 +.Dd February 5, 2013 .Dt CHDIR 2 .Os .Sh NAME @@ -80,18 +80,6 @@ the error. will fail and the current working directory will be unchanged if one or more of the following are true: .Bl -tag -width Er -.It Bq Er ENOTDIR -A component of the path prefix is not a directory. -.It Bq Er ENAMETOOLONG -A component of a pathname exceeded -.Brq Dv NAME_MAX -characters, or an entire path name exceeded -.Brq Dv PATH_MAX -characters. -.It Bq Er ENOENT -The named directory does not exist. -.It Bq Er ELOOP -Too many symbolic links were encountered in translating the pathname. .It Bq Er EACCES Search permission is denied for any component of the path name. @@ -100,6 +88,18 @@ the path name. points outside the process's allocated address space. .It Bq Er EIO An I/O error occurred while reading from or writing to the file system. +.It Bq Er ELOOP +Too many symbolic links were encountered in translating the pathname. +.It Bq Er ENAMETOOLONG +A component of a pathname exceeded +.Brq Dv NAME_MAX +characters, or an entire path name exceeded +.Brq Dv PATH_MAX +characters. +.It Bq Er ENOENT +The named directory does not exist. +.It Bq Er ENOTDIR +A component of the path prefix is not a directory. .El .Pp .Fn fchdir @@ -109,12 +109,12 @@ one or more of the following are true: .It Bq Er EACCES Search permission is denied for the directory referenced by the file descriptor. -.It Bq Er ENOTDIR -The file descriptor does not reference a directory. .It Bq Er EBADF The argument .Fa fd is not a valid file descriptor. +.It Bq Er ENOTDIR +The file descriptor does not reference a directory. .It Bq Er EPERM The argument .Fa fd @@ -122,7 +122,8 @@ references a directory which is not at o root directory. .El .Sh SEE ALSO -.Xr chroot 2 +.Xr chroot 2 , +.Xr getcwd 3 .Sh STANDARDS The .Fn chdir
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: christos
Date: Tue Feb 5 13:39:28 UTC 2013
Modified Files:
src/sys/dev/usb: usb_mem.c
Log Message:
handle memory shortage correctly.
To generate a diff of this commit:
cvs rdiff -u -r1.61 -r1.62 src/sys/dev/usb/usb_mem.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/usb_mem.c
diff -u src/sys/dev/usb/usb_mem.c:1.61 src/sys/dev/usb/usb_mem.c:1.62
--- src/sys/dev/usb/usb_mem.c:1.61 Mon Feb 4 19:41:51 2013
+++ src/sys/dev/usb/usb_mem.c Tue Feb 5 08:39:28 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: usb_mem.c,v 1.61 2013/02/05 00:41:51 christos Exp $ */
+/* $NetBSD: usb_mem.c,v 1.62 2013/02/05 13:39:28 christos Exp $ */
/*
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -38,7 +38,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: usb_mem.c,v 1.61 2013/02/05 00:41:51 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: usb_mem.c,v 1.62 2013/02/05 13:39:28 christos Exp $");
#include
#include
@@ -439,25 +439,28 @@ usb_reserve_allocm(struct usb_dma_reserv
return USBD_NOMEM;
dma->block = kmem_zalloc(sizeof *dma->block, KM_SLEEP);
- if (dma->block == NULL)
- return USBD_NOMEM;
+ if (dma->block == NULL) {
+ aprint_error_dev(rs->dv, "%s: failed allocating dma block",
+ __func__);
+ goto out0;
+ }
dma->block->nsegs = 1;
dma->block->segs = kmem_alloc(dma->block->nsegs *
sizeof(*dma->block->segs), KM_SLEEP);
if (dma->block->segs == NULL) {
- kmem_free(dma->block, sizeof *dma->block);
- return USBD_NOMEM;
+ aprint_error_dev(rs->dv, "%s: failed allocating 1 dma segment",
+ __func__);
+ goto out1;
}
error = extent_alloc(rs->extent, size, PAGE_SIZE, 0,
EX_NOWAIT, &start);
if (error != 0) {
- aprint_error_dev(rs->dv,
- "usb_reserve_allocm of size %u failed (error %d)\n",
- size, error);
- return USBD_NOMEM;
+ aprint_error_dev(rs->dv, "%s: extent_alloc size %u failed "
+ "(error %d)", __func__, size, error);
+ goto out2;
}
baddr = start;
@@ -471,6 +474,13 @@ usb_reserve_allocm(struct usb_dma_reserv
dma->block->tag = rs->dtag;
return USBD_NORMAL_COMPLETION;
+out2:
+ kmem_free(dma->block->segs, dma->block->nsegs *
+ sizeof(*dma->block->segs));
+out1:
+ kmem_free(dma->block, sizeof *dma->block);
+out0:
+ return USBD_NOMEM;
}
void
CVS commit: src/libexec/ld.aout_so
Module Name:src
Committed By: martin
Date: Tue Feb 5 15:19:18 UTC 2013
Modified Files:
src/libexec/ld.aout_so: Makefile
Log Message:
Make sure UUDECODE_FILES is empty if we do not have an old ld.so_aout
(on architectures that never used a.out)
To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 src/libexec/ld.aout_so/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/libexec/ld.aout_so/Makefile
diff -u src/libexec/ld.aout_so/Makefile:1.48 src/libexec/ld.aout_so/Makefile:1.49
--- src/libexec/ld.aout_so/Makefile:1.48 Tue Feb 5 07:22:59 2013
+++ src/libexec/ld.aout_so/Makefile Tue Feb 5 15:19:18 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2013/02/05 07:22:59 matt Exp $
+# $NetBSD: Makefile,v 1.49 2013/02/05 15:19:18 martin Exp $
.include # for MKPIC definition
.include # for TARGET_ENDIANNESS
@@ -20,6 +20,8 @@ all dependall: ${FILES}
ld.so: ${UUDECODE_FILES}
+.else
+UUDECODE_FILES=
.endif
.endif
CVS commit: src/etc
Module Name:src
Committed By: matt
Date: Tue Feb 5 16:39:27 UTC 2013
Modified Files:
src/etc: Makefile
Log Message:
Only include debug set obsolete set if MKDEBUG is not no
To generate a diff of this commit:
cvs rdiff -u -r1.404 -r1.405 src/etc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.404 src/etc/Makefile:1.405
--- src/etc/Makefile:1.404 Tue Feb 5 07:32:44 2013
+++ src/etc/Makefile Tue Feb 5 16:39:26 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.404 2013/02/05 07:32:44 matt Exp $
+# $NetBSD: Makefile,v 1.405 2013/02/05 16:39:26 matt Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -341,7 +341,10 @@ install-etc-files: .PHONY .MAKE check_DE
# Install var/db/obsolete set lists; this is performed by "make build"
#
OBSOLETE.dir= ${.OBJDIR}/obsolete.dir
-OBSOLETE.files= base comp debug etc games man misc text
+OBSOLETE.files= base comp etc games man misc text
+.if ${MKDEBUG} != "no"
+OBSOLETE.files+= debug
+.endif
.if ${MKKMOD} != "no"
OBSOLETE.files+= modules
.endif
CVS commit: src/tests/usr.sbin/mtree
Module Name:src Committed By: christos Date: Tue Feb 5 16:49:42 UTC 2013 Modified Files: src/tests/usr.sbin/mtree: mtree_d_create.out t_mtree.sh Log Message: ignore directory sizes To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/tests/usr.sbin/mtree/mtree_d_create.out cvs rdiff -u -r1.5 -r1.6 src/tests/usr.sbin/mtree/t_mtree.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/tests/usr.sbin/mtree/mtree_d_create.out diff -u src/tests/usr.sbin/mtree/mtree_d_create.out:1.1 src/tests/usr.sbin/mtree/mtree_d_create.out:1.2 --- src/tests/usr.sbin/mtree/mtree_d_create.out:1.1 Wed Jan 2 13:11:44 2013 +++ src/tests/usr.sbin/mtree/mtree_d_create.out Tue Feb 5 11:49:42 2013 @@ -5,7 +5,7 @@ # . /set type=file nlink=1 -. type=dir nlink=4 size=240 +. type=dir nlink=4 a.symlink.1 type=link size=8 link=a.file.1 top.dangling \ type=link size=11 link=nonexistent @@ -15,7 +15,7 @@ type=link size=1 link=b # ./a -a type=dir nlink=4 size=200 +a type=dir nlink=4 a.file.1size=18 \ sha256=bdbea62f7ccdf862f22254ea871d523845250010d5f233896e800142a859eef2 a.file.2size=18 \ @@ -25,7 +25,7 @@ a type=dir nlink=4 size=20 sha256=784fd6b95fe5054d87bf268de51dea043031c5e985f668d4f51e1c759b0f9333 # ./a/1 -1 type=dir nlink=2 size=40 +1 type=dir nlink=2 a1.file.1 size=21 \ sha256=a062cd272facdd38c4fdeff2a18947b28c99a28a8fe51f88468978740382e592 # ./a/1 @@ -33,7 +33,7 @@ a type=dir nlink=4 size=20 # ./a/2 -2 type=dir nlink=2 size=0 +2 type=dir nlink=2 # ./a/2 .. @@ -42,7 +42,7 @@ a type=dir nlink=4 size=20 # ./b -b type=dir nlink=2 size=120 +b type=dir nlink=2 b.file.1nlink=2 size=18 \ sha256=5754b0d97a8238ea0e495ab871667dcab8f1d684e323290ae76f70c47de18998 b.file.2nlink=2 size=18 \ Index: src/tests/usr.sbin/mtree/t_mtree.sh diff -u src/tests/usr.sbin/mtree/t_mtree.sh:1.5 src/tests/usr.sbin/mtree/t_mtree.sh:1.6 --- src/tests/usr.sbin/mtree/t_mtree.sh:1.5 Wed Jan 2 13:11:44 2013 +++ src/tests/usr.sbin/mtree/t_mtree.sh Tue Feb 5 11:49:42 2013 @@ -1,4 +1,4 @@ -# $NetBSD: t_mtree.sh,v 1.5 2013/01/02 18:11:44 christos Exp $ +# $NetBSD: t_mtree.sh,v 1.6 2013/02/05 16:49:42 christos Exp $ # # Copyright (c) 2009, 2012 The NetBSD Foundation, Inc. # All rights reserved. @@ -36,7 +36,8 @@ h_postprocess() /^# machine: /s/:.*/: x/ /^# tree: /s/:.*/: x/ /^# date: /s/:.*/: x/ - ' + ' \ + -e '/type=dir/s/ size=[0-9]*//' } h_check()
CVS commit: src/external/bsd/elftosb/lib
Module Name:src
Committed By: matt
Date: Tue Feb 5 16:57:07 UTC 2013
Modified Files:
src/external/bsd/elftosb/lib: Makefile
Log Message:
Use the fact that all big endian arm MACHINE_ARCH end in eb to detect
endianness
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 src/external/bsd/elftosb/lib/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/elftosb/lib/Makefile
diff -u src/external/bsd/elftosb/lib/Makefile:1.5 src/external/bsd/elftosb/lib/Makefile:1.6
--- src/external/bsd/elftosb/lib/Makefile:1.5 Tue Feb 5 07:27:02 2013
+++ src/external/bsd/elftosb/lib/Makefile Tue Feb 5 16:57:07 2013
@@ -1,10 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2013/02/05 07:27:02 matt Exp $
+# $NetBSD: Makefile,v 1.6 2013/02/05 16:57:07 matt Exp $
-.include
-
-.if ${MACHINE} == "evbarm" \
-&& ${MACHINE_CPU} == "arm" \
-&& ${TARGET_ENDIANNESS} == "1234"
+.if ${MACHINE} == "evbarm" && ${MACHINE_ARCH:M*eb} == ""
LIBISPRIVATE= yes
LIB= elftosb
CVS commit: src
Module Name:src
Committed By: joerg
Date: Tue Feb 5 17:30:02 UTC 2013
Modified Files:
src/lib/libc/sys: socket.2
src/sys/net: if_fddisubr.c
src/sys/netinet: raw_ip.c
Log Message:
Remove remnants of AF_IMPLINK.
To generate a diff of this commit:
cvs rdiff -u -r1.39 -r1.40 src/lib/libc/sys/socket.2
cvs rdiff -u -r1.82 -r1.83 src/sys/net/if_fddisubr.c
cvs rdiff -u -r1.114 -r1.115 src/sys/netinet/raw_ip.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libc/sys/socket.2
diff -u src/lib/libc/sys/socket.2:1.39 src/lib/libc/sys/socket.2:1.40
--- src/lib/libc/sys/socket.2:1.39 Wed Jan 25 09:18:52 2012
+++ src/lib/libc/sys/socket.2 Tue Feb 5 17:30:01 2013
@@ -1,4 +1,4 @@
-.\" $NetBSD: socket.2,v 1.39 2012/01/25 09:18:52 wiz Exp $
+.\" $NetBSD: socket.2,v 1.40 2013/02/05 17:30:01 joerg Exp $
.\"
.\" Copyright (c) 1983, 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -29,7 +29,7 @@
.\"
.\" @(#)socket.2 8.1 (Berkeley) 6/4/93
.\"
-.Dd January 23, 2012
+.Dd February 5, 2013
.Dt SOCKET 2
.Os
.Sh NAME
@@ -60,7 +60,6 @@ PF_INET ARPA Internet protocols
PF_INET6 IPv6 (Internet Protocol version 6) protocols
PF_ISO ISO protocols
PF_NS Xerox Network Systems protocols
-PF_IMPLINK IMP \*(lqhost at IMP\*(rq link layer
PF_APPLETALK AppleTalk protocols
PF_BLUETOOTH Bluetooth protocols
.Ed
Index: src/sys/net/if_fddisubr.c
diff -u src/sys/net/if_fddisubr.c:1.82 src/sys/net/if_fddisubr.c:1.83
--- src/sys/net/if_fddisubr.c:1.82 Thu Oct 11 20:05:50 2012
+++ src/sys/net/if_fddisubr.c Tue Feb 5 17:30:02 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_fddisubr.c,v 1.82 2012/10/11 20:05:50 christos Exp $ */
+/* $NetBSD: if_fddisubr.c,v 1.83 2013/02/05 17:30:02 joerg Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -96,7 +96,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_fddisubr.c,v 1.82 2012/10/11 20:05:50 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_fddisubr.c,v 1.83 2013/02/05 17:30:02 joerg Exp $");
#include "opt_gateway.h"
#include "opt_inet.h"
@@ -443,39 +443,6 @@ fddi_output(struct ifnet *ifp0, struct m
break;
}
- case AF_IMPLINK:
- {
- fh = mtod(m, struct fddi_header *);
- error = EPROTONOSUPPORT;
- switch (fh->fddi_fc & (FDDIFC_C|FDDIFC_L|FDDIFC_F)) {
- case FDDIFC_LLC_ASYNC: {
-/* legal priorities are 0 through 7 */
-if ((fh->fddi_fc & FDDIFC_Z) > 7)
- goto bad;
-break;
- }
- case FDDIFC_LLC_SYNC: {
-/* FDDIFC_Z bits reserved, must be zero */
-if (fh->fddi_fc & FDDIFC_Z)
- goto bad;
-break;
- }
- case FDDIFC_SMT: {
-/* FDDIFC_Z bits must be non zero */
-if ((fh->fddi_fc & FDDIFC_Z) == 0)
- goto bad;
-break;
- }
- default: {
-/* anything else is too dangerous */
- goto bad;
- }
- }
- error = 0;
- if (fh->fddi_dhost[0] & 1)
- m->m_flags |= (M_BCAST|M_MCAST);
- goto queue_it;
- }
default:
printf("%s: can't handle af%d\n", ifp->if_xname,
dst->sa_family);
@@ -505,8 +472,7 @@ fddi_output(struct ifnet *ifp0, struct m
senderr(ENOBUFS);
fh = mtod(m, struct fddi_header *);
fh->fddi_fc = FDDIFC_LLC_ASYNC|FDDIFC_LLC_PRIO4;
- memcpy(fh->fddi_dhost, edst, sizeof (edst));
- queue_it:
+ memcpy(fh->fddi_dhost, edst, sizeof (edst));
if (hdrcmplt)
memcpy(fh->fddi_shost, esrc, sizeof(fh->fddi_shost));
else
Index: src/sys/netinet/raw_ip.c
diff -u src/sys/netinet/raw_ip.c:1.114 src/sys/netinet/raw_ip.c:1.115
--- src/sys/netinet/raw_ip.c:1.114 Thu Mar 22 20:34:39 2012
+++ src/sys/netinet/raw_ip.c Tue Feb 5 17:30:02 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: raw_ip.c,v 1.114 2012/03/22 20:34:39 drochner Exp $ */
+/* $NetBSD: raw_ip.c,v 1.115 2013/02/05 17:30:02 joerg Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -61,7 +61,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.114 2012/03/22 20:34:39 drochner Exp $");
+__KERNEL_RCSID(0, "$NetBSD: raw_ip.c,v 1.115 2013/02/05 17:30:02 joerg Exp $");
#include "opt_inet.h"
#include "opt_compat_netbsd.h"
@@ -478,8 +478,7 @@ rip_bind(struct inpcb *inp, struct mbuf
return (EINVAL);
if (TAILQ_FIRST(&ifnet) == 0)
return (EADDRNOTAVAIL);
- if (addr->sin_family != AF_INET &&
- addr->sin_family != AF_IMPLINK)
+ if (addr->sin_family != AF_INET)
return (EAFNOSUPPORT);
if (!in_nullhost(addr->sin_addr) &&
ifa_ifwithaddr(sintosa(addr)) == 0)
@@ -497,8 +496,7 @@ rip_connect(struct inpcb *inp, struct mb
return (EINVAL);
if (TAILQ_FIRST(&ifnet) == 0)
return (EADDRNOTAVAIL);
- if (addr->sin_family != AF_INET &&
- addr->sin_family != AF_IMPLINK)
+ if (addr->sin_family != AF_INET)
return (EAFNOSUPPORT);
inp->inp_faddr = addr->sin_addr;
return (0);
CVS commit: src/share/man/man4
Module Name:src Committed By: joerg Date: Tue Feb 5 17:36:03 UTC 2013 Modified Files: src/share/man/man4: netintro.4 Log Message: Include AF_INET6. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/share/man/man4/netintro.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/share/man/man4/netintro.4 diff -u src/share/man/man4/netintro.4:1.23 src/share/man/man4/netintro.4:1.24 --- src/share/man/man4/netintro.4:1.23 Sat Dec 5 20:11:02 2009 +++ src/share/man/man4/netintro.4 Tue Feb 5 17:36:03 2013 @@ -1,4 +1,4 @@ -.\" $NetBSD: netintro.4,v 1.23 2009/12/05 20:11:02 pooka Exp $ +.\" $NetBSD: netintro.4,v 1.24 2013/02/05 17:36:03 joerg Exp $ .\" .\" Copyright (c) 1983, 1990, 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)netintro.4 8.2 (Berkeley) 11/30/93 .\" -.Dd September 7, 2006 +.Dd February 5, 2013 .Dt NETINTRO 4 .Os .Sh NAME @@ -144,6 +144,7 @@ are known to the system #defineAF_CCITT 10 /* CCITT protocols, X.25 etc */ #defineAF_HYLINK15 /* NSC Hyperchannel */ #defineAF_ISO 18 /* ISO protocols */ +#defineAF_INET6 24 /* internetwork, v6: UDP, TCP, etc. */ .Ed .Sh ROUTING .Ux
CVS commit: src/distrib/sets/lists/base
Module Name:src Committed By: matt Date: Tue Feb 5 17:52:23 UTC 2013 Modified Files: src/distrib/sets/lists/base: mi Log Message: Add ./var/db/obsolete/debug To generate a diff of this commit: cvs rdiff -u -r1.1017 -r1.1018 src/distrib/sets/lists/base/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/mi diff -u src/distrib/sets/lists/base/mi:1.1017 src/distrib/sets/lists/base/mi:1.1018 --- src/distrib/sets/lists/base/mi:1.1017 Wed Jan 23 15:02:52 2013 +++ src/distrib/sets/lists/base/mi Tue Feb 5 17:52:22 2013 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1017 2013/01/23 15:02:52 joerg Exp $ +# $NetBSD: mi,v 1.1018 2013/02/05 17:52:22 matt Exp $ # # Note: Don't delete entries from here - mark them as "obsolete" instead, # unless otherwise stated below. @@ -5016,6 +5016,7 @@ ./var/db/obsoletebase-sys-root ./var/db/obsolete/basebase-sys-root ./var/db/obsolete/compbase-sys-root +./var/db/obsolete/debugbase-sys-root debug ./var/db/obsolete/etcbase-sys-root ./var/db/obsolete/gamesbase-sys-root ./var/db/obsolete/manbase-sys-root
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: christos
Date: Tue Feb 5 18:15:04 UTC 2013
Modified Files:
src/sys/dev/usb: if_urtwn.c
Log Message:
cache the pipe before the container is put in the free list (and can change)
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/dev/usb/if_urtwn.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/if_urtwn.c
diff -u src/sys/dev/usb/if_urtwn.c:1.19 src/sys/dev/usb/if_urtwn.c:1.20
--- src/sys/dev/usb/if_urtwn.c:1.19 Mon Jan 28 18:46:33 2013
+++ src/sys/dev/usb/if_urtwn.c Tue Feb 5 13:15:04 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtwn.c,v 1.19 2013/01/28 23:46:33 christos Exp $ */
+/* $NetBSD: if_urtwn.c,v 1.20 2013/02/05 18:15:04 christos Exp $ */
/* $OpenBSD: if_urtwn.c,v 1.20 2011/11/26 06:39:33 ckuethe Exp $ */
/*-
@@ -22,7 +22,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.19 2013/01/28 23:46:33 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.20 2013/02/05 18:15:04 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -2117,6 +2117,7 @@ urtwn_txeof(usbd_xfer_handle xfer, usbd_
struct urtwn_tx_data *data = priv;
struct urtwn_softc *sc = data->sc;
struct ifnet *ifp = &sc->sc_if;
+ usbd_pipe_handle pipe = data->pipe;
int s;
DPRINTFN(DBG_FN|DBG_TX, ("%s: %s: status=%d\n",
@@ -2135,7 +2136,7 @@ urtwn_txeof(usbd_xfer_handle xfer, usbd_
if (__predict_false(status != USBD_NORMAL_COMPLETION)) {
if (status != USBD_NOT_STARTED && status != USBD_CANCELLED) {
if (status == USBD_STALLED)
-usbd_clear_endpoint_stall_async(data->pipe);
+usbd_clear_endpoint_stall_async(pipe);
ifp->if_oerrors++;
}
splx(s);
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: christos
Date: Tue Feb 5 18:17:05 UTC 2013
Modified Files:
src/sys/dev/usb: if_urtwn.c
Log Message:
don't count an output packet on a stall.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/sys/dev/usb/if_urtwn.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/if_urtwn.c
diff -u src/sys/dev/usb/if_urtwn.c:1.20 src/sys/dev/usb/if_urtwn.c:1.21
--- src/sys/dev/usb/if_urtwn.c:1.20 Tue Feb 5 13:15:04 2013
+++ src/sys/dev/usb/if_urtwn.c Tue Feb 5 13:17:05 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtwn.c,v 1.20 2013/02/05 18:15:04 christos Exp $ */
+/* $NetBSD: if_urtwn.c,v 1.21 2013/02/05 18:17:05 christos Exp $ */
/* $OpenBSD: if_urtwn.c,v 1.20 2011/11/26 06:39:33 ckuethe Exp $ */
/*-
@@ -22,7 +22,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.20 2013/02/05 18:15:04 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_urtwn.c,v 1.21 2013/02/05 18:17:05 christos Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -2131,7 +2131,6 @@ urtwn_txeof(usbd_xfer_handle xfer, usbd_
s = splnet();
sc->tx_timer = 0;
ifp->if_flags &= ~IFF_OACTIVE;
- ifp->if_opackets++;
if (__predict_false(status != USBD_NORMAL_COMPLETION)) {
if (status != USBD_NOT_STARTED && status != USBD_CANCELLED) {
@@ -2143,6 +2142,7 @@ urtwn_txeof(usbd_xfer_handle xfer, usbd_
return;
}
+ ifp->if_opackets++;
urtwn_start(ifp);
splx(s);
CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc
Module Name:src Committed By: christos Date: Tue Feb 5 19:21:27 UTC 2013 Modified Files: src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc: ppccpuid.S Log Message: regen To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S:1.5 --- src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S:1.4 Fri Jul 27 19:01:23 2012 +++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/powerpc/ppccpuid.S Tue Feb 5 14:21:27 2013 @@ -72,11 +72,11 @@ OPENSSL_atomic_add: .align 4 OPENSSL_rdtsc: .Lrdtsc: + mftb 5 mftbu 4 mftb 3 - mftbu 5 - cmplw 4,5 - bne- .Lrdtsc + .long 0x7c032840 + bne .Lrdtsc blr .long 0 .byte 0,12,0x14,0,0,0,0,0 @@ -89,13 +89,12 @@ OPENSSL_cleanse: li 0,0 bge .Lot cmplwi 4,0 - beqlr- -.Little: - mtctr 4 + bclr 14,2 +.Little: mtctr 4 stb 0,0(3) addi 3,3,1 - bdnz $-8 - blr + bc 16,0,$-8 + blr .Lot: andi. 5,3,3 beq .Laligned stb 0,0(3) @@ -105,10 +104,9 @@ OPENSSL_cleanse: .Laligned: srwi 5,4,2 mtctr 5 -.Lstore4: stw 0,0(3) addi 3,3,4 - bdnz .Lstore4 + bc 16,0,$-8 andi. 4,4,3 bne .Little blr
CVS commit: src/external/gpl3/gcc/dist/gcc/config/arm
Module Name:src
Committed By: matt
Date: Tue Feb 5 19:29:14 UTC 2013
Modified Files:
src/external/gpl3/gcc/dist/gcc/config/arm: netbsd-eabi.h
Log Message:
If compiling with apcs-gnu or atpcs ABIs, supply -mabi=gnu to gas.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h
diff -u src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h:1.4 src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h:1.5
--- src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h:1.4 Mon Feb 4 18:41:18 2013
+++ src/external/gpl3/gcc/dist/gcc/config/arm/netbsd-eabi.h Tue Feb 5 19:29:13 2013
@@ -68,7 +68,7 @@
#undef SUBTARGET_EXTRA_ASM_SPEC
#define SUBTARGET_EXTRA_ASM_SPEC \
- "-matpcs %{fpic|fpie:-k} %{fPIC|fPIE:-k}"
+ "-matpcs %{mabi=apcs-gnu|mabi=atpcs:-meabi=gnu} %{fpic|fpie:-k} %{fPIC|fPIE:-k}"
/* Default to full VFP if -mhard-float is specified. */
#undef SUBTARGET_ASM_FLOAT_SPEC
CVS commit: src/doc
Module Name:src Committed By: christos Date: Tue Feb 5 21:35:18 UTC 2013 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: new openssl. To generate a diff of this commit: cvs rdiff -u -r1.999 -r1.1000 src/doc/3RDPARTY cvs rdiff -u -r1.1787 -r1.1788 src/doc/CHANGES Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/3RDPARTY diff -u src/doc/3RDPARTY:1.999 src/doc/3RDPARTY:1.1000 --- src/doc/3RDPARTY:1.999 Mon Jan 28 10:48:09 2013 +++ src/doc/3RDPARTY Tue Feb 5 16:35:18 2013 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.999 2013/01/28 15:48:09 roy Exp $ +# $NetBSD: 3RDPARTY,v 1.1000 2013/02/05 21:35:18 christos Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -888,8 +888,8 @@ markus is very cooperative about it): - make compile with gcc-4.5; const fixes, fileno() checks, shadow fixes. Package: OpenSSL -Version: 1.0.1c -Current Vers: 1.0.1c with AES-NI patch +Version: 1.0.1d +Current Vers: 1.0.1d with AES-NI patch Maintainer: The OpenSSL Project Archive Site: ftp://ftp.openssl.org/source/ Home Page: http://www.openssl.org/ Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1787 src/doc/CHANGES:1.1788 --- src/doc/CHANGES:1.1787 Sun Feb 3 10:32:32 2013 +++ src/doc/CHANGES Tue Feb 5 16:35:18 2013 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1787 $> +# LIST OF CHANGES FROM LAST RELEASE: <$Revision: 1.1788 $> # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -185,3 +185,4 @@ Changes from NetBSD 6.0 to NetBSD 7.0: em4k(4): Add driver for Mediator 4000 PCI bridges. [rkujawa 20130129] makefs(8): Add support for msdos, creating filesystems at an offset, merging directories with common files. [christos 20130202] + openssl: update to 1.0.1d [christos 20130205]
CVS commit: src/sys/arch/sparc/dev
Module Name:src
Committed By: macallan
Date: Tue Feb 5 21:45:40 UTC 2013
Modified Files:
src/sys/arch/sparc/dev: cgfourteen.c cgfourteenvar.h
Log Message:
throw out RASTERCONSOLE goo
To generate a diff of this commit:
cvs rdiff -u -r1.68 -r1.69 src/sys/arch/sparc/dev/cgfourteen.c
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/sparc/dev/cgfourteenvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/dev/cgfourteen.c
diff -u src/sys/arch/sparc/dev/cgfourteen.c:1.68 src/sys/arch/sparc/dev/cgfourteen.c:1.69
--- src/sys/arch/sparc/dev/cgfourteen.c:1.68 Sat Oct 27 17:18:11 2012
+++ src/sys/arch/sparc/dev/cgfourteen.c Tue Feb 5 21:45:39 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cgfourteen.c,v 1.68 2012/10/27 17:18:11 chs Exp $ */
+/* $NetBSD: cgfourteen.c,v 1.69 2013/02/05 21:45:39 macallan Exp $ */
/*
* Copyright (c) 1996
@@ -128,8 +128,6 @@ static struct fbdriver cgfourteenfbdrive
cgfourteenpoll, cgfourteenmmap, nokqfilter
};
-extern struct tty *fbconstty;
-
static void cg14_set_video(struct cgfourteen_softc *, int);
static int cg14_get_video(struct cgfourteen_softc *);
static int cg14_get_cmap(struct fbcmap *, union cg14cmap *, int);
@@ -149,10 +147,6 @@ static int cg14_do_cursor(struct cgfour
struct wsdisplay_cursor *);
#endif
-#if defined(RASTERCONSOLE) && (NWSDISPLAY > 0)
-#error "You can't have it both ways - either RASTERCONSOLE or wsdisplay"
-#endif
-
/*
* Match a cgfourteen.
*/
@@ -184,18 +178,6 @@ cgfourteenmatch(device_t parent, struct
*/
#define COLOUR_OFFSET (256*1024)
-#ifdef RASTERCONSOLE
-static void cg14_set_rcons_luts(struct cgfourteen_softc *sc)
-{
- int i;
-
- for (i=0;isc_xlut->xlut_lut[i] = 0x22;
- for (i=0;isc_clut2->clut_lut[i] = 0x00ff;
- sc->sc_clut2->clut_lut[0] = 0x00ff;
- sc->sc_clut2->clut_lut[255] = 0;
-}
-#endif /* RASTERCONSOLE */
-
#if NWSDISPLAY > 0
static int cg14_ioctl(void *, void *, u_long, void *, int, struct lwp *);
static paddr_t cg14_mmap(void *, void *, off_t, int);
@@ -315,40 +297,6 @@ cgfourteenattach(device_t parent, device
/* See if we're the console */
isconsole = fb_is_console(node);
-#if defined(RASTERCONSOLE)
- if (isconsole) {
- printf(" (console)\n");
- /* *sbus*_bus_map? but that's how we map the regs... */
- if (sbus_bus_map( sc->sc_bustag,
- sc->sc_physadr[CG14_PXL_IDX].sbr_slot,
- sc->sc_physadr[CG14_PXL_IDX].sbr_offset +
-0x0380,
- 1152 * 900, BUS_SPACE_MAP_LINEAR,
- &bh) != 0) {
- printf("%s: cannot map pixels\n",
- device_xname(sc->sc_dev));
- return;
- }
- sc->sc_rcfb = sc->sc_fb;
- sc->sc_rcfb.fb_type.fb_type = FBTYPE_SUN3COLOR;
- sc->sc_rcfb.fb_type.fb_depth = 8;
- sc->sc_rcfb.fb_linebytes = 1152;
- sc->sc_rcfb.fb_type.fb_size = roundup(1152*900,NBPG);
- sc->sc_rcfb.fb_pixels = (void *)bh;
-
- printf("vram at %p\n",(void *)bh);
- /* XXX should use actual screen size */
-
- for (i = 0; i < ramsize; i++)
- ((unsigned char *)bh)[i] = 0;
- fbrcons_init(&sc->sc_rcfb);
- cg14_set_rcons_luts(sc);
- sc->sc_ctl->ctl_mctl = CG14_MCTL_ENABLEVID |
- CG14_MCTL_PIXMODE_32 | CG14_MCTL_POWERCTL;
- } else
- printf("\n");
-#endif
-
#if NWSDISPLAY > 0
prom_getprop(sa->sa_node, "address", 4, &items, &ptr);
if (fbva[1] == 0) {
Index: src/sys/arch/sparc/dev/cgfourteenvar.h
diff -u src/sys/arch/sparc/dev/cgfourteenvar.h:1.13 src/sys/arch/sparc/dev/cgfourteenvar.h:1.14
--- src/sys/arch/sparc/dev/cgfourteenvar.h:1.13 Tue Aug 31 21:14:57 2010
+++ src/sys/arch/sparc/dev/cgfourteenvar.h Tue Feb 5 21:45:39 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cgfourteenvar.h,v 1.13 2010/08/31 21:14:57 macallan Exp $ */
+/* $NetBSD: cgfourteenvar.h,v 1.14 2013/02/05 21:45:39 macallan Exp $ */
/*
* Copyright (c) 1996
@@ -74,9 +74,6 @@ struct cg14_cursor { /* cg14 hardware c
struct cgfourteen_softc {
device_t sc_dev; /* base device */
struct fbdevice sc_fb; /* frame buffer device */
-#ifdef RASTERCONSOLE
- struct fbdevice sc_rcfb; /* sc_fb variant for rcons */
-#endif
bus_space_tag_t sc_bustag;
struct sbus_reg sc_physadr[2]; /* phys addrs of h/w */
bus_space_handle_t sc_regh; /* register space */
CVS commit: src/sys/arch/sparc
Module Name:src
Committed By: macallan
Date: Tue Feb 5 21:52:48 UTC 2013
Modified Files:
src/sys/arch/sparc/conf: files.sparc
Added Files:
src/sys/arch/sparc/dev: sx.c sxreg.h sxvar.h
Log Message:
attachment and initialization for SX
To generate a diff of this commit:
cvs rdiff -u -r1.152 -r1.153 src/sys/arch/sparc/conf/files.sparc
cvs rdiff -u -r0 -r1.1 src/sys/arch/sparc/dev/sx.c \
src/sys/arch/sparc/dev/sxreg.h src/sys/arch/sparc/dev/sxvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/conf/files.sparc
diff -u src/sys/arch/sparc/conf/files.sparc:1.152 src/sys/arch/sparc/conf/files.sparc:1.153
--- src/sys/arch/sparc/conf/files.sparc:1.152 Tue Nov 6 07:59:09 2012
+++ src/sys/arch/sparc/conf/files.sparc Tue Feb 5 21:52:48 2013
@@ -1,4 +1,4 @@
-# $NetBSD: files.sparc,v 1.152 2012/11/06 07:59:09 alnsn Exp $
+# $NetBSD: files.sparc,v 1.153 2013/02/05 21:52:48 macallan Exp $
# @(#)files.sparc 8.1 (Berkeley) 7/19/93
# sparc-specific configuration info
@@ -118,6 +118,10 @@ device eccmemctl
attach eccmemctl at mainbus
file arch/sparc/sparc/memecc.c eccmemctl
+device sx {}
+attach sx at mainbus
+file arch/sparc/dev/sx.c sx needs-flag
+
device tctrl: sysmon_envsys, sysmon_power, sysmon_taskq
attach tctrl at obio
file arch/sparc/dev/tctrl.c tctrl needs-flag
@@ -251,7 +255,7 @@ device cgeight: bt_dac, fb, rasops24, pf
attach cgeight at obio
file arch/sparc/dev/cgeight.c cgeight needs-flag
-device cgfourteen: fb, rasops32, rasops8, wsemuldisplaydev
+device cgfourteen: fb, rasops8, wsemuldisplaydev
attach cgfourteen at obio
file arch/sparc/dev/cgfourteen.c cgfourteen needs-flag
Added files:
Index: src/sys/arch/sparc/dev/sx.c
diff -u /dev/null src/sys/arch/sparc/dev/sx.c:1.1
--- /dev/null Tue Feb 5 21:52:48 2013
+++ src/sys/arch/sparc/dev/sx.c Tue Feb 5 21:52:48 2013
@@ -0,0 +1,141 @@
+/* $NetBSD: sx.c,v 1.1 2013/02/05 21:52:48 macallan Exp $ */
+
+/*-
+ * Copyright (c) 2013 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Michael Lorenz.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *notice, this list of conditions and the following disclaimer in the
+ *documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. 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 FOUNDATION 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
+__KERNEL_RCSID(0, "$NetBSD: sx.c,v 1.1 2013/02/05 21:52:48 macallan Exp $");
+
+#include "locators.h"
+
+#include
+#include
+#include
+#include
+
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+
+
+/* autoconfiguration driver */
+static int sx_match(device_t, struct cfdata *, void *);
+static void sx_attach(device_t, device_t, void *);
+
+CFATTACH_DECL_NEW(sx, sizeof(struct sx_softc),
+sx_match, sx_attach, NULL, NULL);
+
+static int
+sx_match(device_t parent, struct cfdata *cf, void *aux)
+{
+ struct mainbus_attach_args *ma = aux;
+
+ return (strcmp("SUNW,sx", ma->ma_name) == 0);
+}
+
+static void
+sx_attach(device_t parent, device_t self, void *aux)
+{
+ struct sx_softc *sc = device_private(self);
+ struct mainbus_attach_args *ma = aux;
+ int i;
+#ifdef SX_DEBUG
+ int j;
+#endif
+
+ printf("\n");
+
+ sc->sc_dev = self;
+ sc->sc_tag = ma->ma_bustag;
+ sc->sc_uregs = ma->ma_paddr + 0x1000;
+
+ if (bus_space_map(sc->sc_tag, ma->ma_paddr, 0x1000, 0, &sc->sc_regh)) {
+ aprint_error_dev(self, "failed to map registers\n");
+ return;
+ }
+
+ /* stop the processor */
+ sx_write(sc, SX_CONTROL_STATUS, 0);
+ /* initialize control registers, clear errors etc. */
+ sx_write(sc, SX_R0_INIT, 0);
+ sx_write(sc, SX_ERROR, 0);
+ /* default, to be overriden once cgfourteen takes over */
+ sx_write(sc, SX_PAGE_BOUND_LOWER, 0xfc00);
+ /* cg14
CVS commit: src/sys/arch/sparc/sparc
Module Name:src Committed By: macallan Date: Tue Feb 5 21:53:46 UTC 2013 Modified Files: src/sys/arch/sparc/sparc: autoconf.c Log Message: don't skip SUNW,sx - we've got a driver now To generate a diff of this commit: cvs rdiff -u -r1.246 -r1.247 src/sys/arch/sparc/sparc/autoconf.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/arch/sparc/sparc/autoconf.c diff -u src/sys/arch/sparc/sparc/autoconf.c:1.246 src/sys/arch/sparc/sparc/autoconf.c:1.247 --- src/sys/arch/sparc/sparc/autoconf.c:1.246 Sat Oct 27 17:18:12 2012 +++ src/sys/arch/sparc/sparc/autoconf.c Tue Feb 5 21:53:45 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: autoconf.c,v 1.246 2012/10/27 17:18:12 chs Exp $ */ +/* $NetBSD: autoconf.c,v 1.247 2013/02/05 21:53:45 macallan Exp $ */ /* * Copyright (c) 1996 @@ -48,7 +48,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.246 2012/10/27 17:18:12 chs Exp $"); +__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.247 2013/02/05 21:53:45 macallan Exp $"); #include "opt_ddb.h" #include "opt_kgdb.h" @@ -1136,7 +1136,6 @@ extern struct sparc_bus_space_tag mainbu * These are _root_ devices to ignore. Others must be handled * elsewhere. */ - "SUNW,sx", /* XXX: no driver for SX yet */ "virtual-memory", "aliases", "chosen", /* OpenFirmware */
CVS commit: src/sys/arch/sparc/sparc
Module Name:src
Committed By: macallan
Date: Tue Feb 5 22:03:17 UTC 2013
Modified Files:
src/sys/arch/sparc/sparc: autoconf.c
Log Message:
attach SUNW,sx early so cgfourteen can grab it right away and doesn't have
to play games waiting for it
To generate a diff of this commit:
cvs rdiff -u -r1.247 -r1.248 src/sys/arch/sparc/sparc/autoconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/sparc/autoconf.c
diff -u src/sys/arch/sparc/sparc/autoconf.c:1.247 src/sys/arch/sparc/sparc/autoconf.c:1.248
--- src/sys/arch/sparc/sparc/autoconf.c:1.247 Tue Feb 5 21:53:45 2013
+++ src/sys/arch/sparc/sparc/autoconf.c Tue Feb 5 22:03:16 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.247 2013/02/05 21:53:45 macallan Exp $ */
+/* $NetBSD: autoconf.c,v 1.248 2013/02/05 22:03:16 macallan Exp $ */
/*
* Copyright (c) 1996
@@ -48,7 +48,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.247 2013/02/05 21:53:45 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: autoconf.c,v 1.248 2013/02/05 22:03:16 macallan Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -1125,6 +1125,7 @@ extern struct sparc_bus_space_tag mainbu
static const char *const openboot_special4m[] = {
/* find these first */
#if !defined(MSIIEP)
+ "SUNW,sx",
"obio", /* smart enough to get eeprom/etc mapped */
#else
"pci", /* ms-IIep */
CVS commit: src/sys/arch/arm/vfp
Module Name:src
Committed By: matt
Date: Tue Feb 5 23:23:34 UTC 2013
Modified Files:
src/sys/arch/arm/vfp: vfp_init.c
Log Message:
Use the mrc form of the vmrs rX, mvfrX instruction to shut up gas.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/sys/arch/arm/vfp/vfp_init.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/vfp/vfp_init.c
diff -u src/sys/arch/arm/vfp/vfp_init.c:1.18 src/sys/arch/arm/vfp/vfp_init.c:1.19
--- src/sys/arch/arm/vfp/vfp_init.c:1.18 Thu Jan 31 22:35:25 2013
+++ src/sys/arch/arm/vfp/vfp_init.c Tue Feb 5 23:23:34 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: vfp_init.c,v 1.18 2013/01/31 22:35:25 matt Exp $ */
+/* $NetBSD: vfp_init.c,v 1.19 2013/02/05 23:23:34 matt Exp $ */
/*
* Copyright (c) 2008 ARM Ltd
@@ -387,8 +387,8 @@ vfp_attach(void)
}
cpu_fpu_present = 1;
- __asm("fmrx %0, mvfr0" : "=r"(cpu_media_and_vfp_features[0]));
- __asm("fmrx %0, mvfr1" : "=r"(cpu_media_and_vfp_features[1]));
+ __asm("mrc p10,7,%0,c7,c0,0" : "=r"(cpu_media_and_vfp_features[0]));
+ __asm("mrc p10,7,%0,c6,c0,0" : "=r"(cpu_media_and_vfp_features[1]));
if (fpsid != 0) {
aprint_normal("vfp%d at %s: %s\n",
device_unit(curcpu()->ci_dev), device_xname(curcpu()->ci_dev),
CVS commit: src/crypto/external/bsd/openssl/lib
Module Name:src Committed By: christos Date: Tue Feb 5 23:38:46 UTC 2013 Modified Files: src/crypto/external/bsd/openssl/lib/libcrypto: evp.inc shlib_version src/crypto/external/bsd/openssl/lib/libssl: shlib_version Log Message: bump and add extra file To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/crypto/external/bsd/openssl/lib/libcrypto/evp.inc cvs rdiff -u -r1.6 -r1.7 \ src/crypto/external/bsd/openssl/lib/libcrypto/shlib_version cvs rdiff -u -r1.6 -r1.7 \ src/crypto/external/bsd/openssl/lib/libssl/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/openssl/lib/libcrypto/evp.inc diff -u src/crypto/external/bsd/openssl/lib/libcrypto/evp.inc:1.3 src/crypto/external/bsd/openssl/lib/libcrypto/evp.inc:1.4 --- src/crypto/external/bsd/openssl/lib/libcrypto/evp.inc:1.3 Thu Jul 26 15:58:40 2012 +++ src/crypto/external/bsd/openssl/lib/libcrypto/evp.inc Tue Feb 5 18:38:46 2013 @@ -1,4 +1,4 @@ -# $NetBSD: evp.inc,v 1.3 2012/07/26 19:58:40 christos Exp $ +# $NetBSD: evp.inc,v 1.4 2013/02/05 23:38:46 christos Exp $ # # @(#) Copyright (c) 1995 Simon J. Gerraty # @@ -15,7 +15,7 @@ EVP_SRCS = encode.c digest.c evp_enc.c e m_null.c m_md2.c m_md4.c m_md5.c m_sha.c m_sha1.c \ m_dss.c m_dss1.c m_mdc2.c m_ripemd.c \ p_open.c p_seal.c p_sign.c p_verify.c p_lib.c p_enc.c p_dec.c \ - bio_md.c bio_b64.c bio_enc.c evp_err.c e_null.c \ + bio_md.c bio_b64.c bio_enc.c evp_cnf.c evp_err.c e_null.c \ c_all.c c_allc.c c_alld.c evp_lib.c bio_ok.c \ evp_pkey.c evp_pbe.c p5_crpt.c p5_crpt2.c m_ecdsa.c pmeth_lib.c \ pmeth_fn.c m_sigver.c m_wp.c pmeth_gn.c evp_fips.c \ Index: src/crypto/external/bsd/openssl/lib/libcrypto/shlib_version diff -u src/crypto/external/bsd/openssl/lib/libcrypto/shlib_version:1.6 src/crypto/external/bsd/openssl/lib/libcrypto/shlib_version:1.7 --- src/crypto/external/bsd/openssl/lib/libcrypto/shlib_version:1.6 Thu Jul 26 15:58:40 2012 +++ src/crypto/external/bsd/openssl/lib/libcrypto/shlib_version Tue Feb 5 18:38:46 2013 @@ -1,5 +1,5 @@ -# $NetBSD: shlib_version,v 1.6 2012/07/26 19:58:40 christos Exp $ +# $NetBSD: shlib_version,v 1.7 2013/02/05 23:38:46 christos Exp $ # Remember to update distrib/sets/lists/base/shl.* when changing # major=8 -minor=0 +minor=1 Index: src/crypto/external/bsd/openssl/lib/libssl/shlib_version diff -u src/crypto/external/bsd/openssl/lib/libssl/shlib_version:1.6 src/crypto/external/bsd/openssl/lib/libssl/shlib_version:1.7 --- src/crypto/external/bsd/openssl/lib/libssl/shlib_version:1.6 Thu Jul 26 15:58:42 2012 +++ src/crypto/external/bsd/openssl/lib/libssl/shlib_version Tue Feb 5 18:38:46 2013 @@ -1,5 +1,5 @@ -# $NetBSD: shlib_version,v 1.6 2012/07/26 19:58:42 christos Exp $ +# $NetBSD: shlib_version,v 1.7 2013/02/05 23:38:46 christos Exp $ # Remember to update distrib/sets/lists/base/shl.* when changing # major=10 -minor=0 +minor=1
CVS commit: src/distrib/sets/lists
Module Name:src Committed By: christos Date: Tue Feb 5 23:42:22 UTC 2013 Modified Files: src/distrib/sets/lists/base: ad.mips64eb ad.mips64el md.amd64 md.sparc64 shl.mi src/distrib/sets/lists/debug: ad.mips64eb ad.mips64el md.amd64 md.sparc64 shl.mi Log Message: bump libcrypto and libssl To generate a diff of this commit: cvs rdiff -u -r1.112 -r1.113 src/distrib/sets/lists/base/ad.mips64eb \ src/distrib/sets/lists/base/ad.mips64el cvs rdiff -u -r1.188 -r1.189 src/distrib/sets/lists/base/md.amd64 cvs rdiff -u -r1.177 -r1.178 src/distrib/sets/lists/base/md.sparc64 cvs rdiff -u -r1.648 -r1.649 src/distrib/sets/lists/base/shl.mi cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/debug/ad.mips64eb \ src/distrib/sets/lists/debug/ad.mips64el cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/debug/md.amd64 \ src/distrib/sets/lists/debug/md.sparc64 \ src/distrib/sets/lists/debug/shl.mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/distrib/sets/lists/base/ad.mips64eb diff -u src/distrib/sets/lists/base/ad.mips64eb:1.112 src/distrib/sets/lists/base/ad.mips64eb:1.113 --- src/distrib/sets/lists/base/ad.mips64eb:1.112 Tue Jan 22 15:25:16 2013 +++ src/distrib/sets/lists/base/ad.mips64eb Tue Feb 5 18:42:21 2013 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64eb,v 1.112 2013/01/22 20:25:16 christos Exp $ +# $NetBSD: ad.mips64eb,v 1.113 2013/02/05 23:42:21 christos Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -78,7 +78,7 @@ ./usr/lib/64/libcrypt.so.1 base-compat-shlib compat,pic ./usr/lib/64/libcrypt.so.1.0 base-compat-shlib compat,pic ./usr/lib/64/libcrypto.so.8 base-compat-shlib compat,pic,crypto -./usr/lib/64/libcrypto.so.8.0 base-compat-shlib compat,pic,crypto +./usr/lib/64/libcrypto.so.8.1 base-compat-shlib compat,pic,crypto ./usr/lib/64/libcrypto_idea.so.7 base-obsolete obsolete ./usr/lib/64/libcrypto_idea.so.7.0 base-obsolete obsolete ./usr/lib/64/libcrypto_mdc2.so.7 base-obsolete obsolete @@ -260,7 +260,7 @@ ./usr/lib/64/libssh.so.20 base-compat-shlib compat,pic,crypto ./usr/lib/64/libssh.so.20.0 base-compat-shlib compat,pic,crypto ./usr/lib/64/libssl.so.10 base-compat-shlib compat,pic,crypto -./usr/lib/64/libssl.so.10.0 base-compat-shlib compat,pic,crypto +./usr/lib/64/libssl.so.10.1 base-compat-shlib compat,pic,crypto ./usr/lib/64/libstdc++.so.7 base-compat-shlib compat,pic,cxx,gcccmds ./usr/lib/64/libstdc++.so.7.0 base-compat-shlib gcc=4,compat,pic,cxx ./usr/lib/64/libstdc++.so.7.1 base-compat-shlib gcc=45,compat,pic,cxx @@ -398,7 +398,7 @@ ./usr/lib/o32/libcrypt.so.1 base-compat-shlib compat,pic ./usr/lib/o32/libcrypt.so.1.0 base-compat-shlib compat,pic ./usr/lib/o32/libcrypto.so.8 base-compat-shlib compat,pic,crypto -./usr/lib/o32/libcrypto.so.8.0 base-compat-shlib compat,pic,crypto +./usr/lib/o32/libcrypto.so.8.1 base-compat-shlib compat,pic,crypto ./usr/lib/o32/libcurses.so.7 base-compat-shlib compat,pic ./usr/lib/o32/libcurses.so.7.0 base-compat-shlib compat,pic ./usr/lib/o32/libdes.so.8 base-compat-shlib compat,pic,crypto @@ -574,7 +574,7 @@ ./usr/lib/o32/libssh.so.20 base-compat-shlib compat,pic,crypto ./usr/lib/o32/libssh.so.20.0 base-compat-shlib compat,pic,crypto ./usr/lib/o32/libssl.so.10 base-compat-shlib compat,pic,crypto -./usr/lib/o32/libssl.so.10.0 base-compat-shlib compat,pic,crypto +./usr/lib/o32/libssl.so.10.1 base-compat-shlib compat,pic,crypto ./usr/lib/o32/libstdc++.so.7 base-compat-shlib compat,pic,cxx,gcccmds ./usr/lib/o32/libstdc++.so.7.0 base-compat-shlib gcc=4,compat,pic,cxx ./usr/lib/o32/libstdc++.so.7.1 base-compat-shlib gcc=45,compat,pic,cxx Index: src/distrib/sets/lists/base/ad.mips64el diff -u src/distrib/sets/lists/base/ad.mips64el:1.112 src/distrib/sets/lists/base/ad.mips64el:1.113 --- src/distrib/sets/lists/base/ad.mips64el:1.112 Tue Jan 22 15:25:16 2013 +++ src/distrib/sets/lists/base/ad.mips64el Tue Feb 5 18:42:21 2013 @@ -1,4 +1,4 @@ -# $NetBSD: ad.mips64el,v 1.112 2013/01/22 20:25:16 christos Exp $ +# $NetBSD: ad.mips64el,v 1.113 2013/02/05 23:42:21 christos Exp $ ./libexec/ld.elf_so-64base-compat-shlib compat,pic ./libexec/ld.elf_so-o32base-sysutil-bin compat,pic ./usr/lib/64 base-compat-lib @@ -76,7 +76,7 @@ ./usr/lib/64/libcrypt.so.1 base-compat-shlib compat,pic ./usr/lib/64/libcrypt.so.1.0 base-compat-shlib compat,pic ./usr/lib/64/libcrypto.so.8 base-compat-shlib compat,pic,crypto -./usr/lib/64/libcrypto.so.8.0 base-compat-shlib compat,pic,crypto +./usr/lib/64/libcrypto.so.8.1 base-compat-shlib compat,pic,crypto ./usr/lib/64/libcrypto_idea.so.7 base-obsolete obsolete ./usr/lib/64/libcrypto_idea.so.7.0 base-obsolete obsolete ./usr/lib/64/libcrypto_mdc2.so.7 base-obsolete obsolete @@ -25
CVS commit: src/external/bsd/openpam/dist/lib
Module Name:src
Committed By: christos
Date: Tue Feb 5 23:47:43 UTC 2013
Modified Files:
src/external/bsd/openpam/dist/lib: openpam_dynamic.c
Log Message:
- dlopen(3) errors should be printed with dlerror(3) so we get the reason the
module link failed, instead of printing "Undefined error 0".
- don't print free'd variable on error, restructure so that we free at the
end and print the consistent name of the path dlopened.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/bsd/openpam/dist/lib/openpam_dynamic.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/openpam/dist/lib/openpam_dynamic.c
diff -u src/external/bsd/openpam/dist/lib/openpam_dynamic.c:1.4 src/external/bsd/openpam/dist/lib/openpam_dynamic.c:1.5
--- src/external/bsd/openpam/dist/lib/openpam_dynamic.c:1.4 Wed Aug 15 02:16:41 2012
+++ src/external/bsd/openpam/dist/lib/openpam_dynamic.c Tue Feb 5 18:47:42 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: openpam_dynamic.c,v 1.4 2012/08/15 06:16:41 christos Exp $ */
+/* $NetBSD: openpam_dynamic.c,v 1.5 2013/02/05 23:47:42 christos Exp $ */
/*-
* Copyright (c) 2002-2003 Networks Associates Technology, Inc.
@@ -63,12 +63,14 @@
*/
static void *
-try_dlopen(const char *modfn)
+try_dlopen(const char *modfn, int *error)
{
-
- if (openpam_check_path_owner_perms(modfn) != 0)
- return (NULL);
- return (dlopen(modfn, RTLD_NOW));
+ if (openpam_check_path_owner_perms(modfn) != 0) {
+ *error = errno;
+ return NULL;
+ }
+ *error = 0;
+ return dlopen(modfn, RTLD_NOW);
}
/*
@@ -82,12 +84,13 @@ openpam_dynamic(const char *path)
{
const pam_module_t *dlmodule;
pam_module_t *module;
- const char *prefix, *epath = path;
+ const char *prefix;
char *vpath;
void *dlh;
int i, serrno;
dlh = NULL;
+ module = NULL;
/* Prepend the standard prefix if not an absolute pathname. */
if (path[0] != '/')
@@ -98,16 +101,18 @@ openpam_dynamic(const char *path)
/* try versioned module first, then unversioned module */
if (asprintf(&vpath, "%s/%s.%d", prefix, path, LIB_MAJ) < 0)
goto err;
- epath = vpath;
- if ((dlh = try_dlopen(vpath)) == NULL && errno == ENOENT) {
+ if ((dlh = try_dlopen(vpath, &serrno)) == NULL && errno == ENOENT) {
*strrchr(vpath, '.') = '\0';
- dlh = try_dlopen(vpath);
+ dlh = try_dlopen(vpath, &serrno);
+ }
+ if (dlh == NULL) {
+ if (serrno == 0)
+ goto dl_err;
+ else {
+ errno = serrno;
+ goto err;
+ }
}
- serrno = errno;
- FREE(vpath);
- errno = serrno;
- if (dlh == NULL)
- goto err;
if ((module = calloc((size_t)1, sizeof *module)) == NULL)
goto buf_err;
if ((module->path = strdup(path)) == NULL)
@@ -119,9 +124,10 @@ openpam_dynamic(const char *path)
(pam_func_t)dlsym(dlh, pam_sm_func_name[i]);
if (module->func[i] == NULL)
openpam_log(PAM_LOG_DEBUG, "%s: %s(): %s",
- path, pam_sm_func_name[i], dlerror());
+ vpath, pam_sm_func_name[i], dlerror());
}
- return (module);
+ free(vpath);
+ return module;
buf_err:
serrno = errno;
if (dlh != NULL)
@@ -130,8 +136,13 @@ buf_err:
errno = serrno;
err:
openpam_log(errno == ENOENT ? PAM_LOG_DEBUG : PAM_LOG_ERROR, "%s: %s",
- epath, strerror(errno));
- return (NULL);
+ vpath, strerror(errno));
+ free(vpath);
+ return NULL;
+dl_err:
+ openpam_log(PAM_LOG_ERROR, "%s: %s", vpath, dlerror());
+ free(vpath);
+ return NULL;
}
/*
CVS commit: src/distrib/sets
Module Name:src
Committed By: christos
Date: Wed Feb 6 01:01:13 UTC 2013
Modified Files:
src/distrib/sets: maketars
Log Message:
Create full sets using mtree from the flists (not just filenames).
To generate a diff of this commit:
cvs rdiff -u -r1.76 -r1.77 src/distrib/sets/maketars
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/maketars
diff -u src/distrib/sets/maketars:1.76 src/distrib/sets/maketars:1.77
--- src/distrib/sets/maketars:1.76 Wed Jan 16 16:11:05 2013
+++ src/distrib/sets/maketars Tue Feb 5 20:01:12 2013
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: maketars,v 1.76 2013/01/16 21:11:05 christos Exp $
+# $NetBSD: maketars,v 1.77 2013/02/06 01:01:12 christos Exp $
#
# Make release tar files for some or all lists. Usage:
# maketars [-b] [-x] [-i installdir] [-a arch] [-m machine] [-s setsdir]
@@ -28,6 +28,7 @@ installdir=
etcdir=
setfilesonly=false
quiet=false
+skipkeys=time,md5,sha1,sha384,sha512,rmd160,cksum
usage()
{
@@ -166,8 +167,8 @@ for setname in ${lists}; do
echo >&2 "makeflist output is empty for ${setname}"
exit 1
fi
+ ${setfilesonly} && msg "Creating ${setlistdir}/set.${setname}"
if [ -n "${metalog}" ]; then
- ${setfilesonly} && msg "Creating ${setlistdir}/set.${setname}"
${AWK} -f "${rundir}/getdirs.awk" "${SDIR}/flist.${setname}" \
> "${SDIR}/flist.${setname}.full" \
|| exit 1
@@ -176,16 +177,15 @@ for setname in ${lists}; do
${AWK} -f "${rundir}/join.awk" \
"${SDIR}/flist.${setname}.full" "${metalog}"
echo "./etc/mtree/set.${setname} type=file mode=0444"
- ) | ${MTREE} -CS -k all -R time -N "${etcdir}" \
+ ) | ${MTREE} -CS -k all -R "${skipkeys}" -N "${etcdir}" \
> "${setlistdir}/set.${setname}" \
|| exit 1
# We deliberately do not add set.${setname} to ${metalog},
# because we depend on it as an input.
- elif ! cmp -s "${SDIR}/flist.${setname}" \
- "${setlistdir}/set.${setname}" >/dev/null 2>&1; then
- rm -f "${setlistdir}/set.${setname}"
- cp "${SDIR}/flist.${setname}" "${setlistdir}/set.${setname}" \
- || exit 1
+ else
+ ${MTREE} -c -p "${DESTDIR}" -k all -R "${skipkeys}" \
+ -O "${SDIR}/flist.${setname}" | ${MTREE} -C -k all > \
+ "${setlistdir}/set.${setname}"
fi
done
if ${setfilesonly}; then # exit after creating the set lists
CVS commit: src/tools/mtree
Module Name:src
Committed By: christos
Date: Wed Feb 6 01:01:48 UTC 2013
Modified Files:
src/tools/mtree: Makefile
Log Message:
Don't create a crippled mtree with no hashes. We have hash support in
libcompat, use it. If that breaks cross-compilation, we'll fix it.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/tools/mtree/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/mtree/Makefile
diff -u src/tools/mtree/Makefile:1.6 src/tools/mtree/Makefile:1.7
--- src/tools/mtree/Makefile:1.6 Thu Aug 25 23:19:14 2005
+++ src/tools/mtree/Makefile Tue Feb 5 20:01:48 2013
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2005/08/26 03:19:14 elad Exp $
+# $NetBSD: Makefile,v 1.7 2013/02/06 01:01:48 christos Exp $
HOSTPROGNAME= ${_TOOL_PREFIX}mtree
HOST_SRCDIR= usr.sbin/mtree
-HOST_CPPFLAGS= -DNO_MD5 -DNO_RMD160 -DNO_SHA1 -DNO_SHA2
+#HOST_CPPFLAGS= -DNO_MD5 -DNO_RMD160 -DNO_SHA1 -DNO_SHA2
.include "${.CURDIR}/../Makefile.host"
CVS commit: src/etc/etc.evbarm
Module Name:src
Committed By: matt
Date: Wed Feb 6 01:31:55 UTC 2013
Modified Files:
src/etc/etc.evbarm: Makefile.inc
Log Message:
build the armv5t, armv6 and armv7 kernels for earm but only the v6 and v7
for earmhf.
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/etc/etc.evbarm/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/etc/etc.evbarm/Makefile.inc
diff -u src/etc/etc.evbarm/Makefile.inc:1.33 src/etc/etc.evbarm/Makefile.inc:1.34
--- src/etc/etc.evbarm/Makefile.inc:1.33 Tue Feb 5 07:34:07 2013
+++ src/etc/etc.evbarm/Makefile.inc Wed Feb 6 01:31:55 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.33 2013/02/05 07:34:07 matt Exp $
+# $NetBSD: Makefile.inc,v 1.34 2013/02/06 01:31:55 matt Exp $
#
# etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets
#
@@ -9,15 +9,19 @@ EVBARM_BOARDS=
.if ${MACHINE_ARCH} == "arm"
# Little endian platforms (armv4 or pre-armv5t)
-EVBARM_BOARDS+= ADI_BRH BCM5301X CP3100 GEMINI GUMSTIX INTEGRATOR \
+EVBARM_BOARDS+= ADI_BRH CP3100 GEMINI GUMSTIX INTEGRATOR \
IQ80310 IQ80321 MINI2440 MV2120 SMDK2410 \
SMDK2800 TEAMASA_NPWR TS7200 TWINTAIL
.endif
.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "earm" \
|| ${MACHINE_ARCH} == "earmhf"
+# Little endian platforms with VFP
+EVBARM_BOARDS+= BCM5301X BEAGLEBOARD BEAGLEBOARDXM BEAGLEBONE TISDP2420
+.endif
+.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "earm"
# Little endian platforms (armv5t+)
-EVBARM_BOARDS+= BEAGLEBOARD OPENRD SHEEVAPLUG TISDP2420
+EVBARM_BOARDS+= OPENRD SHEEVAPLUG
.endif
.if ${MACHINE_ARCH} == "armeb"
CVS commit: src/sys/arch/sparc/dev
Module Name:src
Committed By: macallan
Date: Wed Feb 6 04:06:29 UTC 2013
Modified Files:
src/sys/arch/sparc/dev: sx.c sxreg.h
Log Message:
fix typos, deal with hardware insanity
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/sparc/dev/sx.c \
src/sys/arch/sparc/dev/sxreg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/dev/sx.c
diff -u src/sys/arch/sparc/dev/sx.c:1.1 src/sys/arch/sparc/dev/sx.c:1.2
--- src/sys/arch/sparc/dev/sx.c:1.1 Tue Feb 5 21:52:48 2013
+++ src/sys/arch/sparc/dev/sx.c Wed Feb 6 04:06:29 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sx.c,v 1.1 2013/02/05 21:52:48 macallan Exp $ */
+/* $NetBSD: sx.c,v 1.2 2013/02/06 04:06:29 macallan Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include
-__KERNEL_RCSID(0, "$NetBSD: sx.c,v 1.1 2013/02/05 21:52:48 macallan Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sx.c,v 1.2 2013/02/06 04:06:29 macallan Exp $");
#include "locators.h"
@@ -50,8 +50,6 @@ __KERNEL_RCSID(0, "$NetBSD: sx.c,v 1.1 2
#include
#include
-
-
/* autoconfiguration driver */
static int sx_match(device_t, struct cfdata *, void *);
static void sx_attach(device_t, device_t, void *);
@@ -111,11 +109,11 @@ sx_attach(device_t parent, device_t self
sx_write(sc, SX_CONTROL_STATUS, SX_PB | SX_GO);
#ifdef SX_DEBUG
- sta(0xfc00, ASI_SX, SX_LD(8, 31));
+ sta(0xfc00, ASI_SX, SX_LD(8, 31, 0));
for (i = 1; i < 60; i++)
- sta(0xfc00 + (i * 1280), ASI_SX, SX_ST(8, 31));
+ sta(0xfc00 + (i * 1280), ASI_SX, SX_ST(8, 31, 0));
for (i = 900; i < 1000; i++)
- sta(0xfc00 + (i * 1280) + 600, ASI_SX, SX_ST(0, 31));
+ sta(0xfc00 + (i * 1280) + 600, ASI_SX, SX_ST(0, 31, 0));
for (i = 0; i < 0x30; i+= 16) {
printf("%08x:", i);
Index: src/sys/arch/sparc/dev/sxreg.h
diff -u src/sys/arch/sparc/dev/sxreg.h:1.1 src/sys/arch/sparc/dev/sxreg.h:1.2
--- src/sys/arch/sparc/dev/sxreg.h:1.1 Tue Feb 5 21:52:48 2013
+++ src/sys/arch/sparc/dev/sxreg.h Wed Feb 6 04:06:29 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sxreg.h,v 1.1 2013/02/05 21:52:48 macallan Exp $ */
+/* $NetBSD: sxreg.h,v 1.2 2013/02/06 04:06:29 macallan Exp $ */
/*-
* Copyright (c) 2013 The NetBSD Foundation, Inc.
@@ -53,6 +53,12 @@
/* write registers via pseudo instructions */
#define SX_QUEUED_R0 0x0300
#define SX_QUEUED_R1 0x0304 /* and so on until R127 */
+#define SX_QUEUED(r) (0x300 + (r << 2))
+
+/* special purpose registers */
+#define R_ZERO 0
+#define R_SCAM 1
+#define R_MASK 2 /* bitmask for SX_STORE_SELECT */
/*
* registers are repeated at 0x1000 with certain parts read only
@@ -99,7 +105,7 @@
#define SX_STORE_COND (0x4 << 19) /* conditional write with mask */
#define SX_STORE_CLAMP (0x2 << 19)
#define SX_STORE_MASK (0x1 << 19) /* apply plane mask */
-#define SX_STORE_SELECT (0x9 << 19) /* expand with plane reg dest[0]/dest[1] */
+#define SX_STORE_SELECT (0x8 << 19) /* expand with plane reg dest[0]/dest[1] */
#define SX_LOAD (0xa << 19)
#define SX_STORE (0x0 << 19)
@@ -138,13 +144,21 @@
#define SX_PACKED (0x1f << 14)
-#define SX_LD(dreg, cnt) (0x8000 | (cnt << 23) | SX_STORE | SX_LONG | (dreg << 7))
-#define SX_LDB(dreg, cnt) (0x8000 | (cnt << 23) | SX_STORE | SX_UBYTE_0 | (dreg << 7))
-#define SX_LDP(dreg, cnt) (0x8000 | (cnt << 23) | SX_STORE | SX_PACKED | (dreg << 7))
-#define SX_ST(sreg, cnt) (0x8000 | (cnt << 23) | SX_LOAD | SX_LONG | (sreg << 7))
-#define SX_STB(sreg, cnt) (0x8000 | (cnt << 23) | SX_LOAD | SX_UBYTE_0 | (sreg << 7))
-#define SX_STP(sreg, cnt) (0x8000 | (cnt << 23) | SX_LOAD | SX_PACKED | (sreg << 7))
-#define SX_STS(sreg, cnt) (0x8000 | (cnt << 23) | SX_STORE_SELECT | SX_LONG | (sreg << 7))
-#define SX_STBS(reg, cnt) (0x8000 | (cnt << 23) | SX_STORE_SELECT | SX_UBYTE_0 | (reg << 7))
+#define SX_LD(dreg, cnt, o) (0x8000 | ((cnt) << 23) | SX_LOAD | \
+SX_LONG | (dreg << 7) | (o))
+#define SX_LDB(dreg, cnt, o) (0x8000 | ((cnt) << 23) | SX_LOAD | \
+SX_UBYTE_0 | (dreg << 7) | (o))
+#define SX_LDP(dreg, cnt, o) (0x8000 | ((cnt) << 23) | SX_LOAD | \
+SX_PACKED | (dreg << 7) | (o))
+#define SX_ST(sreg, cnt, o) (0x8000 | ((cnt) << 23) | SX_STORE | \
+SX_LONG | (sreg << 7) | (o))
+#define SX_STB(sreg, cnt, o) (0x8000 | ((cnt) << 23) | SX_STORE | \
+SX_UBYTE_0 | (sreg << 7) | (o))
+#define SX_STP(sreg, cnt, o) (0x8000 | ((cnt) << 23) | SX_STORE | \
+SX_PACKED | (sreg << 7) | (o))
+#define SX_STS(sreg, cnt, o) (0x8000 | ((cnt) << 23) | SX_STORE_SELECT \
+| SX_LONG | (sreg << 7) | (o))
+#define SX_STBS(reg, cnt, o) (0x8000 | ((cnt) << 23) | SX_STORE_SELECT \
+| SX_UBYTE_0 | (reg << 7) | (o))
#endif /* SXREG_H */
CVS commit: src/sys/arch/sparc/dev
Module Name:src
Committed By: macallan
Date: Wed Feb 6 04:10:55 UTC 2013
Modified Files:
src/sys/arch/sparc/dev: cgfourteen.c cgfourteenvar.h
Log Message:
use SX for basic hardware acceleration
not quite complete yet but good enough to be useful
missing things include:
- backwards blits
- ROP support
- the cursor is still drawn by software
To generate a diff of this commit:
cvs rdiff -u -r1.69 -r1.70 src/sys/arch/sparc/dev/cgfourteen.c
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/sparc/dev/cgfourteenvar.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/sparc/dev/cgfourteen.c
diff -u src/sys/arch/sparc/dev/cgfourteen.c:1.69 src/sys/arch/sparc/dev/cgfourteen.c:1.70
--- src/sys/arch/sparc/dev/cgfourteen.c:1.69 Tue Feb 5 21:45:39 2013
+++ src/sys/arch/sparc/dev/cgfourteen.c Wed Feb 6 04:10:54 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: cgfourteen.c,v 1.69 2013/02/05 21:45:39 macallan Exp $ */
+/* $NetBSD: cgfourteen.c,v 1.70 2013/02/06 04:10:54 macallan Exp $ */
/*
* Copyright (c) 1996
@@ -53,8 +53,6 @@
/*
* Driver for Campus-II on-board mbus-based video (cgfourteen).
- * Provides minimum emulation of a Sun cgthree 8-bit framebuffer to
- * allow X to run.
*
* Does not handle interrupts, even though they can occur.
*
@@ -68,6 +66,9 @@
*/
#undef CG14_MAP_REGS
+#include "opt_wsemul.h"
+#include "sx.h"
+
#include
#include
#include
@@ -96,10 +97,11 @@
#include
+#include
#include
#include
-
-#include "opt_wsemul.h"
+#include
+#include
/* autoconfiguration driver */
static int cgfourteenmatch(device_t, struct cfdata *, void *);
@@ -145,6 +147,23 @@ static void cg14_set_depth(struct cgfour
static void cg14_move_cursor(struct cgfourteen_softc *, int, int);
static int cg14_do_cursor(struct cgfourteen_softc *,
struct wsdisplay_cursor *);
+
+#if NSX > 0
+static void cg14_wait_idle(struct cgfourteen_softc *);
+static void cg14_rectfill(struct cgfourteen_softc *, int, int, int, int, uint32_t);
+static void cg14_bitblt(void *, int, int, int, int, int, int, int);
+
+#if 0
+static void cg14_cursor(void *, int, int, int);
+static void cg14_putchar_aa(void *, int, int, u_int, long);
+#endif
+static void cg14_putchar(void *, int, int, u_int, long);
+static void cg14_copycols(void *, int, int, int, int);
+static void cg14_erasecols(void *, int, int, int, long);
+static void cg14_copyrows(void *, int, int, int);
+static void cg14_eraserows(void *, int, int, long);
+#endif /* NSX > 0 */
+
#endif
/*
@@ -212,6 +231,10 @@ cgfourteenattach(device_t parent, device
int i, isconsole, items;
uint32_t fbva[2] = {0, 0};
uint32_t *ptr = fbva;
+#if NSX > 0
+ device_t dv;
+ deviter_t di;
+#endif
sc->sc_dev = self;
sc->sc_opens = 0;
@@ -320,6 +343,32 @@ cgfourteenattach(device_t parent, device
printf("\n");
sc->sc_depth = 8;
+
+#if NSX > 0
+ /* see if we've got an SX to help us */
+ sc->sc_sx = NULL;
+ for (dv = deviter_first(&di, DEVITER_F_ROOT_FIRST);
+ dv != NULL;
+ dv = deviter_next(&di)) {
+ if (device_is_a(dv, "sx")) {
+ sc->sc_sx = device_private(dv);
+ }
+ }
+ deviter_release(&di);
+ if (sc->sc_sx != NULL) {
+ sc->sc_fb_paddr = bus_space_mmap(sc->sc_bustag,
+ sc->sc_fbaddr, 0, 0, 0) & 0xf000;
+ aprint_normal_dev(sc->sc_dev, "using %s\n",
+ device_xname(sc->sc_sx->sc_dev));
+ aprint_normal_dev(sc->sc_dev, "fb paddr: %08x\n",
+ sc->sc_fb_paddr);
+#if 0
+ sx_write(sc->sc_sx, SX_PAGE_BOUND_LOWER, sc->sc_fb_paddr);
+ sx_write(sc->sc_sx, SX_PAGE_BOUND_UPPER,
+ sc->sc_fb_paddr + 0x03ff);
+#endif
+ }
+#endif
cg14_setup_wsdisplay(sc, isconsole);
#endif
@@ -962,6 +1011,9 @@ cg14_init_screen(void *cookie, struct vc
ri->ri_flg = RI_CENTER | RI_FULLCLEAR;
ri->ri_bits = (char *)sc->sc_fb.fb_pixels;
+#if NSX > 0
+ if (sc->sc_sx == NULL)
+#endif
scr->scr_flags |= VCONS_DONT_READ;
if (existing) {
@@ -976,6 +1028,21 @@ cg14_init_screen(void *cookie, struct vc
sc->sc_fb.fb_type.fb_width / ri->ri_font->fontwidth);
ri->ri_hw = scr;
+#if NSX > 0
+ if (sc->sc_sx != NULL) {
+ ri->ri_ops.copyrows = cg14_copyrows;
+ ri->ri_ops.copycols = cg14_copycols;
+ ri->ri_ops.eraserows = cg14_eraserows;
+ ri->ri_ops.erasecols = cg14_erasecols;
+#if 0
+ ri->ri_ops.cursor = cg14_cursor;
+ if (FONT_IS_ALPHA(ri->ri_font)) {
+ ri->ri_ops.putchar = cg14_putchar_aa;
+ } else
+#endif
+ ri->ri_ops.putchar = cg14_putchar;
+ }
+#endif /* NSX > 0 */
}
static void
@@ -1104,4 +1171,405 @@ cg14_do_cursor(struct cgfourteen_softc *
}
return 0;
}
+
+#if NSX > 0
+
+static void
+cg14_wait_idle(struct cgfourteen_softc *sc)
+{
+}
+
+static void
+cg14_rectfill(struct cgfourteen_softc *sc, int x, int y, int wi, int he,
+ uint32_t colour)
+{
+ uint32_t addr, pptr;
+ int line, cnt;
+ int stride = sc->sc_fb.fb_type.fb_width;
+
+ addr = sc->sc_fb_paddr + x + stride * y;
+ sx_write(sc->sc_sx, SX_
CVS commit: src/sys/lib/libkern/arch/arm
Module Name:src
Committed By: matt
Date: Wed Feb 6 07:18:17 UTC 2013
Modified Files:
src/sys/lib/libkern/arch/arm: Makefile.inc
Log Message:
Modify earm rule to match any machine_arch starting with earm.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/lib/libkern/arch/arm/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/lib/libkern/arch/arm/Makefile.inc
diff -u src/sys/lib/libkern/arch/arm/Makefile.inc:1.14 src/sys/lib/libkern/arch/arm/Makefile.inc:1.15
--- src/sys/lib/libkern/arch/arm/Makefile.inc:1.14 Wed Jan 23 22:34:37 2013
+++ src/sys/lib/libkern/arch/arm/Makefile.inc Wed Feb 6 07:18:15 2013
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile.inc,v 1.14 2013/01/23 22:34:37 matt Exp $
+# $NetBSD: Makefile.inc,v 1.15 2013/02/06 07:18:15 matt Exp $
SRCS+= byte_swap_2.S byte_swap_4.S
SRCS+= ffs.S
SRCS+= divsi3.S udivsi3.S divide.S clzsi2.S modsi3.S umodsi3.S
SRCS+= memcmp.S memcpy.S memset.S memmove.S strcmp.S strncmp.S
-.if ${MACHINE_ARCH} == "earm" || ${MACHINE_ARCH} == "earmeb"
+.if ${MACHINE_ARCH:Mearm*} != ""
SRCS+= __aeabi_ldivmod.S __aeabi_uldivmod.S __aeabi_lcmp.c __aeabi_ulcmp.c
.endif
CVS commit: src/sys/arch/evbarm/stand
Module Name:src
Committed By: matt
Date: Wed Feb 6 07:19:19 UTC 2013
Modified Files:
src/sys/arch/evbarm/stand/boot2440: Makefile
src/sys/arch/evbarm/stand/bootimx23: Makefile
src/sys/arch/evbarm/stand/gzboot: Makefile.gzboot
Log Message:
gcc will supply -Wa,-eabi=gnu so don't include. Use -mabi=apcs-base, not atpcs
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/arch/evbarm/stand/boot2440/Makefile
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/stand/bootimx23/Makefile
cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/stand/boot2440/Makefile
diff -u src/sys/arch/evbarm/stand/boot2440/Makefile:1.6 src/sys/arch/evbarm/stand/boot2440/Makefile:1.7
--- src/sys/arch/evbarm/stand/boot2440/Makefile:1.6 Tue Feb 5 03:17:50 2013
+++ src/sys/arch/evbarm/stand/boot2440/Makefile Wed Feb 6 07:19:19 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2013/02/05 03:17:50 matt Exp $
+# $NetBSD: Makefile,v 1.7 2013/02/06 07:19:19 matt Exp $
S= ${.CURDIR}/../../../..
@@ -14,8 +14,7 @@ CPPFLAGS+= -D_STANDALONE -DSUPPORT_DHCP
CPPFLAGS+= -DDM9000MAC="0x08,0x08,0x11,0x18,0x12,0x27"
CPPFLAGS+= -DDEFAULT_BOOTFILE="ld0a:netbsd;net:"
CPPFLAGS+= -nostdinc -I. -I${.OBJDIR} -I${S} -I${S}/arch
-CPPFLAGS+= -march=armv4 -mabi=atpcs -mfloat-abi=soft
-CPUFLAGS+= -Wa,-meabi=gnu
+CPPFLAGS+= -march=armv4 -mabi=apcs-gnu -mfloat-abi=soft
DBG=
LIBCRT0= # nothing
Index: src/sys/arch/evbarm/stand/bootimx23/Makefile
diff -u src/sys/arch/evbarm/stand/bootimx23/Makefile:1.3 src/sys/arch/evbarm/stand/bootimx23/Makefile:1.4
--- src/sys/arch/evbarm/stand/bootimx23/Makefile:1.3 Tue Feb 5 07:28:48 2013
+++ src/sys/arch/evbarm/stand/bootimx23/Makefile Wed Feb 6 07:19:19 2013
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 2013/02/05 07:28:48 matt Exp $
+# $Id: Makefile,v 1.4 2013/02/06 07:19:19 matt Exp $
S= ${.CURDIR}/../../../../
PROG= bootimx23
@@ -11,7 +11,7 @@ CLEANFILES+= ${PROG}
CFLAGS+= -Wall -Wno-main -ffreestanding -march=armv5te -mtune=arm926ej-s
CPPFLAGS+= -D_STANDALONE
CPPFLAGS+= -nostdinc -I. -I${.CURDIR} -I${.OBJDIR} -I${S} -I${S}/arch
-CPPFLAGS+= -mabi=atpcs -mfloat-abi=soft -Wa,-meabi=gnu
+CPPFLAGS+= -mabi=apcs-gnu -mfloat-abi=soft
#CPPFLAGS+= -DDEBUG
#DBG= -g
Index: src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot
diff -u src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.21 src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.22
--- src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot:1.21 Tue Feb 5 03:17:51 2013
+++ src/sys/arch/evbarm/stand/gzboot/Makefile.gzboot Wed Feb 6 07:19:19 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.gzboot,v 1.21 2013/02/05 03:17:51 matt Exp $
+# $NetBSD: Makefile.gzboot,v 1.22 2013/02/06 07:19:19 matt Exp $
NOMAN= # defined
@@ -35,7 +35,7 @@ STARTFILE= srtbegin.o
CPPFLAGS+= -nostdinc -I. -I${EVBARM_STAND}/gzboot -I${EVBARM_STAND}/board
CPPFLAGS+= -I${S} -I${S}/arch -I${S}/lib/libsa
CPPFLAGS+= -I${S}/../common/dist/zlib
-CPPFLAGS+= -mabi=atpcs -mfloat-abi=soft -Wa,-meabi=gnu
+CPPFLAGS+= -mabi=apcs-gnu -mfloat-abi=soft
CPPFLAGS+= -D_STANDALONE
