CVS commit: [netbsd-5-2] src/distrib/utils/x_gzip
Module Name:src Committed By: bouyer Date: Mon Mar 16 21:21:08 UTC 2015 Modified Files: src/distrib/utils/x_gzip [netbsd-5-2]: Makefile Log Message: usr.bin/gzip/Makefile patch usr.bin/gzip/gzip.1 1.20-1.24 usr.bin/gzip/gzip.c 1.98-1.107 usr.bin/gzip/zuncompress.c 1.7-1.8 distrib/utils/x_gzip/Makefile patch Sync gzip core with HEAD. [mrg, ticket #1951] To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.7.56.1 src/distrib/utils/x_gzip/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src Committed By: skrll Date: Mon Mar 16 21:21:46 UTC 2015 Modified Files: src/sys/dev/usb [nick-nhusb]: ehci.c Log Message: Correct / improve some usb_syncmem calls. To generate a diff of this commit: cvs rdiff -u -r1.234.2.41 -r1.234.2.42 src/sys/dev/usb/ehci.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Mon Mar 16 21:21:46 UTC 2015
Modified Files:
src/sys/dev/usb [nick-nhusb]: ehci.c
Log Message:
Correct / improve some usb_syncmem calls.
To generate a diff of this commit:
cvs rdiff -u -r1.234.2.41 -r1.234.2.42 src/sys/dev/usb/ehci.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/ehci.c
diff -u src/sys/dev/usb/ehci.c:1.234.2.41 src/sys/dev/usb/ehci.c:1.234.2.42
--- src/sys/dev/usb/ehci.c:1.234.2.41 Sun Mar 15 11:52:47 2015
+++ src/sys/dev/usb/ehci.c Mon Mar 16 21:21:46 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ehci.c,v 1.234.2.41 2015/03/15 11:52:47 skrll Exp $ */
+/* $NetBSD: ehci.c,v 1.234.2.42 2015/03/16 21:21:46 skrll Exp $ */
/*
* Copyright (c) 2004-2012 The NetBSD Foundation, Inc.
@@ -53,7 +53,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.234.2.41 2015/03/15 11:52:47 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: ehci.c,v 1.234.2.42 2015/03/16 21:21:46 skrll Exp $);
#include ohci.h
#include uhci.h
@@ -950,6 +950,9 @@ ehci_check_itd_intr(ehci_softc_t *sc, st
goto done; /* All 8 descriptors inactive, it's done */
}
+ usb_syncmem(itd-dma, itd-offs + offsetof(ehci_itd_t, itd_ctl),
+ sizeof(itd-itd.itd_ctl), BUS_DMASYNC_PREREAD);
+
USBHIST_LOGN(ehcidebug, 10, ex %p itd %p still active, ex,
ex-ex_itdstart, 0, 0);
return;
@@ -988,13 +991,16 @@ ehci_check_sitd_intr(ehci_softc_t *sc, s
* check no active transfers in last sitd, meaning we're finished
*/
- usb_syncmem(sitd-dma, sitd-offs + offsetof(ehci_sitd_t, sitd_buffer),
- sizeof(sitd-sitd.sitd_buffer), BUS_DMASYNC_POSTWRITE |
+ usb_syncmem(sitd-dma, sitd-offs + offsetof(ehci_sitd_t, sitd_trans),
+ sizeof(sitd-sitd.sitd_trans), BUS_DMASYNC_POSTWRITE |
BUS_DMASYNC_POSTREAD);
if (le32toh(sitd-sitd.sitd_trans) EHCI_SITD_ACTIVE)
return;
+ usb_syncmem(sitd-dma, sitd-offs + offsetof(ehci_sitd_t, sitd_trans),
+ sizeof(sitd-sitd.sitd_trans), BUS_DMASYNC_PREREAD);
+
USBHIST_LOGN(ehcidebug, 10, ex=%p done, ex, 0, 0, 0);
callout_stop((ex-ex_xfer.ux_callout));
ehci_idone(ex);
@@ -1079,6 +1085,8 @@ ehci_idone(struct ehci_xfer *ex)
xfer-ux_frlengths[nframes++] = len;
actlen += len;
}
+ usb_syncmem(itd-dma,itd-offs + offsetof(ehci_itd_t,itd_ctl),
+ sizeof(itd-itd.itd_ctl), BUS_DMASYNC_PREREAD);
if (nframes = xfer-ux_nframes)
break;
@@ -1098,8 +1106,8 @@ ehci_idone(struct ehci_xfer *ex)
actlen = 0;
for (sitd = ex-ex_sitdstart; sitd != NULL; sitd = sitd-xfer_next) {
- usb_syncmem(sitd-dma,sitd-offs + offsetof(ehci_sitd_t, sitd_buffer),
- sizeof(sitd-sitd.sitd_buffer), BUS_DMASYNC_POSTWRITE |
+ usb_syncmem(sitd-dma, sitd-offs + offsetof(ehci_sitd_t, sitd_trans),
+ sizeof(sitd-sitd.sitd_trans), BUS_DMASYNC_POSTWRITE |
BUS_DMASYNC_POSTREAD);
/*
@@ -1113,6 +1121,9 @@ ehci_idone(struct ehci_xfer *ex)
break;
status = le32toh(sitd-sitd.sitd_trans);
+ usb_syncmem(sitd-dma, sitd-offs + offsetof(ehci_sitd_t, sitd_trans),
+ sizeof(sitd-sitd.sitd_trans), BUS_DMASYNC_PREREAD);
+
len = EHCI_SITD_GET_LEN(status);
if (status (EHCI_SITD_ERR|EHCI_SITD_BUFERR|
EHCI_SITD_BABBLE|EHCI_SITD_XACTERR|EHCI_SITD_MISS)) {
@@ -1153,6 +1164,8 @@ ehci_idone(struct ehci_xfer *ex)
usb_syncmem(sqtd-dma, sqtd-offs, sizeof(sqtd-qtd),
BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
nstatus = le32toh(sqtd-qtd.qtd_status);
+ usb_syncmem(sqtd-dma, sqtd-offs, sizeof(sqtd-qtd),
+ BUS_DMASYNC_PREREAD);
if (nstatus EHCI_QTD_ACTIVE)
break;
@@ -3227,6 +3240,10 @@ ehci_abort_xfer(usbd_xfer_handle xfer, u
BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
} else {
USBHIST_LOG(ehcidebug, no hit, 0, 0, 0, 0);
+ usb_syncmem(sqh-dma,
+ sqh-offs + offsetof(ehci_qh_t, qh_curqtd),
+ sizeof(sqh-qh.qh_curqtd),
+ BUS_DMASYNC_PREREAD);
}
/*
@@ -4233,11 +4250,18 @@ ehci_device_fs_isoc_start(usbd_xfer_hand
sitd-sitd.sitd_sched = htole32(EHCI_SITD_SET_SMASK(sa) |
EHCI_SITD_SET_CMASK(sb));
+ usb_syncmem(sitd-dma, sitd-offs, sizeof(ehci_sitd_t),
+ BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
+
prev = sitd;
} /* End of frame */
sitd-sitd.sitd_trans |= htole32(EHCI_SITD_IOC);
+ usb_syncmem(sitd-dma, sitd-offs + offsetof(ehci_sitd_t, sitd_trans),
+ sizeof(sitd-sitd.sitd_trans),
+ BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD);
+
stop = sitd;
stop-xfer_next = NULL;
@@ -4273,6 +4297,11 @@ ehci_device_fs_isoc_start(usbd_xfer_hand
if (sitd == NULL)
panic(ehci: unexpectedly ran out of isoc sitds\n);
+ usb_syncmem(sc-sc_fldma,
+ sizeof(ehci_link_t) * frindex,
+ sizeof(ehci_link_t),
+ BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD);
+
sitd-sitd.sitd_next = sc-sc_flist[frindex];
if (sitd-sitd.sitd_next == 0)
/* FIXME: frindex table gets initialized to NULL
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: bouyer Date: Mon Mar 16 21:22:43 UTC 2015 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: complete list for ticket #1951 To generate a diff of this commit: cvs rdiff -u -r1.1.2.102 -r1.1.2.103 src/doc/CHANGES-5.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.3 diff -u src/doc/CHANGES-5.3:1.1.2.102 src/doc/CHANGES-5.3:1.1.2.103 --- src/doc/CHANGES-5.3:1.1.2.102 Sun Mar 15 21:18:04 2015 +++ src/doc/CHANGES-5.3 Mon Mar 16 21:22:43 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.3,v 1.1.2.102 2015/03/15 21:18:04 snj Exp $ +# $NetBSD: CHANGES-5.3,v 1.1.2.103 2015/03/16 21:22:43 bouyer Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3 release: @@ -3754,6 +3754,7 @@ usr.bin/gzip/Makefilepatch usr.bin/gzip/gzip.11.20-1.24 usr.bin/gzip/gzip.c1.98-1.107 usr.bin/gzip/zuncompress.c 1.7-1.8 +distrib/utils/x_gzip/Makefile patch Sync gzip core with HEAD. [mrg, ticket #1951]
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: bouyer Date: Mon Mar 16 21:22:43 UTC 2015 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: complete list for ticket #1951 To generate a diff of this commit: cvs rdiff -u -r1.1.2.102 -r1.1.2.103 src/doc/CHANGES-5.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/share/mk
Module Name:src
Committed By: mrg
Date: Tue Mar 17 01:58:29 UTC 2015
Modified Files:
src/share/mk: bsd.README
Log Message:
fix the description of MKX11RADEONKMS, as pointed out in PR#49753.
To generate a diff of this commit:
cvs rdiff -u -r1.338 -r1.339 src/share/mk/bsd.README
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/share/mk/bsd.README
diff -u src/share/mk/bsd.README:1.338 src/share/mk/bsd.README:1.339
--- src/share/mk/bsd.README:1.338 Sun Mar 1 07:46:04 2015
+++ src/share/mk/bsd.README Tue Mar 17 01:58:29 2015
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.README,v 1.338 2015/03/01 07:46:04 mrg Exp $
+# $NetBSD: bsd.README,v 1.339 2015/03/17 01:58:29 mrg Exp $
# @(#)bsd.README 8.2 (Berkeley) 4/2/94
This is the README file for the make include files for the NetBSD
@@ -415,7 +415,7 @@ MKX11MOTIF: If yes and ${X11FLAVOUR} i
MKX11RADEONKMS If no, build the xf86-video-ati 6.x driver (the last one
with user-mode switching support), otherwise build the
kernek-mode switching (KMS) requiring driver.
- Default: yes on i386 and amd64, yes elsewhere.
+ Default: yes on i386 and amd64, no elsewhere.
MKYP If no, disables building of YP (NIS)
infrastructure (libraries and support programs).
CVS commit: src/share/mk
Module Name:src Committed By: mrg Date: Tue Mar 17 01:58:29 UTC 2015 Modified Files: src/share/mk: bsd.README Log Message: fix the description of MKX11RADEONKMS, as pointed out in PR#49753. To generate a diff of this commit: cvs rdiff -u -r1.338 -r1.339 src/share/mk/bsd.README Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm
Module Name:src Committed By: christos Date: Mon Mar 16 20:32:08 UTC 2015 Modified Files: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: crypto.inc Log Message: one more strike to the whack-a-mole game of arm flavors. To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm
Module Name:src
Committed By: christos
Date: Mon Mar 16 20:32:08 UTC 2015
Modified Files:
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm: crypto.inc
Log Message:
one more strike to the whack-a-mole game of arm flavors.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc
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/arm/crypto.inc
diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.4 src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.5
--- src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc:1.4 Sun Mar 15 14:58:09 2015
+++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/arm/crypto.inc Mon Mar 16 16:32:08 2015
@@ -3,7 +3,7 @@ CPUID_SRCS = armv4cpuid.S armcap.c armv4
CPUID = yes
CPPFLAGS += -DOPENSSL_BN_ASM_MONT -DOPENSSL_BN_ASM_GF2m
.if ${MACHINE_ARCH:M*armv4*} ==
-. if ${MACHINE_ARCH} == earmeb
+. if ${MACHINE_ARCH} == earmeb || ${MACHINE_ARCH} == earmhfeb
CPPFLAGS += -D__ARM_MAX_ARCH__=5
. else
CPPFLAGS += -D__ARM_MAX_ARCH__=8
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src Committed By: skrll Date: Mon Mar 16 16:38:27 UTC 2015 Modified Files: src/sys/dev/usb [nick-nhusb]: ehcireg.h Log Message: Fix the part of the no functional change that was and shouldn't have been. EHCI_ITD_[GS]ET_BPTR were wrong. To generate a diff of this commit: cvs rdiff -u -r1.34.14.6 -r1.34.14.7 src/sys/dev/usb/ehcireg.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tests/crypto/opencrypto
Module Name:src
Committed By: prlw1
Date: Mon Mar 16 16:42:27 UTC 2015
Modified Files:
src/tests/crypto/opencrypto: t_opencrypto.sh
Log Message:
correct test name
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/crypto/opencrypto/t_opencrypto.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/crypto/opencrypto/t_opencrypto.sh
diff -u src/tests/crypto/opencrypto/t_opencrypto.sh:1.4 src/tests/crypto/opencrypto/t_opencrypto.sh:1.5
--- src/tests/crypto/opencrypto/t_opencrypto.sh:1.4 Sat Jan 18 15:15:16 2014
+++ src/tests/crypto/opencrypto/t_opencrypto.sh Mon Mar 16 16:42:27 2015
@@ -1,4 +1,4 @@
-# $NetBSD: t_opencrypto.sh,v 1.4 2014/01/18 15:15:16 pgoyette Exp $
+# $NetBSD: t_opencrypto.sh,v 1.5 2015/03/16 16:42:27 prlw1 Exp $
#
# Copyright (c) 2014 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -98,7 +98,7 @@ camellia_cleanup() {
atf_test_case cbcdes cleanup
cbcdes_head() {
- common_head Test ARC4 crypto
+ common_head Test DES_CBC crypto
}
cbcdes_body() {
CVS commit: src/tests/crypto/opencrypto
Module Name:src Committed By: prlw1 Date: Mon Mar 16 16:42:27 UTC 2015 Modified Files: src/tests/crypto/opencrypto: t_opencrypto.sh Log Message: correct test name To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/tests/crypto/opencrypto/t_opencrypto.sh Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [nick-nhusb] src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Mon Mar 16 16:38:27 UTC 2015
Modified Files:
src/sys/dev/usb [nick-nhusb]: ehcireg.h
Log Message:
Fix the part of the no functional change that was and shouldn't have
been.
EHCI_ITD_[GS]ET_BPTR were wrong.
To generate a diff of this commit:
cvs rdiff -u -r1.34.14.6 -r1.34.14.7 src/sys/dev/usb/ehcireg.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/dev/usb/ehcireg.h
diff -u src/sys/dev/usb/ehcireg.h:1.34.14.6 src/sys/dev/usb/ehcireg.h:1.34.14.7
--- src/sys/dev/usb/ehcireg.h:1.34.14.6 Tue Mar 3 10:06:01 2015
+++ src/sys/dev/usb/ehcireg.h Mon Mar 16 16:38:27 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: ehcireg.h,v 1.34.14.6 2015/03/03 10:06:01 skrll Exp $ */
+/* $NetBSD: ehcireg.h,v 1.34.14.7 2015/03/16 16:38:27 skrll Exp $ */
/*
* Copyright (c) 2001, 2004 The NetBSD Foundation, Inc.
@@ -236,8 +236,8 @@ typedef struct {
#define EHCI_ITD_SET_OFFS(x) __SHIFTIN((x), EHCI_ITD_OFFSET_MASK)
volatile ehci_isoc_bufr_ptr_t itd_bufr[EHCI_ITD_NBUFFERS];
#define EHCI_ITD_BPTR_MASK __BITS(31,12)
-#define EHCI_ITD_GET_BPTR(x) __SHIFTOUT((x), EHCI_ITD_BPTR_MASK)
-#define EHCI_ITD_SET_BPTR(x) __SHIFTIN((x), EHCI_ITD_BPTR_MASK)
+#define EHCI_ITD_GET_BPTR(x) ((x) EHCI_ITD_BPTR_MASK)
+#define EHCI_ITD_SET_BPTR(x) ((x) EHCI_ITD_BPTR_MASK)
#define EHCI_ITD_EP_MASK __BITS(11,8)
#define EHCI_ITD_GET_EP(x) __SHIFTOUT((x), EHCI_ITD_EP_MASK)
#define EHCI_ITD_SET_EP(x) __SHIFTIN((x), EHCI_ITD_EP_MASK)
CVS commit: [netbsd-5-2] src/doc
Module Name:src Committed By: bouyer Date: Mon Mar 16 21:21:51 UTC 2015 Modified Files: src/doc [netbsd-5-2]: CHANGES-5.2.4 Log Message: complete list for ticket #1951 To generate a diff of this commit: cvs rdiff -u -r1.1.2.19 -r1.1.2.20 src/doc/CHANGES-5.2.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.2.4 diff -u src/doc/CHANGES-5.2.4:1.1.2.19 src/doc/CHANGES-5.2.4:1.1.2.20 --- src/doc/CHANGES-5.2.4:1.1.2.19 Sun Mar 15 21:17:27 2015 +++ src/doc/CHANGES-5.2.4 Mon Mar 16 21:21:50 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2.4,v 1.1.2.19 2015/03/15 21:17:27 snj Exp $ +# $NetBSD: CHANGES-5.2.4,v 1.1.2.20 2015/03/16 21:21:50 bouyer Exp $ A complete list of changes from the NetBSD 5.2.3 release to the NetBSD 5.2.4 release: @@ -2551,6 +2551,7 @@ usr.bin/gzip/Makefilepatch usr.bin/gzip/gzip.11.20-1.24 usr.bin/gzip/gzip.c1.98-1.107 usr.bin/gzip/zuncompress.c 1.7-1.8 +distrib/utils/x_gzip/Makefile patch Sync gzip core with HEAD. [mrg, ticket #1951]
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: bouyer Date: Mon Mar 16 21:22:18 UTC 2015 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.6 Log Message: complete list for ticket #1951 To generate a diff of this commit: cvs rdiff -u -r1.1.2.18 -r1.1.2.19 src/doc/CHANGES-5.1.6 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/doc/CHANGES-5.1.6 diff -u src/doc/CHANGES-5.1.6:1.1.2.18 src/doc/CHANGES-5.1.6:1.1.2.19 --- src/doc/CHANGES-5.1.6:1.1.2.18 Sun Mar 15 21:17:44 2015 +++ src/doc/CHANGES-5.1.6 Mon Mar 16 21:22:17 2015 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.6,v 1.1.2.18 2015/03/15 21:17:44 snj Exp $ +# $NetBSD: CHANGES-5.1.6,v 1.1.2.19 2015/03/16 21:22:17 bouyer Exp $ A complete list of changes from the NetBSD 5.1.5 release to the NetBSD 5.1.6 release: @@ -2551,6 +2551,7 @@ usr.bin/gzip/Makefilepatch usr.bin/gzip/gzip.11.20-1.24 usr.bin/gzip/gzip.c1.98-1.107 usr.bin/gzip/zuncompress.c 1.7-1.8 +distrib/utils/x_gzip/Makefile patch Sync gzip core with HEAD. [mrg, ticket #1951]
CVS commit: [netbsd-5-2] src/distrib/utils/x_gzip
Module Name:src
Committed By: bouyer
Date: Mon Mar 16 21:21:08 UTC 2015
Modified Files:
src/distrib/utils/x_gzip [netbsd-5-2]: Makefile
Log Message:
usr.bin/gzip/Makefile patch
usr.bin/gzip/gzip.1 1.20-1.24
usr.bin/gzip/gzip.c 1.98-1.107
usr.bin/gzip/zuncompress.c 1.7-1.8
distrib/utils/x_gzip/Makefile patch
Sync gzip core with HEAD.
[mrg, ticket #1951]
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.56.1 src/distrib/utils/x_gzip/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/x_gzip/Makefile
diff -u src/distrib/utils/x_gzip/Makefile:1.7 src/distrib/utils/x_gzip/Makefile:1.7.56.1
--- src/distrib/utils/x_gzip/Makefile:1.7 Sun Mar 28 04:10:43 2004
+++ src/distrib/utils/x_gzip/Makefile Mon Mar 16 21:21:08 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/03/28 04:10:43 mrg Exp $
+# $NetBSD: Makefile,v 1.7.56.1 2015/03/16 21:21:08 bouyer Exp $
# Build a tiny limited gzip (i.e. for tiny boot media)
SRCDIR= ${.CURDIR}/../../../usr.bin/gzip
@@ -6,7 +6,7 @@ SRCDIR= ${.CURDIR}/../../../usr.
PROG= gzip
NOMAN= # defined
-CPPFLAGS+= -DSMALL -DNO_BZIP2_SUPPORT -DNO_COMPRESS_SUPPORT
+CPPFLAGS+= -DSMALL -DNO_BZIP2_SUPPORT -DNO_COMPRESS_SUPPORT -DNO_XZ_SUPPORT
DPADD= ${LIBZ}
LDADD= -lz
CVS commit: [netbsd-5-2] src/doc
Module Name:src Committed By: bouyer Date: Mon Mar 16 21:21:51 UTC 2015 Modified Files: src/doc [netbsd-5-2]: CHANGES-5.2.4 Log Message: complete list for ticket #1951 To generate a diff of this commit: cvs rdiff -u -r1.1.2.19 -r1.1.2.20 src/doc/CHANGES-5.2.4 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5-1] src/distrib/utils/x_gzip
Module Name:src
Committed By: bouyer
Date: Mon Mar 16 21:20:42 UTC 2015
Modified Files:
src/distrib/utils/x_gzip [netbsd-5-1]: Makefile
Log Message:
usr.bin/gzip/Makefile patch
usr.bin/gzip/gzip.1 1.20-1.24
usr.bin/gzip/gzip.c 1.98-1.107
usr.bin/gzip/zuncompress.c 1.7-1.8
distrib/utils/x_gzip/Makefile patch
Sync gzip core with HEAD.
[mrg, ticket #1951]
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.48.1 src/distrib/utils/x_gzip/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/x_gzip/Makefile
diff -u src/distrib/utils/x_gzip/Makefile:1.7 src/distrib/utils/x_gzip/Makefile:1.7.48.1
--- src/distrib/utils/x_gzip/Makefile:1.7 Sun Mar 28 04:10:43 2004
+++ src/distrib/utils/x_gzip/Makefile Mon Mar 16 21:20:41 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/03/28 04:10:43 mrg Exp $
+# $NetBSD: Makefile,v 1.7.48.1 2015/03/16 21:20:41 bouyer Exp $
# Build a tiny limited gzip (i.e. for tiny boot media)
SRCDIR= ${.CURDIR}/../../../usr.bin/gzip
@@ -6,7 +6,7 @@ SRCDIR= ${.CURDIR}/../../../usr.
PROG= gzip
NOMAN= # defined
-CPPFLAGS+= -DSMALL -DNO_BZIP2_SUPPORT -DNO_COMPRESS_SUPPORT
+CPPFLAGS+= -DSMALL -DNO_BZIP2_SUPPORT -DNO_COMPRESS_SUPPORT -DNO_XZ_SUPPORT
DPADD= ${LIBZ}
LDADD= -lz
CVS commit: src/sys/arch/arm/amlogic
Module Name:src Committed By: jmcneill Date: Mon Mar 16 21:37:35 UTC 2015 Modified Files: src/sys/arch/arm/amlogic: amlogic_sdhc.c Log Message: sdhc stability improvements To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/amlogic/amlogic_sdhc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/sys/arch/arm/amlogic
Module Name:src
Committed By: jmcneill
Date: Mon Mar 16 21:37:35 UTC 2015
Modified Files:
src/sys/arch/arm/amlogic: amlogic_sdhc.c
Log Message:
sdhc stability improvements
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/arm/amlogic/amlogic_sdhc.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/amlogic/amlogic_sdhc.c
diff -u src/sys/arch/arm/amlogic/amlogic_sdhc.c:1.2 src/sys/arch/arm/amlogic/amlogic_sdhc.c:1.3
--- src/sys/arch/arm/amlogic/amlogic_sdhc.c:1.2 Sun Mar 8 15:38:25 2015
+++ src/sys/arch/arm/amlogic/amlogic_sdhc.c Mon Mar 16 21:37:35 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: amlogic_sdhc.c,v 1.2 2015/03/08 15:38:25 jmcneill Exp $ */
+/* $NetBSD: amlogic_sdhc.c,v 1.3 2015/03/16 21:37:35 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill jmcne...@invisible.ca
@@ -29,7 +29,7 @@
#include locators.h
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: amlogic_sdhc.c,v 1.2 2015/03/08 15:38:25 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: amlogic_sdhc.c,v 1.3 2015/03/16 21:37:35 jmcneill Exp $);
#include sys/param.h
#include sys/bus.h
@@ -430,7 +430,7 @@ static void
amlogic_sdhc_exec_command(sdmmc_chipset_handle_t sch, struct sdmmc_command *cmd)
{
struct amlogic_sdhc_softc *sc = sch;
- uint32_t cmdval = 0, cntl, srst, pdma;
+ uint32_t cmdval = 0, cntl, srst, pdma, ictl;
int i;
KASSERT(cmd-c_blklen = 512);
@@ -446,9 +446,6 @@ amlogic_sdhc_exec_command(sdmmc_chipset_
goto done;
}
- while (SDHC_READ(sc, SD_STAT_REG) __BIT(24))
- delay(10);
-
if (cmd-c_opcode == MMC_STOP_TRANSMISSION)
cmdval |= SD_SEND_DATA_STOP;
if (cmd-c_flags SCF_RSP_PRESENT)
@@ -460,6 +457,12 @@ amlogic_sdhc_exec_command(sdmmc_chipset_
if ((cmd-c_flags SCF_RSP_CRC) == 0)
cmdval |= SD_SEND_RESPONSE_NO_CRC;
+ SDHC_WRITE(sc, SD_ICTL_REG, 0);
+ SDHC_WRITE(sc, SD_ISTA_REG, SD_INT_CLEAR);
+ sc-sc_intr_ista = 0;
+
+ ictl = SD_INT_ERROR;
+
cntl = SDHC_READ(sc, SD_CNTL_REG);
cntl = ~SD_CNTL_PACK_LEN;
if (cmd-c_datalen 0) {
@@ -477,17 +480,26 @@ amlogic_sdhc_exec_command(sdmmc_chipset_
cntl |= __SHIFTIN(cmd-c_blklen 0x1ff, SD_CNTL_PACK_LEN);
cmdval |= __SHIFTIN(nblks - 1, SD_SEND_TOTAL_PACK);
+
+ if (ISSET(cmd-c_flags, SCF_CMD_READ)) {
+ ictl |= SD_INT_DATA_COMPLETE;
+ } else {
+ ictl |= SD_INT_DMA_DONE;
+ }
+ } else {
+ ictl |= SD_INT_RESP_COMPLETE;
}
- SDHC_WRITE(sc, SD_CNTL_REG, cntl);
- SDHC_WRITE(sc, SD_ISTA_REG, SD_INT_CLEAR);
- sc-sc_intr_ista = 0;
- SDHC_WRITE(sc, SD_ICTL_REG,
- SD_INT_ERROR | SD_INT_DATA_COMPLETE | SD_INT_RESP_COMPLETE |
- SD_INT_DMA_DONE);
+ SDHC_WRITE(sc, SD_ICTL_REG, ictl);
+
+ SDHC_WRITE(sc, SD_CNTL_REG, cntl);
pdma = SDHC_READ(sc, SD_PDMA_REG);
- pdma |= SD_PDMA_DMA_MODE;
+ if (cmd-c_datalen 0) {
+ pdma |= SD_PDMA_DMA_MODE;
+ } else {
+ pdma = ~SD_PDMA_DMA_MODE;
+ }
SDHC_WRITE(sc, SD_PDMA_REG, pdma);
SDHC_WRITE(sc, SD_ARGU_REG, cmd-c_arg);
@@ -506,7 +518,19 @@ amlogic_sdhc_exec_command(sdmmc_chipset_
cmd-c_resid = cmd-c_datalen;
SDHC_WRITE(sc, SD_SEND_REG, cmdval | cmd-c_opcode);
- if (cmd-c_flags SCF_RSP_PRESENT) {
+ if (cmd-c_datalen 0) {
+ uint32_t wbit = ISSET(cmd-c_flags, SCF_CMD_READ) ?
+ SD_INT_DATA_COMPLETE : SD_INT_DMA_DONE;
+ cmd-c_error = amlogic_sdhc_wait_ista(sc,
+ SD_INT_ERROR | wbit, hz * 10);
+ if (cmd-c_error == 0
+ (sc-sc_intr_ista SD_INT_ERROR)) {
+ cmd-c_error = ETIMEDOUT;
+ }
+ if (cmd-c_error) {
+ goto done;
+ }
+ } else {
cmd-c_error = amlogic_sdhc_wait_ista(sc,
SD_INT_ERROR | SD_INT_RESP_COMPLETE, hz * 10);
if (cmd-c_error == 0 (sc-sc_intr_ista SD_INT_ERROR)) {
@@ -521,17 +545,7 @@ amlogic_sdhc_exec_command(sdmmc_chipset_
}
}
- if (cmd-c_datalen 0) {
- cmd-c_error = amlogic_sdhc_wait_ista(sc,
- SD_INT_ERROR | SD_INT_DMA_DONE, hz * 10);
- if (cmd-c_error == 0
- (sc-sc_intr_ista SD_INT_ERROR)) {
- cmd-c_error = ETIMEDOUT;
- }
- if (cmd-c_error) {
- goto done;
- }
- }
+ SDHC_WRITE(sc, SD_ISTA_REG, sc-sc_intr_ista);
if (cmd-c_flags SCF_RSP_PRESENT) {
pdma = SDHC_READ(sc, SD_PDMA_REG);
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Mon Mar 16 22:16:42 UTC 2015 Modified Files: src/sys/arch/evbarm/conf: ODROID-C1 Added Files: src/sys/arch/evbarm/conf: ODROID-C1_INSTALL Log Message: add ODROID-C1 install kernel To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/conf/ODROID-C1 cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/conf/ODROID-C1_INSTALL 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/conf/ODROID-C1 diff -u src/sys/arch/evbarm/conf/ODROID-C1:1.8 src/sys/arch/evbarm/conf/ODROID-C1:1.9 --- src/sys/arch/evbarm/conf/ODROID-C1:1.8 Sun Mar 8 12:45:35 2015 +++ src/sys/arch/evbarm/conf/ODROID-C1 Mon Mar 16 22:16:42 2015 @@ -1,5 +1,5 @@ # -# $NetBSD: ODROID-C1,v 1.8 2015/03/08 12:45:35 jmcneill Exp $ +# $NetBSD: ODROID-C1,v 1.9 2015/03/16 22:16:42 jmcneill Exp $ # # Odroid-C1 (Amlogic S805) based SBC (Single Board Computer) # @@ -194,8 +194,7 @@ options CONSADDR=0xc81004c0, CONSPEED=1 amlogicrng0 at amlogicio0 # SDHC controller -amlogicsdhc0 at amlogicio0 port 1 # SD card -#amlogicsdhc0 at amlogicio0 port 2 # EMMC +amlogicsdhc0 at amlogicio0 sdmmc* at amlogicsdhc? ld* at sdmmc? @@ -221,7 +220,7 @@ midi* at midibus? # Pseudo-Devices # disk/mass storage pseudo-devices -pseudo-device md # memory disk device (ramdisk) +#pseudo-device md # memory disk device (ramdisk) pseudo-device vnd # disk-like interface to files #pseudo-device fss # file system snapshot device pseudo-device drvctl # driver control Added files: Index: src/sys/arch/evbarm/conf/ODROID-C1_INSTALL diff -u /dev/null src/sys/arch/evbarm/conf/ODROID-C1_INSTALL:1.1 --- /dev/null Mon Mar 16 22:16:43 2015 +++ src/sys/arch/evbarm/conf/ODROID-C1_INSTALL Mon Mar 16 22:16:42 2015 @@ -0,0 +1,10 @@ +# $NetBSD: ODROID-C1_INSTALL,v 1.1 2015/03/16 22:16:42 jmcneill Exp $ +# +# ODROID-C1_INSTALL -- Hardkernel ODROID-C1 kernel with +# installation-sized ramdisk +# + +include arch/evbarm/conf/ODROID-C1 +include arch/evbarm/conf/INSTALL + +options BOOTHOWTO=RB_SINGLE
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jmcneill Date: Mon Mar 16 22:16:42 UTC 2015 Modified Files: src/sys/arch/evbarm/conf: ODROID-C1 Added Files: src/sys/arch/evbarm/conf: ODROID-C1_INSTALL Log Message: add ODROID-C1 install kernel To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 src/sys/arch/evbarm/conf/ODROID-C1 cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/conf/ODROID-C1_INSTALL Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5-1] src/distrib/utils/x_gzip
Module Name:src Committed By: bouyer Date: Mon Mar 16 21:20:42 UTC 2015 Modified Files: src/distrib/utils/x_gzip [netbsd-5-1]: Makefile Log Message: usr.bin/gzip/Makefile patch usr.bin/gzip/gzip.1 1.20-1.24 usr.bin/gzip/gzip.c 1.98-1.107 usr.bin/gzip/zuncompress.c 1.7-1.8 distrib/utils/x_gzip/Makefile patch Sync gzip core with HEAD. [mrg, ticket #1951] To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.7.48.1 src/distrib/utils/x_gzip/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/distrib/utils/x_gzip
Module Name:src
Committed By: bouyer
Date: Mon Mar 16 21:20:06 UTC 2015
Modified Files:
src/distrib/utils/x_gzip [netbsd-5]: Makefile
Log Message:
usr.bin/gzip/Makefile patch
usr.bin/gzip/gzip.1 1.20-1.24
usr.bin/gzip/gzip.c 1.98-1.107
usr.bin/gzip/zuncompress.c 1.7-1.8
distrib/utils/x_gzip/Makefile patch
Sync gzip core with HEAD.
[mrg, ticket #1951]
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.7.40.1 src/distrib/utils/x_gzip/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/utils/x_gzip/Makefile
diff -u src/distrib/utils/x_gzip/Makefile:1.7 src/distrib/utils/x_gzip/Makefile:1.7.40.1
--- src/distrib/utils/x_gzip/Makefile:1.7 Sun Mar 28 04:10:43 2004
+++ src/distrib/utils/x_gzip/Makefile Mon Mar 16 21:20:06 2015
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/03/28 04:10:43 mrg Exp $
+# $NetBSD: Makefile,v 1.7.40.1 2015/03/16 21:20:06 bouyer Exp $
# Build a tiny limited gzip (i.e. for tiny boot media)
SRCDIR= ${.CURDIR}/../../../usr.bin/gzip
@@ -6,7 +6,7 @@ SRCDIR= ${.CURDIR}/../../../usr.
PROG= gzip
NOMAN= # defined
-CPPFLAGS+= -DSMALL -DNO_BZIP2_SUPPORT -DNO_COMPRESS_SUPPORT
+CPPFLAGS+= -DSMALL -DNO_BZIP2_SUPPORT -DNO_COMPRESS_SUPPORT -DNO_XZ_SUPPORT
DPADD= ${LIBZ}
LDADD= -lz
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: bouyer Date: Mon Mar 16 21:22:18 UTC 2015 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.6 Log Message: complete list for ticket #1951 To generate a diff of this commit: cvs rdiff -u -r1.1.2.18 -r1.1.2.19 src/doc/CHANGES-5.1.6 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-5] src/distrib/utils/x_gzip
Module Name:src Committed By: bouyer Date: Mon Mar 16 21:20:06 UTC 2015 Modified Files: src/distrib/utils/x_gzip [netbsd-5]: Makefile Log Message: usr.bin/gzip/Makefile patch usr.bin/gzip/gzip.1 1.20-1.24 usr.bin/gzip/gzip.c 1.98-1.107 usr.bin/gzip/zuncompress.c 1.7-1.8 distrib/utils/x_gzip/Makefile patch Sync gzip core with HEAD. [mrg, ticket #1951] To generate a diff of this commit: cvs rdiff -u -r1.7 -r1.7.40.1 src/distrib/utils/x_gzip/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/etc/etc.evbarm
Module Name:src Committed By: jmcneill Date: Mon Mar 16 22:18:14 UTC 2015 Modified Files: src/etc/etc.evbarm: Makefile.inc Log Message: hook ODROID-C1 into build To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 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.70 src/etc/etc.evbarm/Makefile.inc:1.71 --- src/etc/etc.evbarm/Makefile.inc:1.70 Fri Mar 6 11:11:55 2015 +++ src/etc/etc.evbarm/Makefile.inc Mon Mar 16 22:18:14 2015 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.inc,v 1.70 2015/03/06 11:11:55 skrll Exp $ +# $NetBSD: Makefile.inc,v 1.71 2015/03/16 22:18:14 jmcneill Exp $ # # etc.evbarm/Makefile.inc -- evbarm-specific etc Makefile targets # @@ -104,6 +104,8 @@ EVBARM_BOARDS.armv7hf+= MIRABOX #EVBARM_BOARDS.armv7+= N900 EVBARM_BOARDS.armv7+= NETWALKER EVBARM_BOARDS.armv7hf+= NETWALKER +EVBARM_BOARDS.armv7+= ODROID-C1 +EVBARM_BOARDS.armv7hf+= ODROID-C1 EVBARM_BOARDS.armv7+= OMAP5EVM EVBARM_BOARDS.armv7hf+= OMAP5EVM EVBARM_BOARDS.armv7+= OVERO
CVS commit: src/etc/etc.evbarm
Module Name:src Committed By: jmcneill Date: Mon Mar 16 22:18:14 UTC 2015 Modified Files: src/etc/etc.evbarm: Makefile.inc Log Message: hook ODROID-C1 into build To generate a diff of this commit: cvs rdiff -u -r1.70 -r1.71 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.
CVS commit: [netbsd-7] src/distrib/sets/lists/tests
Module Name:src Committed By: snj Date: Mon Mar 16 18:59:54 UTC 2015 Modified Files: src/distrib/sets/lists/tests [netbsd-7]: mi Log Message: Pull up following revision(s) (requested by bouyer in ticket #596): distrib/sets/lists/tests/mi: revision 1.604 config(1): Fix test breakage Now config(1) checks the content of $S/conf/Makefile.kern.inc. Install it into config(1) test directory to fix test. Noticed by Martin Husemann. To generate a diff of this commit: cvs rdiff -u -r1.584 -r1.584.2.1 src/distrib/sets/lists/tests/mi Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: [netbsd-7] src/distrib/sets/lists/tests
Module Name:src Committed By: snj Date: Mon Mar 16 18:59:54 UTC 2015 Modified Files: src/distrib/sets/lists/tests [netbsd-7]: mi Log Message: Pull up following revision(s) (requested by bouyer in ticket #596): distrib/sets/lists/tests/mi: revision 1.604 config(1): Fix test breakage Now config(1) checks the content of $S/conf/Makefile.kern.inc. Install it into config(1) test directory to fix test. Noticed by Martin Husemann. To generate a diff of this commit: cvs rdiff -u -r1.584 -r1.584.2.1 src/distrib/sets/lists/tests/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/tests/mi diff -u src/distrib/sets/lists/tests/mi:1.584 src/distrib/sets/lists/tests/mi:1.584.2.1 --- src/distrib/sets/lists/tests/mi:1.584 Sat Aug 9 07:04:03 2014 +++ src/distrib/sets/lists/tests/mi Mon Mar 16 18:59:54 2015 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.584 2014/08/09 07:04:03 gson Exp $ +# $NetBSD: mi,v 1.584.2.1 2015/03/16 18:59:54 snj Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -3373,6 +3373,7 @@ ./usr/tests/usr.bin/config/support/arch/regress/conf/files.regress tests-usr.bin-tests atf ./usr/tests/usr.bin/config/support/arch/regress/conf/std.regress tests-usr.bin-tests atf ./usr/tests/usr.bin/config/support/conf tests-usr.bin-tests +./usr/tests/usr.bin/config/support/conf/Makefile.kern.inc tests-usr.bin-tests atf ./usr/tests/usr.bin/config/support/conf/files tests-usr.bin-tests atf ./usr/tests/usr.bin/config/t_config tests-usr.bin-tests atf ./usr/tests/usr.bin/cuttests-usr.bin-tests
CVS commit: src/usr.bin/sdpquery
Module Name:src Committed By: plunky Date: Mon Mar 16 19:10:48 UTC 2015 Modified Files: src/usr.bin/sdpquery: print.c Log Message: parse and print the HIDLANGIDBaseList attribute To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/usr.bin/sdpquery/print.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/usr.bin/sdpquery
Module Name:src
Committed By: plunky
Date: Mon Mar 16 19:10:48 UTC 2015
Modified Files:
src/usr.bin/sdpquery: print.c
Log Message:
parse and print the HIDLANGIDBaseList attribute
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 src/usr.bin/sdpquery/print.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/sdpquery/print.c
diff -u src/usr.bin/sdpquery/print.c:1.20 src/usr.bin/sdpquery/print.c:1.21
--- src/usr.bin/sdpquery/print.c:1.20 Fri Oct 18 20:47:06 2013
+++ src/usr.bin/sdpquery/print.c Mon Mar 16 19:10:48 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: print.c,v 1.20 2013/10/18 20:47:06 christos Exp $ */
+/* $NetBSD: print.c,v 1.21 2015/03/16 19:10:48 plunky Exp $ */
/*-
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__RCSID($NetBSD: print.c,v 1.20 2013/10/18 20:47:06 christos Exp $);
+__RCSID($NetBSD: print.c,v 1.21 2015/03/16 19:10:48 plunky Exp $);
#include ctype.h
#include iconv.h
@@ -106,6 +106,7 @@ static void print_supported_formats(sdp_
static void print_hid_version(sdp_data_t *);
static void print_hid_device_subclass(sdp_data_t *);
static void print_hid_descriptor_list(sdp_data_t *);
+static void print_hid_langid_base_list(sdp_data_t *);
static void print_security_description(sdp_data_t *);
static void print_hf_features(sdp_data_t *);
static void print_hfag_network(sdp_data_t *);
@@ -297,7 +298,7 @@ attr_t hid_attrs[] = { /* Human Interfac
{ 0x0204, HIDVirtualCable, print_bool },
{ 0x0205, HIDReconnectInitiate, print_bool },
{ 0x0206, HIDDescriptorList, print_hid_descriptor_list },
- { 0x0207, HIDLANGIDBaseList, NULL },
+ { 0x0207, HIDLANGIDBaseList, print_hid_langid_base_list },
{ 0x0208, HIDSDPDisable, print_bool },
{ 0x0209, HIDBatteryPower, print_bool },
{ 0x020a, HIDRemoteWake, print_bool },
@@ -1275,7 +1276,6 @@ print_hid_descriptor_list(sdp_data_t *da
char *str;
size_t len;
-
if (!sdp_get_seq(data, list))
return;
@@ -1301,6 +1301,38 @@ print_hid_descriptor_list(sdp_data_t *da
}
static void
+print_hid_langid_base_list(sdp_data_t *data)
+{
+ sdp_data_t list, seq;
+ uint16_t lang, base;
+
+ if (!sdp_get_seq(data, list))
+ return;
+
+ while (list.next list.end) {
+ if (!sdp_get_seq(list, seq)
+ || !sdp_get_uint16(seq, lang)
+ || !sdp_get_uint16(seq, base))
+ return;
+
+ printf(\n);
+ /*
+ * The language is encoded according to the
+ * Universal Serial Bus Language Identifiers (LANGIDs)
+ * specification. It does not seem worth listing them all
+ * here, but feel free to add if you notice any being used.
+ */
+ switch (lang) {
+ case 0x0409: printf(English (US)); break;
+ case 0x0809: printf(English (UK)); break;
+ default: printf(0x%04x, lang); break;
+ }
+
+ printf( base 0x%04x\n, base);
+ }
+}
+
+static void
print_security_description(sdp_data_t *data)
{
uint16_t v;
