CVS commit: src/sys/dev/usb
Module Name:src
Committed By: skrll
Date: Sat Feb 23 08:22:06 UTC 2013
Modified Files:
src/sys/dev/usb: dwc_otg.c
Log Message:
Consistently use the macros to get softc, dxfer, etc.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/dev/usb/dwc_otg.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/dwc_otg.c
diff -u src/sys/dev/usb/dwc_otg.c:1.46 src/sys/dev/usb/dwc_otg.c:1.47
--- src/sys/dev/usb/dwc_otg.c:1.46 Fri Feb 15 17:07:09 2013
+++ src/sys/dev/usb/dwc_otg.c Sat Feb 23 08:22:05 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: dwc_otg.c,v 1.46 2013/02/15 17:07:09 skrll Exp $ */
+/* $NetBSD: dwc_otg.c,v 1.47 2013/02/23 08:22:05 skrll Exp $ */
/*-
* Copyright (c) 2012 Hans Petter Selasky. All rights reserved.
@@ -60,7 +60,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.46 2013/02/15 17:07:09 skrll Exp $);
+__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.47 2013/02/23 08:22:05 skrll Exp $);
#include sys/param.h
#include sys/systm.h
@@ -118,7 +118,9 @@ int dwc_otgdebug = 0;
#define DWC_OTG_BUS2SC(bus) ((bus)-hci_private)
-#define DWC_OTG_XFER2SC(xfer) DWC_OTG_BUS2SC((xfer)-pipe-device-bus)
+#define DWC_OTG_PIPE2SC(pipe) DWC_OTG_BUS2SC((pipe)-device-bus)
+
+#define DWC_OTG_XFER2SC(xfer) DWC_OTG_PIPE2SC((xfer)-pipe)
#define DWC_OTG_TD2SC(td) DWC_OTG_XFER2SC((td)-xfer)
@@ -129,6 +131,8 @@ int dwc_otgdebug = 0;
#define DWC_OTG_XFER2DPIPE(x) (struct dwc_otg_pipe *)(x)-pipe;
+#define DWC_OTG_PIPE2DPIPE(p) (struct dwc_otg_pipe *)(p)
+
#define usbd_copy_in(d, o, b, s) \
memcpy(((char *)(d) + (o)), (b), (s))
@@ -339,7 +343,7 @@ Static const struct usbd_pipe_methods dw
Static usbd_status
dwc_otg_allocm(struct usbd_bus *bus, usb_dma_t *dma, uint32_t size)
{
- struct dwc_otg_softc *sc = bus-hci_private;
+ struct dwc_otg_softc *sc = DWC_OTG_BUS2SC(bus);
usbd_status status;
status = usb_allocmem(sc-sc_bus, size, 0, dma);
@@ -351,7 +355,7 @@ dwc_otg_allocm(struct usbd_bus *bus, usb
Static void
dwc_otg_freem(struct usbd_bus *bus, usb_dma_t *dma)
{
- struct dwc_otg_softc *sc = bus-hci_private;
+ struct dwc_otg_softc *sc = DWC_OTG_BUS2SC(bus);
DPRINTF(\n);
@@ -365,7 +369,7 @@ dwc_otg_freem(struct usbd_bus *bus, usb_
usbd_xfer_handle
dwc_otg_allocx(struct usbd_bus *bus)
{
- struct dwc_otg_softc *sc = bus-hci_private;
+ struct dwc_otg_softc *sc = DWC_OTG_BUS2SC(bus);
struct dwc_otg_xfer *dxfer;
DPRINTF(\n);
@@ -385,7 +389,7 @@ dwc_otg_allocx(struct usbd_bus *bus)
void
dwc_otg_freex(struct usbd_bus *bus, usbd_xfer_handle xfer)
{
- struct dwc_otg_softc *sc = bus-hci_private;
+ struct dwc_otg_softc *sc = DWC_OTG_BUS2SC(bus);
DPRINTF(\n);
@@ -403,7 +407,7 @@ dwc_otg_freex(struct usbd_bus *bus, usbd
Static void
dwc_otg_get_lock(struct usbd_bus *bus, kmutex_t **lock)
{
- struct dwc_otg_softc *sc = bus-hci_private;
+ struct dwc_otg_softc *sc = DWC_OTG_BUS2SC(bus);
*lock = sc-sc_lock;
}
@@ -412,7 +416,7 @@ Static void
dwc_otg_softintr(void *v)
{
struct usbd_bus *bus = v;
- struct dwc_otg_softc *sc = bus-hci_private;
+ struct dwc_otg_softc *sc = DWC_OTG_BUS2SC(bus);
struct dwc_otg_xfer *dxfer;
KASSERT(sc-sc_bus.use_polling || mutex_owned(sc-sc_lock));
@@ -481,9 +485,9 @@ dwc_otg_waitintr(struct dwc_otg_softc *s
Static void
dwc_otg_timeout(void *addr)
{
- struct dwc_otg_xfer *dxfer = addr;
- struct dwc_otg_pipe *dpipe = (struct dwc_otg_pipe *)dxfer-xfer.pipe;
- struct dwc_otg_softc *sc = dpipe-pipe.device-bus-hci_private;
+ usbd_xfer_handle xfer = addr;
+ struct dwc_otg_xfer *dxfer = DWC_OTG_XFER2DXFER(xfer);
+ struct dwc_otg_softc *sc = DWC_OTG_XFER2SC(xfer);
DPRINTF(dxfer=%p\n, dxfer);
@@ -505,7 +509,7 @@ Static void
dwc_otg_timeout_task(void *addr)
{
usbd_xfer_handle xfer = addr;
- struct dwc_otg_softc *sc = xfer-pipe-device-bus-hci_private;
+ struct dwc_otg_softc *sc = DWC_OTG_XFER2SC(xfer);
DPRINTF(xfer=%p\n, xfer);
@@ -517,9 +521,10 @@ dwc_otg_timeout_task(void *addr)
usbd_status
dwc_otg_open(usbd_pipe_handle pipe)
{
- usbd_device_handle dev = pipe-device;
- struct dwc_otg_softc *sc = dev-bus-hci_private;
+ struct dwc_otg_pipe *dpipe = DWC_OTG_PIPE2DPIPE(pipe);
+ struct dwc_otg_softc *sc = DWC_OTG_DPIPE2SC(dpipe);
usb_endpoint_descriptor_t *ed = pipe-endpoint-edesc;
+ usbd_device_handle dev = pipe-device;
uint8_t addr = dev-address;
uint8_t xfertype = UE_GET_XFERTYPE(ed-bmAttributes);
usbd_status err;
@@ -581,7 +586,7 @@ fail:
Static void
dwc_otg_poll(struct usbd_bus *bus)
{
- struct dwc_otg_softc *sc = bus-hci_private;
+ struct dwc_otg_softc *sc = DWC_OTG_BUS2SC(bus);
KASSERT(sc-sc_bus.use_polling || mutex_owned(sc-sc_lock));
mutex_spin_enter(sc-sc_intr_lock);
@@ -596,8 +601,8 @@ dwc_otg_poll(struct usbd_bus *bus)
Static void
dwc_otg_close_pipe(usbd_pipe_handle pipe)
{
- struct dwc_otg_pipe *dpipe = (struct dwc_otg_pipe *)pipe;
- struct
CVS commit: src/sys/arch/evbarm/ifpga
Module Name:src Committed By: skrll Date: Sat Feb 23 08:23:03 UTC 2013 Modified Files: src/sys/arch/evbarm/ifpga: sm_ifpga.c Log Message: aprintf - aprint_normal To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/ifpga/sm_ifpga.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/evbarm/ifpga/sm_ifpga.c diff -u src/sys/arch/evbarm/ifpga/sm_ifpga.c:1.1 src/sys/arch/evbarm/ifpga/sm_ifpga.c:1.2 --- src/sys/arch/evbarm/ifpga/sm_ifpga.c:1.1 Tue Feb 19 10:57:10 2013 +++ src/sys/arch/evbarm/ifpga/sm_ifpga.c Sat Feb 23 08:23:03 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: sm_ifpga.c,v 1.1 2013/02/19 10:57:10 skrll Exp $ */ +/* $NetBSD: sm_ifpga.c,v 1.2 2013/02/23 08:23:03 skrll Exp $ */ /*- * Copyright (c) 2013 Sergio Lopez s...@sinrega.org @@ -27,7 +27,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: sm_ifpga.c,v 1.1 2013/02/19 10:57:10 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: sm_ifpga.c,v 1.2 2013/02/23 08:23:03 skrll Exp $); #include sys/param.h #include sys/systm.h @@ -92,7 +92,7 @@ sm_ifpga_attach(device_t parent, device_ return; } - printf(\n); + aprint_normal(\n); /* fill in master sc */ sc-sc_dev = self;
CVS commit: src/external/bsd/kyua-cli/dist
Module Name:src Committed By: jmmv Date: Sat Feb 23 12:34:11 UTC 2013 Update of /cvsroot/src/external/bsd/kyua-cli/dist In directory ivanova.netbsd.org:/tmp/cvs-serv16247 Log Message: Initial import of Kyua CLI, version 0.6: This is the main component of Kyua and its build will be guarded by the MKKYUA knob. core@ has approved this import. Description: Kyua (pronounced Q.A.) is a testing framework for both developers and users. Kyua is different from most other testing frameworks in that it puts the end user experience before anything else. There are multiple reasons for users to run the tests themselves, and Kyua ensures that they can do so in the most convenient way. This module, kyua-cli, provides the command-line interface to the Kyua runtime system. The major purpose of this tool is to run test cases and generate unified reports for their results. Status: Vendor Tag: GOOGLE-CODE Release Tags: kyua-cli-0-6 N src/external/bsd/kyua-cli/dist/AUTHORS N src/external/bsd/kyua-cli/dist/COPYING N src/external/bsd/kyua-cli/dist/NEWS N src/external/bsd/kyua-cli/dist/README N src/external/bsd/kyua-cli/dist/main.cpp N src/external/bsd/kyua-cli/dist/Kyuafile N src/external/bsd/kyua-cli/dist/bootstrap/plain_helpers.cpp N src/external/bsd/kyua-cli/dist/bootstrap/atf_helpers.cpp N src/external/bsd/kyua-cli/dist/bootstrap/testsuite N src/external/bsd/kyua-cli/dist/bootstrap/Kyuafile N src/external/bsd/kyua-cli/dist/bootstrap/package.m4 N src/external/bsd/kyua-cli/dist/bootstrap/testsuite.at N src/external/bsd/kyua-cli/dist/cli/cmd_db_migrate.cpp N src/external/bsd/kyua-cli/dist/cli/cmd_about.cpp N src/external/bsd/kyua-cli/dist/cli/cmd_about.hpp N src/external/bsd/kyua-cli/dist/cli/cmd_config.cpp N src/external/bsd/kyua-cli/dist/cli/cmd_config.hpp N src/external/bsd/kyua-cli/dist/cli/cmd_db_exec.cpp N src/external/bsd/kyua-cli/dist/cli/cmd_db_exec.hpp N src/external/bsd/kyua-cli/dist/cli/cmd_db_migrate_test.cpp N src/external/bsd/kyua-cli/dist/cli/cmd_db_migrate.hpp N src/external/bsd/kyua-cli/dist/cli/cmd_debug.cpp N src/external/bsd/kyua-cli/dist/cli/cmd_debug.hpp N src/external/bsd/kyua-cli/dist/cli/cmd_help.cpp N src/external/bsd/kyua-cli/dist/cli/cmd_help.hpp N src/external/bsd/kyua-cli/dist/cli/cmd_list.cpp N src/external/bsd/kyua-cli/dist/cli/cmd_list.hpp N src/external/bsd/kyua-cli/dist/cli/cmd_report.cpp N src/external/bsd/kyua-cli/dist/cli/cmd_report.hpp N src/external/bsd/kyua-cli/dist/cli/cmd_report_html.cpp N src/external/bsd/kyua-cli/dist/cli/cmd_test.cpp N src/external/bsd/kyua-cli/dist/cli/cmd_report_html.hpp N src/external/bsd/kyua-cli/dist/cli/cmd_test.hpp N src/external/bsd/kyua-cli/dist/cli/common.cpp N src/external/bsd/kyua-cli/dist/cli/common.hpp N src/external/bsd/kyua-cli/dist/cli/common.ipp N src/external/bsd/kyua-cli/dist/cli/config.cpp N src/external/bsd/kyua-cli/dist/cli/config.hpp N src/external/bsd/kyua-cli/dist/cli/main.cpp N src/external/bsd/kyua-cli/dist/cli/main.hpp N src/external/bsd/kyua-cli/dist/cli/cmd_about_test.cpp N src/external/bsd/kyua-cli/dist/cli/cmd_config_test.cpp N src/external/bsd/kyua-cli/dist/cli/cmd_db_exec_test.cpp N src/external/bsd/kyua-cli/dist/cli/cmd_report_html_test.cpp N src/external/bsd/kyua-cli/dist/cli/cmd_debug_test.cpp N src/external/bsd/kyua-cli/dist/cli/cmd_help_test.cpp N src/external/bsd/kyua-cli/dist/cli/cmd_list_test.cpp N src/external/bsd/kyua-cli/dist/cli/cmd_report_test.cpp N src/external/bsd/kyua-cli/dist/cli/common_test.cpp N src/external/bsd/kyua-cli/dist/cli/cmd_test_test.cpp N src/external/bsd/kyua-cli/dist/cli/config_test.cpp N src/external/bsd/kyua-cli/dist/cli/main_test.cpp N src/external/bsd/kyua-cli/dist/cli/Kyuafile N src/external/bsd/kyua-cli/dist/doc/kyua-build-root.7.in N src/external/bsd/kyua-cli/dist/doc/kyua-about.1.in N src/external/bsd/kyua-cli/dist/doc/kyua-db-exec.1.in N src/external/bsd/kyua-cli/dist/doc/kyua-config.1.in N src/external/bsd/kyua-cli/dist/doc/kyua-report-html.1.in N src/external/bsd/kyua-cli/dist/doc/kyua-db-migrate.1.in N src/external/bsd/kyua-cli/dist/doc/kyua-debug.1.in N src/external/bsd/kyua-cli/dist/doc/kyua-help.1.in N src/external/bsd/kyua-cli/dist/doc/kyua-list.1.in N src/external/bsd/kyua-cli/dist/doc/kyua-test-filters.7.in N src/external/bsd/kyua-cli/dist/doc/kyua-report.1.in N src/external/bsd/kyua-cli/dist/doc/kyua-test.1.in N src/external/bsd/kyua-cli/dist/doc/kyua.conf.5.in N src/external/bsd/kyua-cli/dist/doc/kyua.1.in N src/external/bsd/kyua-cli/dist/doc/kyuafile.5.in N src/external/bsd/kyua-cli/dist/engine/exceptions_test.cpp N src/external/bsd/kyua-cli/dist/engine/action.cpp N src/external/bsd/kyua-cli/dist/engine/action.hpp N src/external/bsd/kyua-cli/dist/engine/config.cpp N src/external/bsd/kyua-cli/dist/engine/config.hpp N src/external/bsd/kyua-cli/dist/engine/context.cpp N src/external/bsd/kyua-cli/dist/engine/context.hpp N src/external/bsd/kyua-cli/dist/engine/exceptions.cpp N src/external/bsd/kyua-cli/dist/engine/exceptions.hpp N
CVS commit: src/usr.bin/ftp
Module Name:src
Committed By: christos
Date: Sat Feb 23 13:47:36 UTC 2013
Modified Files:
src/usr.bin/ftp: fetch.c
Log Message:
fix restart from anon ymous
To generate a diff of this commit:
cvs rdiff -u -r1.201 -r1.202 src/usr.bin/ftp/fetch.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/ftp/fetch.c
diff -u src/usr.bin/ftp/fetch.c:1.201 src/usr.bin/ftp/fetch.c:1.202
--- src/usr.bin/ftp/fetch.c:1.201 Sat Dec 22 11:58:51 2012
+++ src/usr.bin/ftp/fetch.c Sat Feb 23 08:47:36 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: fetch.c,v 1.201 2012/12/22 16:58:51 christos Exp $ */
+/* $NetBSD: fetch.c,v 1.202 2013/02/23 13:47:36 christos Exp $ */
/*-
* Copyright (c) 1997-2009 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
#include sys/cdefs.h
#ifndef lint
-__RCSID($NetBSD: fetch.c,v 1.201 2012/12/22 16:58:51 christos Exp $);
+__RCSID($NetBSD: fetch.c,v 1.202 2013/02/23 13:47:36 christos Exp $);
#endif /* not lint */
/*
@@ -844,7 +844,7 @@ fetch_url(const char *url, const char *p
fetch_printf(fin, Connection: close\r\n);
if (restart_point) {
fputs(leading, ttyout);
-fprintf(ttyout, Range: bytes= LLF -\r\n,
+fetch_printf(fin, Range: bytes= LLF -\r\n,
(LLT)restart_point);
fprintf(ttyout, restarting at LLF,
(LLT)restart_point);
CVS commit: src/external/bsd/kyua-cli
Module Name:src Committed By: jmmv Date: Sat Feb 23 14:16:58 UTC 2013 Added Files: src/external/bsd/kyua-cli: Makefile Makefile.inc config.h prepare-import.sh src/external/bsd/kyua-cli/lib: Makefile Makefile.inc src/external/bsd/kyua-cli/lib/cli: Makefile src/external/bsd/kyua-cli/lib/engine: Makefile src/external/bsd/kyua-cli/lib/store: Makefile src/external/bsd/kyua-cli/lib/utils: Makefile Makefile.inc defs.hpp src/external/bsd/kyua-cli/lib/utils/cmdline: Makefile src/external/bsd/kyua-cli/lib/utils/config: Makefile src/external/bsd/kyua-cli/lib/utils/format: Makefile src/external/bsd/kyua-cli/lib/utils/fs: Makefile src/external/bsd/kyua-cli/lib/utils/logging: Makefile src/external/bsd/kyua-cli/lib/utils/process: Makefile src/external/bsd/kyua-cli/lib/utils/signals: Makefile src/external/bsd/kyua-cli/lib/utils/sqlite: Makefile src/external/bsd/kyua-cli/lib/utils/text: Makefile src/external/bsd/kyua-cli/share: Makefile Makefile.inc src/external/bsd/kyua-cli/share/doc: Makefile Makefile.inc src/external/bsd/kyua-cli/share/doc/kyua-cli: Makefile src/external/bsd/kyua-cli/share/examples: Makefile Makefile.inc src/external/bsd/kyua-cli/share/examples/kyua-cli: Makefile src/external/bsd/kyua-cli/share/kyua-cli: Makefile Makefile.inc src/external/bsd/kyua-cli/share/kyua-cli/misc: Makefile src/external/bsd/kyua-cli/share/kyua-cli/store: Makefile src/external/bsd/kyua-cli/share/man: Makefile Makefile.inc src/external/bsd/kyua-cli/share/man/man5: Makefile src/external/bsd/kyua-cli/share/man/man7: Makefile src/external/bsd/kyua-cli/tests: Makefile Makefile.inc src/external/bsd/kyua-cli/tests/kyua-cli: Makefile Makefile.inc src/external/bsd/kyua-cli/tests/kyua-cli/bootstrap: Makefile src/external/bsd/kyua-cli/tests/kyua-cli/cli: Makefile src/external/bsd/kyua-cli/tests/kyua-cli/engine: Makefile Makefile.inc src/external/bsd/kyua-cli/tests/kyua-cli/engine/drivers: Makefile src/external/bsd/kyua-cli/tests/kyua-cli/examples: Makefile src/external/bsd/kyua-cli/tests/kyua-cli/integration: Makefile Makefile.inc src/external/bsd/kyua-cli/tests/kyua-cli/integration/helpers: Makefile src/external/bsd/kyua-cli/tests/kyua-cli/store: Makefile src/external/bsd/kyua-cli/tests/kyua-cli/utils: Makefile Makefile.inc src/external/bsd/kyua-cli/tests/kyua-cli/utils/cmdline: Makefile src/external/bsd/kyua-cli/tests/kyua-cli/utils/config: Makefile src/external/bsd/kyua-cli/tests/kyua-cli/utils/format: Makefile src/external/bsd/kyua-cli/tests/kyua-cli/utils/fs: Makefile src/external/bsd/kyua-cli/tests/kyua-cli/utils/logging: Makefile src/external/bsd/kyua-cli/tests/kyua-cli/utils/process: Makefile src/external/bsd/kyua-cli/tests/kyua-cli/utils/signals: Makefile src/external/bsd/kyua-cli/tests/kyua-cli/utils/sqlite: Makefile src/external/bsd/kyua-cli/tests/kyua-cli/utils/text: Makefile src/external/bsd/kyua-cli/usr.bin: Makefile Makefile.inc src/external/bsd/kyua-cli/usr.bin/kyua: Makefile Log Message: Add reachover build files for kyua-cli. To generate a diff of this commit: cvs rdiff -u -r0 -r1.1 src/external/bsd/kyua-cli/Makefile \ src/external/bsd/kyua-cli/Makefile.inc src/external/bsd/kyua-cli/config.h \ src/external/bsd/kyua-cli/prepare-import.sh cvs rdiff -u -r0 -r1.1 src/external/bsd/kyua-cli/lib/Makefile \ src/external/bsd/kyua-cli/lib/Makefile.inc cvs rdiff -u -r0 -r1.1 src/external/bsd/kyua-cli/lib/cli/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/kyua-cli/lib/engine/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/kyua-cli/lib/store/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/kyua-cli/lib/utils/Makefile \ src/external/bsd/kyua-cli/lib/utils/Makefile.inc \ src/external/bsd/kyua-cli/lib/utils/defs.hpp cvs rdiff -u -r0 -r1.1 src/external/bsd/kyua-cli/lib/utils/cmdline/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/kyua-cli/lib/utils/config/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/kyua-cli/lib/utils/format/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/kyua-cli/lib/utils/fs/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/kyua-cli/lib/utils/logging/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/kyua-cli/lib/utils/process/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/kyua-cli/lib/utils/signals/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/kyua-cli/lib/utils/sqlite/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/kyua-cli/lib/utils/text/Makefile cvs rdiff -u -r0 -r1.1 src/external/bsd/kyua-cli/share/Makefile \ src/external/bsd/kyua-cli/share/Makefile.inc cvs rdiff -u -r0 -r1.1 src/external/bsd/kyua-cli/share/doc/Makefile \
CVS commit: src/external/bsd
Module Name:src
Committed By: jmmv
Date: Sat Feb 23 14:18:52 UTC 2013
Modified Files:
src/external/bsd: Makefile
Log Message:
Makefile
To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 src/external/bsd/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/Makefile
diff -u src/external/bsd/Makefile:1.37 src/external/bsd/Makefile:1.38
--- src/external/bsd/Makefile:1.37 Tue Feb 19 06:06:39 2013
+++ src/external/bsd/Makefile Sat Feb 23 14:18:52 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2013/02/19 06:06:39 jmmv Exp $
+# $NetBSD: Makefile,v 1.38 2013/02/23 14:18:52 jmmv Exp $
.include bsd.own.mk
@@ -20,7 +20,7 @@ SUBDIR+=ipf
SUBDIR+= iscsi
.endif
.if (${MKKYUA} != no)
-SUBDIR+= lutok kyua-testers
+SUBDIR+= lutok kyua-testers kyua-cli
.endif
.if (${MKLDAP} != no)
SUBDIR+= openldap
CVS commit: src
Module Name:src Committed By: jmmv Date: Sat Feb 23 14:18:40 UTC 2013 Modified Files: src/distrib/sets/lists/base: mi src/distrib/sets/lists/debug: mi src/distrib/sets/lists/man: mi src/distrib/sets/lists/misc: mi src/distrib/sets/lists/tests: mi src/etc/mtree: NetBSD.dist.base NetBSD.dist.tests Log Message: Register directories and files provided by kyua-cli. To generate a diff of this commit: cvs rdiff -u -r1.1019 -r1.1020 src/distrib/sets/lists/base/mi cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/debug/mi cvs rdiff -u -r1.1420 -r1.1421 src/distrib/sets/lists/man/mi cvs rdiff -u -r1.181 -r1.182 src/distrib/sets/lists/misc/mi cvs rdiff -u -r1.520 -r1.521 src/distrib/sets/lists/tests/mi cvs rdiff -u -r1.109 -r1.110 src/etc/mtree/NetBSD.dist.base cvs rdiff -u -r1.93 -r1.94 src/etc/mtree/NetBSD.dist.tests 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.1019 src/distrib/sets/lists/base/mi:1.1020 --- src/distrib/sets/lists/base/mi:1.1019 Tue Feb 19 06:06:39 2013 +++ src/distrib/sets/lists/base/mi Sat Feb 23 14:18:37 2013 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1019 2013/02/19 06:06:39 jmmv Exp $ +# $NetBSD: mi,v 1.1020 2013/02/23 14:18:37 jmmv Exp $ # # Note: Don't delete entries from here - mark them as obsolete instead, # unless otherwise stated below. @@ -518,6 +518,7 @@ ./usr/bin/krb5-configbase-krb5-bin kerberos ./usr/bin/ktracebase-debug-bin ./usr/bin/ktrussbase-debug-bin +./usr/bin/kyua base-kyua-bin kyua ./usr/bin/lam base-util-bin ./usr/bin/last base-util-bin ./usr/bin/lastcommbase-util-bin @@ -2521,6 +2522,15 @@ ./usr/share/keymaps/amiga base-sys-share ./usr/share/keymaps/atari base-sys-share ./usr/share/keymaps/x68k base-sys-share +./usr/share/kyua-clibase-kyua-bin +./usr/share/kyua-cli/misc base-kyua-bin +./usr/share/kyua-cli/misc/context.html base-kyua-bin share,kyua +./usr/share/kyua-cli/misc/index.html base-kyua-bin share,kyua +./usr/share/kyua-cli/misc/report.css base-kyua-bin share,kyua +./usr/share/kyua-cli/misc/test_result.html base-kyua-bin share,kyua +./usr/share/kyua-cli/store base-kyua-bin +./usr/share/kyua-cli/store/migrate_v1_v2.sql base-kyua-bin share,kyua +./usr/share/kyua-cli/store/schema_v2.sql base-kyua-bin share,kyua ./usr/share/ldscriptsbase-obsolete obsolete ./usr/share/legalbase-sys-share ./usr/share/legal/COPYRIGHT base-sys-share share Index: src/distrib/sets/lists/debug/mi diff -u src/distrib/sets/lists/debug/mi:1.7 src/distrib/sets/lists/debug/mi:1.8 --- src/distrib/sets/lists/debug/mi:1.7 Tue Feb 19 06:06:42 2013 +++ src/distrib/sets/lists/debug/mi Sat Feb 23 14:18:37 2013 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.7 2013/02/19 06:06:42 jmmv Exp $ +# $NetBSD: mi,v 1.8 2013/02/23 14:18:37 jmmv Exp $ ./etc/mtree/set.debug comp-sys-root ./usr/libdata/debug/bin/cat.debug comp-util-debug debug ./usr/libdata/debug/bin/chio.debug comp-util-debug debug @@ -308,6 +308,7 @@ ./usr/libdata/debug/usr/bin/kpasswd.debug comp-krb5-debug kerberos,debug ./usr/libdata/debug/usr/bin/ktrace.debug comp-debug-debug debug ./usr/libdata/debug/usr/bin/ktruss.debug comp-debug-debug debug +./usr/libdata/debug/usr/bin/kyua.debug comp-kyua-debug kyua,debug ./usr/libdata/debug/usr/bin/lam.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/last.debug comp-util-debug debug ./usr/libdata/debug/usr/bin/lastcomm.debug comp-util-debug debug @@ -1322,6 +1323,105 @@ ./usr/libdata/debug/usr/tests/kernel/t_ucontext.debug tests-obsolete obsolete ./usr/libdata/debug/usr/tests/kernel/t_writev.debug tests-obsolete obsolete ./usr/libdata/debug/usr/tests/kernel/tty/t_pr.debug tests-kernel-tests debug,atf,rump +./usr/libdata/debug/usr/tests/kyua-cli/bootstrap/atf_helpers.debug tests-kyua-tests debug,atf,kyua +./usr/libdata/debug/usr/tests/kyua-cli/bootstrap/plain_helpers.debug tests-kyua-tests debug,atf,kyua +./usr/libdata/debug/usr/tests/kyua-cli/cli/cmd_about_test.debugtests-kyua-tests debug,atf,kyua +./usr/libdata/debug/usr/tests/kyua-cli/cli/cmd_config_test.debug tests-kyua-tests debug,atf,kyua +./usr/libdata/debug/usr/tests/kyua-cli/cli/cmd_db_exec_test.debug tests-kyua-tests debug,atf,kyua +./usr/libdata/debug/usr/tests/kyua-cli/cli/cmd_db_migrate_test.debug tests-kyua-tests debug,atf,kyua +./usr/libdata/debug/usr/tests/kyua-cli/cli/cmd_debug_test.debugtests-kyua-tests debug,atf,kyua +./usr/libdata/debug/usr/tests/kyua-cli/cli/cmd_help_test.debugtests-kyua-tests debug,atf,kyua +./usr/libdata/debug/usr/tests/kyua-cli/cli/cmd_list_test.debugtests-kyua-tests debug,atf,kyua +./usr/libdata/debug/usr/tests/kyua-cli/cli/cmd_report_html_test.debug tests-kyua-tests debug,atf,kyua
CVS commit: src/tests
Module Name:src
Committed By: jmmv
Date: Sat Feb 23 14:22:24 UTC 2013
Modified Files:
src/tests: Makefile
Log Message:
Register kyua-cli into the Atffile when MKKYUA!=no.
To generate a diff of this commit:
cvs rdiff -u -r1.41 -r1.42 src/tests/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/Makefile
diff -u src/tests/Makefile:1.41 src/tests/Makefile:1.42
--- src/tests/Makefile:1.41 Tue Feb 19 15:30:07 2013
+++ src/tests/Makefile Sat Feb 23 14:22:24 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2013/02/19 15:30:07 jmmv Exp $
+# $NetBSD: Makefile,v 1.42 2013/02/23 14:22:24 jmmv Exp $
.include bsd.own.mk
@@ -34,7 +34,7 @@ ATFFILE_EXTRA_TPS+= atf
. endif
. if ${MKKYUA} != no
-ATFFILE_EXTRA_TPS+= kyua-testers
+ATFFILE_EXTRA_TPS+= kyua-cli kyua-testers
. endif
.include bsd.test.mk
CVS commit: src/doc
Module Name:src Committed By: jmmv Date: Sat Feb 23 14:24:13 UTC 2013 Modified Files: src/doc: 3RDPARTY CHANGES Log Message: Note new import of kyua-cli, version 0.6. To generate a diff of this commit: cvs rdiff -u -r1.1005 -r1.1006 src/doc/3RDPARTY cvs rdiff -u -r1.1794 -r1.1795 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.1005 src/doc/3RDPARTY:1.1006 --- src/doc/3RDPARTY:1.1005 Fri Feb 22 03:43:55 2013 +++ src/doc/3RDPARTY Sat Feb 23 14:24:12 2013 @@ -1,4 +1,4 @@ -# $NetBSD: 3RDPARTY,v 1.1005 2013/02/22 03:43:55 christos Exp $ +# $NetBSD: 3RDPARTY,v 1.1006 2013/02/23 14:24:12 jmmv Exp $ # # This file contains a list of the software that has been integrated into # NetBSD where we are not the primary maintainer. @@ -569,6 +569,20 @@ in sys/netinet6/in6.h. No script is ava http://www.kame.net/dev/cvsweb.cgi/kame/COVERAGE has functionality comparison among KAME/*BSD, *BSD-current and recent *BSD releases. +Package: kyua-cli +Version: 0.6 +Current Vers: 0.6 +Maintainer: Julio Merino j...@netbsd.org +Archive site: http://code.google.com/p/kyua/downloads/list?can=1 +Home page: http://code.google.com/p/kyua/ +Mailing List: kyua-disc...@googlegroups.com +Responsible: jmmv +License: BSD 3-clause +Location: external/bsd/kyua-cli/dist +Notes: +The source files are in external/bsd/kyua-cli/dist. +Use external/bsd/kyua-cli/prepare-import.sh to regenerate the dist/ directory. + Package: kyua-testers Version: 0.1 Current Vers: 0.1 Index: src/doc/CHANGES diff -u src/doc/CHANGES:1.1794 src/doc/CHANGES:1.1795 --- src/doc/CHANGES:1.1794 Fri Feb 22 03:43:55 2013 +++ src/doc/CHANGES Sat Feb 23 14:24:12 2013 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1794 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1795 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -198,3 +198,6 @@ Changes from NetBSD 6.0 to NetBSD 7.0: different interfaces. [jmmv 20130217] services(5), protocols(5): Pull iana-generated services and protocols [christos 20130221] + kyua(1): Import kyua-cli 0.6. This is a new import that provides the + command-line interface to Kyua. Its build depends on the + MKKYUA knob. [jmmv 20130223]
CVS commit: src/doc
Module Name:src Committed By: jmmv Date: Sat Feb 23 14:24:56 UTC 2013 Modified Files: src/doc: CHANGES Log Message: Reword entry about the import of kyua-testers-0.1 to use kyua(1) as the affected component name. To generate a diff of this commit: cvs rdiff -u -r1.1795 -r1.1796 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/CHANGES diff -u src/doc/CHANGES:1.1795 src/doc/CHANGES:1.1796 --- src/doc/CHANGES:1.1795 Sat Feb 23 14:24:12 2013 +++ src/doc/CHANGES Sat Feb 23 14:24:56 2013 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1795 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1796 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -193,7 +193,7 @@ Changes from NetBSD 6.0 to NetBSD 7.0: lutok: Import 0.2. This is a new import that provides a C++ wrapper for the Lua API and will be used by Kyua. Its build depends on the MKKYUA knob. [jmmv 20130216] - kyua-testers(1): Import 0.1. This is a new import that provides + kyua(1): Import kyua-testers 0.1. This is a new import that provides scriptable utilities to invoke test programs that implement different interfaces. [jmmv 20130217] services(5), protocols(5): Pull iana-generated services and protocols
CVS commit: src
Module Name:src
Committed By: jmmv
Date: Sat Feb 23 14:58:12 UTC 2013
Modified Files:
src/distrib/sets/lists/misc: mi
src/etc/mtree: NetBSD.dist.base
src/external/bsd/kyua-testers: Makefile
src/external/bsd/kyua-testers/share: Makefile
Log Message:
Install kyua-testers' distribution documents.
To generate a diff of this commit:
cvs rdiff -u -r1.182 -r1.183 src/distrib/sets/lists/misc/mi
cvs rdiff -u -r1.110 -r1.111 src/etc/mtree/NetBSD.dist.base
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/kyua-testers/Makefile
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/kyua-testers/share/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/sets/lists/misc/mi
diff -u src/distrib/sets/lists/misc/mi:1.182 src/distrib/sets/lists/misc/mi:1.183
--- src/distrib/sets/lists/misc/mi:1.182 Sat Feb 23 14:18:39 2013
+++ src/distrib/sets/lists/misc/mi Sat Feb 23 14:58:12 2013
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.182 2013/02/23 14:18:39 jmmv Exp $
+# $NetBSD: mi,v 1.183 2013/02/23 14:58:12 jmmv Exp $
#
# Note: don't delete entries from here - mark them as obsolete instead.
#
@@ -426,6 +426,11 @@
./usr/share/doc/kyua-cli/COPYING misc-kyua-doc doc,kyua
./usr/share/doc/kyua-cli/NEWS misc-kyua-doc doc,kyua
./usr/share/doc/kyua-cli/README misc-kyua-doc doc,kyua
+./usr/share/doc/kyua-testers misc-kyua-doc
+./usr/share/doc/kyua-testers/AUTHORS misc-kyua-doc doc,kyua
+./usr/share/doc/kyua-testers/COPYING misc-kyua-doc doc,kyua
+./usr/share/doc/kyua-testers/NEWS misc-kyua-doc doc,kyua
+./usr/share/doc/kyua-testers/README misc-kyua-doc doc,kyua
./usr/share/doc/psd/00.contents misc-psd-doc doc
./usr/share/doc/psd/05.sysman/0.t misc-psd-doc doc
./usr/share/doc/psd/05.sysman/1.0.t misc-psd-doc doc
Index: src/etc/mtree/NetBSD.dist.base
diff -u src/etc/mtree/NetBSD.dist.base:1.110 src/etc/mtree/NetBSD.dist.base:1.111
--- src/etc/mtree/NetBSD.dist.base:1.110 Sat Feb 23 14:18:36 2013
+++ src/etc/mtree/NetBSD.dist.base Sat Feb 23 14:58:12 2013
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.base,v 1.110 2013/02/23 14:18:36 jmmv Exp $
+# $NetBSD: NetBSD.dist.base,v 1.111 2013/02/23 14:58:12 jmmv Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -254,6 +254,7 @@
./usr/share/doc/html/ntp/icons
./usr/share/doc/html/ntp/scripts
./usr/share/doc/kyua-cli
+./usr/share/doc/kyua-testers
./usr/share/doc/psd
./usr/share/doc/psd/01.cacm
./usr/share/doc/psd/02.implement
Index: src/external/bsd/kyua-testers/Makefile
diff -u src/external/bsd/kyua-testers/Makefile:1.1 src/external/bsd/kyua-testers/Makefile:1.2
--- src/external/bsd/kyua-testers/Makefile:1.1 Tue Feb 19 06:04:42 2013
+++ src/external/bsd/kyua-testers/Makefile Sat Feb 23 14:58:11 2013
@@ -1,5 +1,10 @@
-# $NetBSD: Makefile,v 1.1 2013/02/19 06:04:42 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2013/02/23 14:58:11 jmmv Exp $
SUBDIR= lib .WAIT libexec share tests
+.for dir in libexec share tests
+includes-${dir}: .PHONY
+ @true
+.endfor
+
.include bsd.subdir.mk
Index: src/external/bsd/kyua-testers/share/Makefile
diff -u src/external/bsd/kyua-testers/share/Makefile:1.1 src/external/bsd/kyua-testers/share/Makefile:1.2
--- src/external/bsd/kyua-testers/share/Makefile:1.1 Tue Feb 19 06:04:43 2013
+++ src/external/bsd/kyua-testers/share/Makefile Sat Feb 23 14:58:12 2013
@@ -1,5 +1,5 @@
-# $NetBSD: Makefile,v 1.1 2013/02/19 06:04:43 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2013/02/23 14:58:12 jmmv Exp $
-SUBDIR= man
+SUBDIR= doc man
.include bsd.subdir.mk
CVS commit: src/sys/arch/evbarm
Module Name:src
Committed By: jkunz
Date: Sat Feb 23 16:22:39 UTC 2013
Modified Files:
src/sys/arch/evbarm/imx23_olinuxino: imx23_olinuxino_machdep.c
src/sys/arch/evbarm/stand/bootimx23: Makefile boot_prep.c common.c
common.h
Added Files:
src/sys/arch/evbarm/stand/bootimx23: args_prep.c
Log Message:
Contribution from Petri Laakso:
- Support for passing kernel arguments.
- entropy_init() removed as OLINUXINO doesn't generate entropy bits without
user interaction.
- FIFO contents are flushed when DEBUG is enabled.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/evbarm/stand/bootimx23/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/arch/evbarm/stand/bootimx23/args_prep.c
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/stand/bootimx23/boot_prep.c \
src/sys/arch/evbarm/stand/bootimx23/common.c \
src/sys/arch/evbarm/stand/bootimx23/common.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/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c
diff -u src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c:1.1 src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c:1.2
--- src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c:1.1 Tue Nov 20 19:08:45 2012
+++ src/sys/arch/evbarm/imx23_olinuxino/imx23_olinuxino_machdep.c Sat Feb 23 16:22:38 2013
@@ -1,4 +1,4 @@
-/* $Id: imx23_olinuxino_machdep.c,v 1.1 2012/11/20 19:08:45 jkunz Exp $ */
+/* $Id: imx23_olinuxino_machdep.c,v 1.2 2013/02/23 16:22:38 jkunz Exp $ */
/*
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -38,6 +38,7 @@
#include sys/param.h
#include sys/reboot.h
#include sys/rnd.h
+#include sys/systm.h
#include sys/termios.h
#include sys/types.h
@@ -94,11 +95,11 @@ static const struct pmap_devmap imx23_de
static vm_offset_t physical_freestart;
static vm_offset_t physical_freeend;
static u_int free_pages;
-//static rndsave_t imx23_boot_rsp;
BootConfig bootconfig;
vm_offset_t physical_start;
vm_offset_t physical_end;
+static char kernel_boot_args[MAX_BOOT_STRING];
char *boot_args;
paddr_t msgbufphys;
@@ -142,6 +143,9 @@ pv_addr_t kernel_pt_table[NUM_KERNEL_PTS
#define KERNEL_VM_BASE (KERNEL_BASE + 0x0100)
#define KERNEL_VM_SIZE (0xf000 - KERNEL_VM_BASE)
+#define L1_PAGE_TABLE (DRAM_BASE + MEMSIZE * 1024 * 1024 - L1_TABLE_SIZE)
+#define BOOTIMX23_ARGS (L1_PAGE_TABLE - MAX_BOOT_STRING - 1)
+
#define REG_RD(reg) *(volatile uint32_t *)(reg)
#define REG_WR(reg, val) \
do { \
@@ -163,7 +167,6 @@ initarm(void *arg)
cpu_domains((DOMAIN_CLIENT (PMAP_DOMAIN_KERNEL*2)) | DOMAIN_CLIENT);
consinit();
- //entropy_init();
/* Talk to the user. */
#define BDSTR(s) _BDSTR(s)
@@ -172,7 +175,14 @@ initarm(void *arg)
#undef BDSTR
#undef _BDSTR
- boot_args[0] = '\0';
+ /* Copy boot arguments passed from bootimx23. */
+ boot_args = (char *)BOOTIMX23_ARGS;
+ memcpy(kernel_boot_args, boot_args, MAX_BOOT_STRING);
+ boot_args = kernel_boot_args;
+#ifdef VERBOSE_INIT_ARM
+ printf(boot_args: %s\n, boot_args);
+#endif
+ parse_mi_bootargs(boot_args);
#ifdef VERBOSE_INIT_ARM
printf(initarm: Configuring system ...\n);
@@ -520,38 +530,6 @@ setup_real_page_tables(void)
}
/*
- * Generate initial random bits for rnd_init().
- */
-#ifdef notyet
-static void
-entropy_init(void)
-{
- uint32_t tmp;
- int loop, index;
-
- /* Test if HW_DIGCTL_ENTROPY is feeding random numbers. */
- tmp = REG_RD(HW_DIGCTL_BASE + HW_DIGCTL_ENTROPY);
- if (tmp == REG_RD(HW_DIGCTL_BASE + HW_DIGCTL_ENTROPY))
- return;
-
- index = 0;
- for (loop = 0; loop RND_SAVEWORDS; loop++) {
- imx23_boot_rsp.data[index++] = (uint8_t)(tmp);
- imx23_boot_rsp.data[index++] = (uint8_t)(tmp8);
- imx23_boot_rsp.data[index++] = (uint8_t)(tmp16);
- imx23_boot_rsp.data[index++] = (uint8_t)(tmp24);
- imx23_boot_rsp.entropy += 32;
- tmp = REG_RD(HW_DIGCTL_BASE + HW_DIGCTL_ENTROPY);
- }
-
- extern rndsave_t *boot_rsp;
- boot_rsp = imx23_boot_rsp;
-
- return;
-}
-#endif
-
-/*
* Initialize console.
*/
static struct plcom_instance imx23_pi = {
Index: src/sys/arch/evbarm/stand/bootimx23/Makefile
diff -u src/sys/arch/evbarm/stand/bootimx23/Makefile:1.4 src/sys/arch/evbarm/stand/bootimx23/Makefile:1.5
--- src/sys/arch/evbarm/stand/bootimx23/Makefile:1.4 Wed Feb 6 07:19:19 2013
+++ src/sys/arch/evbarm/stand/bootimx23/Makefile Sat Feb 23 16:22:39 2013
@@ -1,15 +1,16 @@
-# $Id: Makefile,v 1.4 2013/02/06 07:19:19 matt Exp $
+# $Id: Makefile,v 1.5 2013/02/23 16:22:39 jkunz Exp $
S= ${.CURDIR}/../../../../
PROG= bootimx23
-SRCS= boot_prep.c power_prep.c clock_prep.c emi_prep.c \
- pinctrl_prep.c common.c
+SRCS= args_prep.c boot_prep.c clock_prep.c common.c emi_prep.c \
+ pinctrl_prep.c power_prep.c
.include bsd.own.mk
CLEANFILES+= ${PROG}
CFLAGS+= -Wall -Wno-main
CVS commit: othersrc/external/bsd/bsd-pkg-config/dist
Module Name:othersrc
Committed By: agc
Date: Sat Feb 23 18:27:03 UTC 2013
Modified Files:
othersrc/external/bsd/bsd-pkg-config/dist: bsd-pkg-config.sh
Log Message:
allow the prefix to be specified on the command line when invoking
bsd-pkg-config
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 \
othersrc/external/bsd/bsd-pkg-config/dist/bsd-pkg-config.sh
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/external/bsd/bsd-pkg-config/dist/bsd-pkg-config.sh
diff -u othersrc/external/bsd/bsd-pkg-config/dist/bsd-pkg-config.sh:1.1.1.1 othersrc/external/bsd/bsd-pkg-config/dist/bsd-pkg-config.sh:1.2
--- othersrc/external/bsd/bsd-pkg-config/dist/bsd-pkg-config.sh:1.1.1.1 Tue Aug 14 06:45:30 2012
+++ othersrc/external/bsd/bsd-pkg-config/dist/bsd-pkg-config.sh Sat Feb 23 18:27:03 2013
@@ -1,6 +1,6 @@
#! /bin/sh
-# $NetBSD: bsd-pkg-config.sh,v 1.1.1.1 2012/08/14 06:45:30 agc Exp $
+# $NetBSD: bsd-pkg-config.sh,v 1.2 2013/02/23 18:27:03 agc Exp $
# Copyright (c) 2012 Alistair Crooks a...@netbsd.org
# All rights reserved.
@@ -27,7 +27,6 @@
#
prefix=/usr/pkg
-base=${prefix}/lib/pkgconfig
version=20120813
# invoked as showvalues type package
@@ -87,11 +86,17 @@ while [ $# -gt 0 ]; do
case $1 in
--cflags|--exists|--libs*|--modversion|--static|--variable=*|--version)
actions=${actions} $1 ;;
+ --prefix=*)
+ prefix=${1#--prefix=} ;;
+ --prefix)
+ prefix=$2; shift ;;
*) break ;;
esac
shift
done
+base=${prefix}/lib/pkgconfig
+
for action in ${actions}; do
pkgname=$(expandpkgname $1) || exit 1
case ${action} in
CVS commit: othersrc/external/bsd/bsd-pkg-config/dist
Module Name:othersrc Committed By: agc Date: Sat Feb 23 18:30:32 UTC 2013 Modified Files: othersrc/external/bsd/bsd-pkg-config/dist: bsd-pkg-config.1 Log Message: Describe the --prefix command line option To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ othersrc/external/bsd/bsd-pkg-config/dist/bsd-pkg-config.1 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: othersrc/external/bsd/bsd-pkg-config/dist/bsd-pkg-config.1 diff -u othersrc/external/bsd/bsd-pkg-config/dist/bsd-pkg-config.1:1.2 othersrc/external/bsd/bsd-pkg-config/dist/bsd-pkg-config.1:1.3 --- othersrc/external/bsd/bsd-pkg-config/dist/bsd-pkg-config.1:1.2 Tue Aug 14 06:52:39 2012 +++ othersrc/external/bsd/bsd-pkg-config/dist/bsd-pkg-config.1 Sat Feb 23 18:30:32 2013 @@ -1,4 +1,4 @@ -.\ $NetBSD: bsd-pkg-config.1,v 1.2 2012/08/14 06:52:39 wiz Exp $ +.\ $NetBSD: bsd-pkg-config.1,v 1.3 2013/02/23 18:30:32 agc Exp $ .\ .\ Copyright (c) 2012 Alistair Crooks a...@netbsd.org .\ All rights reserved. @@ -23,7 +23,7 @@ .\ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\ THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\ -.Dd August 13, 2012 +.Dd February 23, 2013 .Dt BSD-PKG-CONFIG 1 .Os .Sh NAME @@ -38,6 +38,7 @@ .Op Fl Fl libs-only-l .Op Fl Fl libs-only-other .Op Fl Fl modversion +.Op Fl Fl prefix .Op Fl Fl static .Op Fl Fl variable Ns = Ns varname .Op Fl Fl version @@ -84,6 +85,15 @@ displays the library search paths with w displays the library names with which this package was linked .It Fl Fl modversion displays the version number of this package +.It Fl Fl prefix +allows the prefix for the installed +.Dv .pc +file to be specified. +This can be useful when invoking +.Nm +on a +.Dq builtin +package that is included in the base system. .It Fl Fl static displays information pertaining to the static libraries used by this package
CVS commit: src/external/bsd/kyua-testers/dist
Module Name:src
Committed By: jmmv
Date: Sat Feb 23 21:04:28 UTC 2013
Modified Files:
src/external/bsd/kyua-testers/dist: atf_list.c atf_list_test.c
Log Message:
Cherry-pick upstream commit 9f81e6f6fece7f7e26643022a5efb93c3595e9bc:
Escape backslashes in test metadata
The previous code in kyua-atf-tester escaped single quotes in the
metadata of test cases so that those single quotes did not yield
invalid Lua strings in the output of the tester.
It turns out we also need to escape backslashes for things to work
properly. Backslashes also have special meaning within Lua strings.
Found while running the NetBSD test suite. In particular, the
lib/libc/gen/t_fnmatch test program had the '\'' sequence in the
description of a test and this made the test program be reported
as bogus.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 src/external/bsd/kyua-testers/dist/atf_list.c \
src/external/bsd/kyua-testers/dist/atf_list_test.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/kyua-testers/dist/atf_list.c
diff -u src/external/bsd/kyua-testers/dist/atf_list.c:1.1.1.1 src/external/bsd/kyua-testers/dist/atf_list.c:1.2
--- src/external/bsd/kyua-testers/dist/atf_list.c:1.1.1.1 Tue Feb 19 06:01:39 2013
+++ src/external/bsd/kyua-testers/dist/atf_list.c Sat Feb 23 21:04:28 2013
@@ -111,6 +111,26 @@ parse_header(FILE* input)
}
+/// Looks for the first occurrence of any of the specified delimiters.
+///
+/// \param container String in which to look for the delimiters.
+/// \param delimiters List of delimiters to look for.
+///
+/// \return A pointer to the first occurrence of the delimiter, or NULL if
+/// there is none.
+static char*
+find_first_of(char* container, const char* delimiters)
+{
+char* ptr = container;
+while (*ptr != '\0') {
+if (strchr(delimiters, *ptr) != NULL)
+return ptr;
+++ptr;
+}
+return NULL;
+}
+
+
/// Prints a string within single quotes, with proper escaping.
///
/// \param [in,out] line The line to be printed. This is a non-const pointer
@@ -120,15 +140,17 @@ parse_header(FILE* input)
static void
print_quoted(char* line, FILE* output, const bool surrounding)
{
-char* quote;
-
if (surrounding)
fprintf(output, ');
-while ((quote = strchr(line, '\'')) != NULL) {
-*quote = '\0';
-fprintf(output, %s\\', line);
-line = quote + 1;
+
+char* quoteptr;
+while ((quoteptr = find_first_of(line, \'\\)) != NULL) {
+const char quote = *quoteptr;
+*quoteptr = '\0';
+fprintf(output, %s\\%c, line, quote);
+line = quoteptr + 1;
}
+
if (surrounding)
fprintf(output, %s', line);
else
Index: src/external/bsd/kyua-testers/dist/atf_list_test.c
diff -u src/external/bsd/kyua-testers/dist/atf_list_test.c:1.1.1.1 src/external/bsd/kyua-testers/dist/atf_list_test.c:1.2
--- src/external/bsd/kyua-testers/dist/atf_list_test.c:1.1.1.1 Tue Feb 19 06:01:39 2013
+++ src/external/bsd/kyua-testers/dist/atf_list_test.c Sat Feb 23 21:04:28 2013
@@ -127,7 +127,7 @@ ATF_TC_BODY(parse__ok__several, tc)
ident: second\n
\n
ident: third\n
-descr: A string with an embedded ' in it\n
+descr: A string with an embedded ' and \\' in it\n
has.cleanup: true\n
X-custom: foo\n
X-a'b: bar\n);
@@ -135,8 +135,8 @@ ATF_TC_BODY(parse__ok__several, tc)
input.txt,
test_case{name='first', required_user='root'}\n
test_case{name='second'}\n
-test_case{name='third', description='A string with an embedded \\' in
- it', has_cleanup='true', ['custom.X-custom']='foo',
+test_case{name='third', description='A string with an embedded \\'
+and \\' in it', has_cleanup='true', ['custom.X-custom']='foo',
['custom.X-a\\'b']='bar'}\n);
}
CVS commit: src
Module Name:src
Committed By: jmmv
Date: Sat Feb 23 21:20:14 UTC 2013
Modified Files:
src/share/mk: bsd.test.mk
src/tests: Makefile
Log Message:
Stop assuming that test programs and directories are the same thing during
Atffile generation.
This is needed to be able to generate Kyuafiles (coming later), as these
clearly differentiate between the definition of test programs and the
recursion into other subdirectories (or files).
In particular: rename ATFFILE_EXTRA_TPS to ATFFILE_EXTRA_SUBDIRS and
change the logic in bsd.test.mk to keep track of subdirectories aside from
_TESTS when creating the Atffile.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/share/mk/bsd.test.mk
cvs rdiff -u -r1.42 -r1.43 src/tests/Makefile
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.test.mk
diff -u src/share/mk/bsd.test.mk:1.22 src/share/mk/bsd.test.mk:1.23
--- src/share/mk/bsd.test.mk:1.22 Sat Feb 16 15:00:44 2013
+++ src/share/mk/bsd.test.mk Sat Feb 23 21:20:14 2013
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.test.mk,v 1.22 2013/02/16 15:00:44 jmmv Exp $
+# $NetBSD: bsd.test.mk,v 1.23 2013/02/23 21:20:14 jmmv Exp $
#
.include bsd.init.mk
@@ -7,7 +7,6 @@ _TESTS:= # empty
.if defined(TESTS_SUBDIRS)
SUBDIR+= ${TESTS_SUBDIRS}
-_TESTS:= ${TESTS_SUBDIRS:N.WAIT}
.endif
.include bsd.subdir.mk
@@ -57,10 +56,12 @@ ${_T}: ${TESTS_SH_SRC_${_T}}
ATFFILE?= auto
# Additional list of 'tp' entries to add to the Atffile when ATFFILE=auto.
+# These entries must all correspond to subdirectories to descend into.
+#
# This is useful in the cases where the tests in a single directory come
# from various sources (e.g. src/tests and src/external/.../tests) and
# the installation of some of those tests rely on MK* variables being set.
-ATFFILE_EXTRA_TPS?=
+ATFFILE_EXTRA_SUBDIRS?=
.if ${ATFFILE:tl} != no
FILES+= Atffile
@@ -78,7 +79,8 @@ Atffile: Makefile
echo; \
echo 'prop: test-suite = NetBSD'; \
echo; \
- for tp in ${_TESTS} ${ATFFILE_EXTRA_TPS}; do \
+ for tp in ${TESTS_SUBDIRS:N.WAIT} ${_TESTS} ${ATFFILE_EXTRA_SUBDIRS}; \
+ do \
echo tp: $${tp}; \
done; } Atffile.tmp
@mv Atffile.tmp Atffile
Index: src/tests/Makefile
diff -u src/tests/Makefile:1.42 src/tests/Makefile:1.43
--- src/tests/Makefile:1.42 Sat Feb 23 14:22:24 2013
+++ src/tests/Makefile Sat Feb 23 21:20:14 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2013/02/23 14:22:24 jmmv Exp $
+# $NetBSD: Makefile,v 1.43 2013/02/23 21:20:14 jmmv Exp $
.include bsd.own.mk
@@ -30,11 +30,11 @@ TESTS_SUBDIRS+= share
. endif
. if ${MKATF} != no
-ATFFILE_EXTRA_TPS+= atf
+ATFFILE_EXTRA_SUBDIRS+= atf
. endif
. if ${MKKYUA} != no
-ATFFILE_EXTRA_TPS+= kyua-cli kyua-testers
+ATFFILE_EXTRA_SUBDIRS+= kyua-cli kyua-testers
. endif
.include bsd.test.mk
CVS commit: src/distrib/sets/lists/tests
Module Name:src Committed By: jmmv Date: Sat Feb 23 22:56:47 UTC 2013 Modified Files: src/distrib/sets/lists/tests: mi Log Message: Remove duplicate (and possibly invalid) 'atf' tags from 3 tests. To generate a diff of this commit: cvs rdiff -u -r1.522 -r1.523 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.522 src/distrib/sets/lists/tests/mi:1.523 --- src/distrib/sets/lists/tests/mi:1.522 Sat Feb 23 22:01:51 2013 +++ src/distrib/sets/lists/tests/mi Sat Feb 23 22:56:46 2013 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.522 2013/02/23 22:01:51 jmmv Exp $ +# $NetBSD: mi,v 1.523 2013/02/23 22:56:46 jmmv Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -2978,7 +2978,7 @@ ./usr/tests/usr.bin/shmif_dumpbus/d_pcap.out.bz2.uue tests-usr.bin-tests atf ./usr/tests/usr.bin/shmif_dumpbus/d_pkthdrs.out.bz2.uue tests-usr.bin-tests atf ./usr/tests/usr.bin/shmif_dumpbus/shmbus.bz2.uue tests-usr.bin-tests atf -./usr/tests/usr.bin/shmif_dumpbus/t_basic tests-usr.bin-tests atf atf +./usr/tests/usr.bin/shmif_dumpbus/t_basic tests-usr.bin-tests atf ./usr/tests/usr.bin/sorttests-usr.bin-tests ./usr/tests/usr.bin/sort/Atffile tests-usr.bin-tests atf ./usr/tests/usr.bin/sort/Kyuafile tests-usr.bin-tests atf,kyua @@ -2988,11 +2988,11 @@ ./usr/tests/usr.bin/sort/d_any_char_in.txt tests-usr.bin-tests atf ./usr/tests/usr.bin/sort/t_sorttests-usr.bin-tests atf ./usr/tests/usr.bin/tmux tests-usr.bin-tests -./usr/tests/usr.bin/tmux/Atffile tests-usr.bin-tests atf atf +./usr/tests/usr.bin/tmux/Atffile tests-usr.bin-tests atf ./usr/tests/usr.bin/tmux/Kyuafile tests-usr.bin-tests atf,kyua ./usr/tests/usr.bin/tmux/t_tmux tests-usr.bin-tests atf ./usr/tests/usr.bin/unifdef tests-usr.bin-tests -./usr/tests/usr.bin/unifdef/Atffile tests-usr.bin-tests atf atf +./usr/tests/usr.bin/unifdef/Atffile tests-usr.bin-tests atf ./usr/tests/usr.bin/unifdef/Kyuafile tests-usr.bin-tests atf,kyua ./usr/tests/usr.bin/unifdef/d_basic.in tests-usr.bin-tests atf ./usr/tests/usr.bin/unifdef/d_basic.out tests-usr.bin-tests atf
CVS commit: src
Module Name:src
Committed By: jmmv
Date: Sun Feb 24 03:06:16 UTC 2013
Modified Files:
src/distrib/sets/lists/base: mi
src/distrib/sets/lists/etc: mi
src/etc: Makefile
src/etc/mtree: NetBSD.dist.base
src/external/bsd/kyua-cli: Makefile
Added Files:
src/external/bsd/kyua-cli/etc: Makefile Makefile.inc
src/external/bsd/kyua-cli/etc/kyua: Makefile kyua.conf
Log Message:
Install a kyua.conf file that sets unprivileged_user to _tests.
To generate a diff of this commit:
cvs rdiff -u -r1.1020 -r1.1021 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.228 -r1.229 src/distrib/sets/lists/etc/mi
cvs rdiff -u -r1.405 -r1.406 src/etc/Makefile
cvs rdiff -u -r1.111 -r1.112 src/etc/mtree/NetBSD.dist.base
cvs rdiff -u -r1.1 -r1.2 src/external/bsd/kyua-cli/Makefile
cvs rdiff -u -r0 -r1.1 src/external/bsd/kyua-cli/etc/Makefile \
src/external/bsd/kyua-cli/etc/Makefile.inc
cvs rdiff -u -r0 -r1.1 src/external/bsd/kyua-cli/etc/kyua/Makefile \
src/external/bsd/kyua-cli/etc/kyua/kyua.conf
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.1020 src/distrib/sets/lists/base/mi:1.1021
--- src/distrib/sets/lists/base/mi:1.1020 Sat Feb 23 14:18:37 2013
+++ src/distrib/sets/lists/base/mi Sun Feb 24 03:06:14 2013
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1020 2013/02/23 14:18:37 jmmv Exp $
+# $NetBSD: mi,v 1.1021 2013/02/24 03:06:14 jmmv Exp $
#
# Note: Don't delete entries from here - mark them as obsolete instead,
# unless otherwise stated below.
@@ -99,6 +99,7 @@
./etc/iscsi base-sysutil-root
./etc/kerberosIVbase-obsolete obsolete
./etc/kerberosV base-krb5-root
+./etc/kyua base-kyua-root
./etc/mail base-postfix-bin
./etc/mtree base-sys-root
./etc/mtree/set.basebase-sys-root
Index: src/distrib/sets/lists/etc/mi
diff -u src/distrib/sets/lists/etc/mi:1.228 src/distrib/sets/lists/etc/mi:1.229
--- src/distrib/sets/lists/etc/mi:1.228 Tue Feb 7 19:13:28 2012
+++ src/distrib/sets/lists/etc/mi Sun Feb 24 03:06:15 2013
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.228 2012/02/07 19:13:28 joerg Exp $
+# $NetBSD: mi,v 1.229 2013/02/24 03:06:15 jmmv Exp $
#
# Note: end-user configuration files that are moved to another location
# should not be marked obsolete; they should just be removed from
@@ -73,6 +73,7 @@
./etc/inetd.confetc-netutil-etc
./etc/iscsi/authsetc-iscsi-etc iscsi
./etc/iscsi/targetsetc-iscsi-etc iscsi
+./etc/kyua/kyua.confetc-kyua-etc kyua
./etc/lkm.conf etc-obsolete obsolete
./etc/localtime etc-sys-etc
./etc/locate.confetc-sys-etc
Index: src/etc/Makefile
diff -u src/etc/Makefile:1.405 src/etc/Makefile:1.406
--- src/etc/Makefile:1.405 Tue Feb 5 16:39:26 2013
+++ src/etc/Makefile Sun Feb 24 03:06:13 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.405 2013/02/05 16:39:26 matt Exp $
+# $NetBSD: Makefile,v 1.406 2013/02/24 03:06:13 jmmv Exp $
# from: @(#)Makefile 8.7 (Berkeley) 5/25/95
# Environment variables without default values:
@@ -335,6 +335,9 @@ install-etc-files: .PHONY .MAKE check_DE
.if (${MKATF} != no)
${MAKEDIRTARGET} ${NETBSDSRCDIR}/external/bsd/atf/etc/atf configinstall
.endif
+.if (${MKKYUA} != no)
+ ${MAKEDIRTARGET} ${NETBSDSRCDIR}/external/bsd/kyua-cli/etc/kyua configinstall
+.endif
# install-obsolete-lists --
Index: src/etc/mtree/NetBSD.dist.base
diff -u src/etc/mtree/NetBSD.dist.base:1.111 src/etc/mtree/NetBSD.dist.base:1.112
--- src/etc/mtree/NetBSD.dist.base:1.111 Sat Feb 23 14:58:12 2013
+++ src/etc/mtree/NetBSD.dist.base Sun Feb 24 03:06:13 2013
@@ -1,4 +1,4 @@
-# $NetBSD: NetBSD.dist.base,v 1.111 2013/02/23 14:58:12 jmmv Exp $
+# $NetBSD: NetBSD.dist.base,v 1.112 2013/02/24 03:06:13 jmmv Exp $
# @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
# Do not customize this file as it may be overwritten on upgrades.
@@ -36,6 +36,7 @@
./etc/fonts/conf.avail
./etc/iscsi
./etc/kerberosV
+./etc/kyua
./etc/mail
./etc/mtree
./etc/namedb
Index: src/external/bsd/kyua-cli/Makefile
diff -u src/external/bsd/kyua-cli/Makefile:1.1 src/external/bsd/kyua-cli/Makefile:1.2
--- src/external/bsd/kyua-cli/Makefile:1.1 Sat Feb 23 14:16:49 2013
+++ src/external/bsd/kyua-cli/Makefile Sun Feb 24 03:06:15 2013
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.1 2013/02/23 14:16:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2013/02/24 03:06:15 jmmv Exp $
-SUBDIR= lib .WAIT share tests usr.bin
+SUBDIR= etc lib .WAIT share tests usr.bin
.for dir in share tests usr.bin
includes-${dir}: .PHONY
Added files:
Index: src/external/bsd/kyua-cli/etc/Makefile
diff -u /dev/null src/external/bsd/kyua-cli/etc/Makefile:1.1
--- /dev/null Sun Feb 24 03:06:16 2013
+++ src/external/bsd/kyua-cli/etc/Makefile Sun Feb 24 03:06:15 2013
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2013/02/24 03:06:15 jmmv Exp $
+
+SUBDIR= kyua
+
+.include bsd.subdir.mk
Index:
CVS commit: src/external/bsd/kyua-testers/share/doc
Module Name:src
Committed By: jmmv
Date: Sun Feb 24 03:13:00 UTC 2013
Added Files:
src/external/bsd/kyua-testers/share/doc: Makefile
src/external/bsd/kyua-testers/share/doc/kyua-testers: Makefile
Log Message:
Install kyua-testers' distribution documents.
(Followup to my previous commit as I forgot to include these new files.)
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.1 src/external/bsd/kyua-testers/share/doc/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/bsd/kyua-testers/share/doc/kyua-testers/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Added files:
Index: src/external/bsd/kyua-testers/share/doc/Makefile
diff -u /dev/null src/external/bsd/kyua-testers/share/doc/Makefile:1.1
--- /dev/null Sun Feb 24 03:13:00 2013
+++ src/external/bsd/kyua-testers/share/doc/Makefile Sun Feb 24 03:12:59 2013
@@ -0,0 +1,5 @@
+# $NetBSD: Makefile,v 1.1 2013/02/24 03:12:59 jmmv Exp $
+
+SUBDIR= kyua-testers
+
+.include bsd.subdir.mk
Index: src/external/bsd/kyua-testers/share/doc/kyua-testers/Makefile
diff -u /dev/null src/external/bsd/kyua-testers/share/doc/kyua-testers/Makefile:1.1
--- /dev/null Sun Feb 24 03:13:00 2013
+++ src/external/bsd/kyua-testers/share/doc/kyua-testers/Makefile Sun Feb 24 03:12:59 2013
@@ -0,0 +1,16 @@
+# $NetBSD: Makefile,v 1.1 2013/02/24 03:12:59 jmmv Exp $
+
+.include bsd.init.mk
+
+SRCDIR= ${NETBSDSRCDIR}/external/bsd/kyua-testers/dist
+.PATH: ${SRCDIR}
+
+.if ${MKSHARE} != no
+.PATH: ${SRCDIR}
+
+FILESDIR= /usr/share/doc/kyua-testers
+FILESMODE= 444
+FILES= AUTHORS COPYING NEWS README
+.endif
+
+.include bsd.files.mk
CVS commit: src/sys/sys
Module Name:src
Committed By: matt
Date: Sun Feb 24 06:20:24 UTC 2013
Modified Files:
src/sys/sys: tty.h
Log Message:
Add a t_softc member to struct tty in which a driver can store a pointer
to its softc. (analogous to if_softc in struct ifnet).
To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/sys/sys/tty.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/sys/tty.h
diff -u src/sys/sys/tty.h:1.90 src/sys/sys/tty.h:1.91
--- src/sys/sys/tty.h:1.90 Sat Sep 24 00:05:38 2011
+++ src/sys/sys/tty.h Sun Feb 24 06:20:24 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: tty.h,v 1.90 2011/09/24 00:05:38 christos Exp $ */
+/* $NetBSD: tty.h,v 1.91 2013/02/24 06:20:24 matt Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -148,6 +148,7 @@ struct tty {
sigset_t t_sigs[TTYSIG_COUNT]; /* Pending signals */
int t_sigcount; /* # pending signals */
TAILQ_ENTRY(tty) t_sigqueue; /* entry on pending signal list */
+ void *t_softc; /* pointer to driver's softc. */
};
#define t_cc t_termios.c_cc
CVS commit: src/sys/dev/ic
Module Name:src Committed By: matt Date: Sun Feb 24 06:21:36 UTC 2013 Modified Files: src/sys/dev/ic: com.c Log Message: Initialize t_softc. To generate a diff of this commit: cvs rdiff -u -r1.307 -r1.308 src/sys/dev/ic/com.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/ic/com.c diff -u src/sys/dev/ic/com.c:1.307 src/sys/dev/ic/com.c:1.308 --- src/sys/dev/ic/com.c:1.307 Thu Jan 10 17:38:10 2013 +++ src/sys/dev/ic/com.c Sun Feb 24 06:21:36 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: com.c,v 1.307 2013/01/10 17:38:10 macallan Exp $ */ +/* $NetBSD: com.c,v 1.308 2013/02/24 06:21:36 matt Exp $ */ /*- * Copyright (c) 1998, 1999, 2004, 2008 The NetBSD Foundation, Inc. @@ -66,7 +66,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: com.c,v 1.307 2013/01/10 17:38:10 macallan Exp $); +__KERNEL_RCSID(0, $NetBSD: com.c,v 1.308 2013/02/24 06:21:36 matt Exp $); #include opt_com.h #include opt_ddb.h @@ -515,6 +515,7 @@ fifodone: tp-t_oproc = comstart; tp-t_param = comparam; tp-t_hwiflow = comhwiflow; + tp-t_softc = sc; sc-sc_tty = tp; sc-sc_rbuf = malloc(com_rbuf_size 1, M_DEVBUF, M_NOWAIT);
