CVS commit: src/gnu/dist/gdb6/gdb
Module Name:src Committed By: wiz Date: Mon Jul 13 08:35:24 UTC 2009 Modified Files: src/gnu/dist/gdb6/gdb: i386-tdep.c Log Message: Remove incorrect semicolon at the end of an if-statement. From OpenBSD via Henning Petersen in PR 41708. To generate a diff of this commit: cvs rdiff -u -r1.1.1.2 -r1.2 src/gnu/dist/gdb6/gdb/i386-tdep.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/gnu/dist/gdb6/gdb/i386-tdep.c diff -u src/gnu/dist/gdb6/gdb/i386-tdep.c:1.1.1.2 src/gnu/dist/gdb6/gdb/i386-tdep.c:1.2 --- src/gnu/dist/gdb6/gdb/i386-tdep.c:1.1.1.2 Sun Jul 2 20:14:15 2006 +++ src/gnu/dist/gdb6/gdb/i386-tdep.c Mon Jul 13 08:35:24 2009 @@ -874,7 +874,7 @@ /* addl y,%ebx */ if (delta 0 op == 0x81 - read_memory_unsigned_integer (pc + delta + 1, 1) == 0xc3); + read_memory_unsigned_integer (pc + delta + 1, 1) == 0xc3) { pc += delta + 6; }
CVS commit: src/sys/dev/ic
Module Name:src Committed By: kiyohara Date: Mon Jul 13 12:54:11 UTC 2009 Modified Files: src/sys/dev/ic: ac97.c Log Message: Support UCB1400. It tested on GUMSTIX with audiostix. However GUMSTIX needs more ad-hoc patch. To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 src/sys/dev/ic/ac97.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/ac97.c diff -u src/sys/dev/ic/ac97.c:1.90 src/sys/dev/ic/ac97.c:1.91 --- src/sys/dev/ic/ac97.c:1.90 Tue May 12 14:25:17 2009 +++ src/sys/dev/ic/ac97.c Mon Jul 13 12:54:11 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: ac97.c,v 1.90 2009/05/12 14:25:17 cegger Exp $ */ +/* $NetBSD: ac97.c,v 1.91 2009/07/13 12:54:11 kiyohara Exp $ */ /* $OpenBSD: ac97.c,v 1.8 2000/07/19 09:01:35 csapuntz Exp $ */ /* @@ -63,7 +63,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ac97.c,v 1.90 2009/05/12 14:25:17 cegger Exp $); +__KERNEL_RCSID(0, $NetBSD: ac97.c,v 1.91 2009/07/13 12:54:11 kiyohara Exp $); #include sys/param.h #include sys/systm.h @@ -103,6 +103,7 @@ static void ac97_ad198x_init(struct ac97_softc *); static void ac97_alc650_init(struct ac97_softc *); +static void ac97_ucb1400_init(struct ac97_softc *); static void ac97_vt1616_init(struct ac97_softc *); static int ac97_modem_offhook_set(struct ac97_softc *, int, int); @@ -719,7 +720,7 @@ AC97_VENDOR_ID_MASK, National Semiconductor unknown, NULL, }, { AC97_CODEC_ID('P', 'S', 'C', 4), - 0x, Philips Semiconductor UCB1400, NULL, }, + 0x, Philips Semiconductor UCB1400, ac97_ucb1400_init, }, { AC97_CODEC_ID('P', 'S', 'C', 0), AC97_VENDOR_ID_MASK, Philips Semiconductor unknown, NULL, }, @@ -2131,6 +2132,42 @@ ac97_add_port(as, sources[5]); } +#define UCB1400_REG_FEATURE_CSR1 0x6a +#define UCB1400_BB(bb) (((bb) 0xf) 11) +#define UCB1400_TR(tr) (((tr) 0x3) 9) +#define UCB1400_M_MAXIMUM (3 7) +#define UCB1400_M_MINIMUM (1 7) +#define UCB1400_M_FLAT (0 7) +#define UCB1400_HPEN (1 6) +#define UCB1400_DE (1 5) +#define UCB1400_DC (1 4) +#define UCB1400_HIPS (1 3) +#define UCB1400_GIEN (1 2) +#define UCB1400_OVFL (1 0) +#define UCB1400_REG_FEATURE_CSR2 0x6c +#define UCB1400_SMT (1 15) /* Must be 0 */ +#define UCB1400_SUEV1 (1 14) /* Must be 0 */ +#define UCB1400_SUEV0 (1 13) /* Must be 0 */ +#define UCB1400_AVE (1 12) +#define UCB1400_AVEN1 (1 11) /* Must be 0 */ +#define UCB1400_AVEN0 (1 10) /* Must be 0 */ +#define UCB1400_SLP_ON \ + (UCB1400_SLP_PLL | UCB1400_SLP_CODEC) +#define UCB1400_SLP_PLL (2 4) +#define UCB1400_SLP_CODEC (1 4) +#define UCB1400_SLP_NO (0 4) +#define UCB1400_EV2 (1 2) /* Must be 0 */ +#define UCB1400_EV1 (1 1) /* Must be 0 */ +#define UCB1400_EV0 (1 0) /* Must be 0 */ +static void +ac97_ucb1400_init(struct ac97_softc *as) +{ + + ac97_write(as, UCB1400_REG_FEATURE_CSR1, + UCB1400_HPEN | UCB1400_DC | UCB1400_HIPS | UCB1400_OVFL); + ac97_write(as, UCB1400_REG_FEATURE_CSR2, UCB1400_AVE | UCB1400_SLP_ON); +} + #define VT1616_REG_IO_CONTROL 0x5a #define VT1616_IC_LVL (1 15) #define VT1616_IC_LFECENTER_TO_FRONT (1 12)
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: kiyohara Date: Mon Jul 13 12:55:21 UTC 2009 Modified Files: src/sys/dev/acpi: acpi_resource.c Log Message: ACPI resource supports Extended IRQ From FreeBSD. To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/dev/acpi/acpi_resource.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/acpi/acpi_resource.c diff -u src/sys/dev/acpi/acpi_resource.c:1.28 src/sys/dev/acpi/acpi_resource.c:1.29 --- src/sys/dev/acpi/acpi_resource.c:1.28 Tue May 12 09:50:28 2009 +++ src/sys/dev/acpi/acpi_resource.c Mon Jul 13 12:55:21 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_resource.c,v 1.28 2009/05/12 09:50:28 cegger Exp $ */ +/* $NetBSD: acpi_resource.c,v 1.29 2009/07/13 12:55:21 kiyohara Exp $ */ /* * Copyright 2001 Wasabi Systems, Inc. @@ -67,7 +67,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: acpi_resource.c,v 1.28 2009/05/12 09:50:28 cegger Exp $); +__KERNEL_RCSID(0, $NetBSD: acpi_resource.c,v 1.29 2009/07/13 12:55:21 kiyohara Exp $); #include sys/param.h #include sys/systm.h @@ -297,8 +297,20 @@ break; case ACPI_RESOURCE_TYPE_EXTENDED_IRQ: - ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, - ExtendedIrq unimplemented\n)); + if (res-Data.ExtendedIrq.ProducerConsumer != ACPI_CONSUMER) { + ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, + ignored ExtIRQ producer\n)); + break; + } + for (i = 0; i res-Data.ExtendedIrq.InterruptCount; i++) { + ACPI_DEBUG_PRINT((ACPI_DB_RESOURCES, + ExtIRQ %d\n, + res-Data.ExtendedIrq.Interrupts[i])); + if (ops-irq) +(*ops-irq)(arg-dev, arg-context, +res-Data.ExtendedIrq.Interrupts[i], +res-Data.ExtendedIrq.Triggering); + } break; case ACPI_RESOURCE_TYPE_GENERIC_REGISTER:
CVS commit: src/sys/dev/acpi
Module Name:src Committed By: kiyohara Date: Mon Jul 13 12:57:04 UTC 2009 Modified Files: src/sys/dev/acpi: com_acpi.c Log Message: c...@acpi supports memory space. It tested on HP zx6000(ia64). To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 src/sys/dev/acpi/com_acpi.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/acpi/com_acpi.c diff -u src/sys/dev/acpi/com_acpi.c:1.28 src/sys/dev/acpi/com_acpi.c:1.29 --- src/sys/dev/acpi/com_acpi.c:1.28 Tue Feb 17 12:46:01 2009 +++ src/sys/dev/acpi/com_acpi.c Mon Jul 13 12:57:04 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: com_acpi.c,v 1.28 2009/02/17 12:46:01 jmcneill Exp $ */ +/* $NetBSD: com_acpi.c,v 1.29 2009/07/13 12:57:04 kiyohara Exp $ */ /* * Copyright (c) 2002 Jared D. McNeill jmcne...@invisible.ca @@ -26,7 +26,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: com_acpi.c,v 1.28 2009/02/17 12:46:01 jmcneill Exp $); +__KERNEL_RCSID(0, $NetBSD: com_acpi.c,v 1.29 2009/07/13 12:57:04 kiyohara Exp $); #include sys/param.h #include sys/systm.h @@ -100,8 +100,12 @@ struct acpi_attach_args *aa = aux; struct acpi_resources res; struct acpi_io *io; + struct acpi_mem *mem; struct acpi_irq *irq; + bus_space_tag_t iot; bus_space_handle_t ioh; + bus_addr_t base; + bus_size_t size; ACPI_STATUS rv; sc-sc_dev = self; @@ -114,10 +118,21 @@ /* find our i/o registers */ io = acpi_res_io(res, 0); - if (io == NULL) { - aprint_error_dev(self, - unable to find i/o register resource\n); - goto out; + if (io != NULL) { + iot = aa-aa_iot; + base = io-ar_base; + size = io-ar_length; + } else { + mem = acpi_res_mem(res, 0); + if (mem != NULL) { + iot = aa-aa_memt; + base = mem-ar_base; + size = mem-ar_length; + } else { + aprint_error_dev(self, + unable to find i/o register and memory resource\n); + goto out; + } } /* find our IRQ */ @@ -127,14 +142,12 @@ goto out; } - if (!com_is_console(aa-aa_iot, io-ar_base, ioh)) { - if (bus_space_map(sc-sc_regs.cr_iot, io-ar_base, io-ar_length, - 0, ioh)) { + if (!com_is_console(iot, base, ioh)) + if (bus_space_map(iot, base, size, 0, ioh)) { aprint_error_dev(self, can't map i/o space\n); goto out; } - } - COM_INIT_REGS(sc-sc_regs, aa-aa_iot, ioh, io-ar_base); + COM_INIT_REGS(sc-sc_regs, iot, ioh, base); aprint_normal(%s, device_xname(self));
CVS commit: src/sys/sys
Module Name:src Committed By: reinoud Date: Mon Jul 13 15:40:45 UTC 2009 Modified Files: src/sys/sys: disklabel.h Log Message: Pretty print comment adaptions for UDF and EFS so they line up nicely again. To generate a diff of this commit: cvs rdiff -u -r1.103 -r1.104 src/sys/sys/disklabel.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/disklabel.h diff -u src/sys/sys/disklabel.h:1.103 src/sys/sys/disklabel.h:1.104 --- src/sys/sys/disklabel.h:1.103 Tue Dec 30 19:38:36 2008 +++ src/sys/sys/disklabel.h Mon Jul 13 15:40:44 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: disklabel.h,v 1.103 2008/12/30 19:38:36 reinoud Exp $ */ +/* $NetBSD: disklabel.h,v 1.104 2009/07/13 15:40:44 reinoud Exp $ */ /* * Copyright (c) 1987, 1988, 1993 @@ -348,9 +348,9 @@ x(APPLEUFS,22, Apple UFS, ffs, ffs) /* Apple UFS */ \ /* XXX this is not the same as FreeBSD. How to solve? */ \ x(VINUM, 23, vinum, NULL,NULL) /* Vinum */ \ -x(UDF, 24, UDF,NULL, udf) /* UDF */ \ +x(UDF, 24, UDF,NULL, udf) /* UDF */ \ x(SYSVBFS, 25, SysVBFS,NULL, sysvbfs)/* System V boot file system */ \ -x(EFS, 26, EFS,NULL, efs) /* SGI's Extent Filesystem */ +x(EFS, 26, EFS,NULL, efs) /* SGI's Extent Filesystem */ \ #ifndef _LOCORE #define FS_TYPENUMS(tag, number, name, fsck, mount) __CONCAT(FS_,tag=number),
CVS commit: src/usr.bin/fstat
Module Name:src Committed By: christos Date: Mon Jul 13 17:57:35 UTC 2009 Modified Files: src/usr.bin/fstat: misc.c Log Message: sys/mqueue.h needs sys/types.h now To generate a diff of this commit: cvs rdiff -u -r1.4 -r1.5 src/usr.bin/fstat/misc.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/fstat/misc.c diff -u src/usr.bin/fstat/misc.c:1.4 src/usr.bin/fstat/misc.c:1.5 --- src/usr.bin/fstat/misc.c:1.4 Sun Apr 12 02:36:12 2009 +++ src/usr.bin/fstat/misc.c Mon Jul 13 13:57:35 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: misc.c,v 1.4 2009/04/12 06:36:12 lukem Exp $ */ +/* $NetBSD: misc.c,v 1.5 2009/07/13 17:57:35 christos Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -30,10 +30,11 @@ */ #include sys/cdefs.h -__RCSID($NetBSD: misc.c,v 1.4 2009/04/12 06:36:12 lukem Exp $); +__RCSID($NetBSD: misc.c,v 1.5 2009/07/13 17:57:35 christos Exp $); #include stdbool.h #include sys/param.h +#include sys/types.h #include sys/time.h #include sys/stat.h #include sys/condvar.h
CVS commit: src/sbin/mount_udf
Module Name:src Committed By: reinoud Date: Mon Jul 13 17:58:10 UTC 2009 Modified Files: src/sbin/mount_udf: mount_udf.8 Log Message: Remove the comment on disc space accounting from the bugs section; it has been fixed. To generate a diff of this commit: cvs rdiff -u -r1.11 -r1.12 src/sbin/mount_udf/mount_udf.8 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sbin/mount_udf/mount_udf.8 diff -u src/sbin/mount_udf/mount_udf.8:1.11 src/sbin/mount_udf/mount_udf.8:1.12 --- src/sbin/mount_udf/mount_udf.8:1.11 Sun Feb 8 21:56:57 2009 +++ src/sbin/mount_udf/mount_udf.8 Mon Jul 13 17:58:10 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: mount_udf.8,v 1.11 2009/02/08 21:56:57 wiz Exp $ +.\ $NetBSD: mount_udf.8,v 1.12 2009/07/13 17:58:10 reinoud Exp $ .\ .\ Copyright (c) 2006, 2008 Reinoud Zandijk .\ All rights reserved. @@ -32,7 +32,7 @@ .\ .\ Id: LICENSE,v 1.2 2000/06/14 15:57:33 cgd Exp .\ -.Dd February 8, 2009 +.Dd July 13, 2009 .Dt MOUNT_UDF 8 .Os .Sh NAME @@ -141,8 +141,5 @@ Write support for UDF version 2.50 is not completely mature and UDF version 2.01 should be used if possible; this is also the default format. .Pp -Disk space accounting is not upto par and care should be taken not to write -too much on a disk. -.Pp Due to lack of test media and recording devices, BluRay support and in particular BluRay-R is still preliminary as of writing.
CVS commit: src
Module Name:src Committed By: roy Date: Mon Jul 13 19:05:42 UTC 2009 Modified Files: src/bin/pax: options.c src/dist/nawk: maketab.c proctab.c proto.h run.c src/dist/pf/usr.sbin/ftp-proxy: ftp-proxy.c src/games/boggle/boggle: bog.c extern.h mach.c src/games/cribbage: crib.c cribbage.h io.c src/games/gomoku: bdisp.c gomoku.h main.c src/libexec/ftpd: extern.h ftpcmd.y ftpd.c src/usr.bin/csplit: csplit.c src/usr.bin/ctags: C.c ctags.h fortran.c lisp.c print.c yacc.c src/usr.bin/fsplit: fsplit.c src/usr.bin/ftp: cmds.c extern.h fetch.c main.c util.c src/usr.bin/gencat: gencat.c src/usr.bin/rs: rs.c src/usr.bin/unifdef: unifdef.c src/usr.sbin/inetd: inetd.c src/usr.sbin/lpr/common_source: common.c displayq.c lp.h rmjob.c src/usr.sbin/lpr/lpc: cmds.c src/usr.sbin/lpr/lpd: printjob.c Log Message: Rename internal getline() function to get_line() so it does conflict with the soon to be added getline(3) libc function. To generate a diff of this commit: cvs rdiff -u -r1.104 -r1.105 src/bin/pax/options.c cvs rdiff -u -r1.11 -r1.12 src/dist/nawk/maketab.c cvs rdiff -u -r1.10 -r1.11 src/dist/nawk/proctab.c cvs rdiff -u -r1.8 -r1.9 src/dist/nawk/proto.h cvs rdiff -u -r1.28 -r1.29 src/dist/nawk/run.c cvs rdiff -u -r1.2 -r1.3 src/dist/pf/usr.sbin/ftp-proxy/ftp-proxy.c cvs rdiff -u -r1.22 -r1.23 src/games/boggle/boggle/bog.c cvs rdiff -u -r1.9 -r1.10 src/games/boggle/boggle/extern.h cvs rdiff -u -r1.18 -r1.19 src/games/boggle/boggle/mach.c cvs rdiff -u -r1.22 -r1.23 src/games/cribbage/crib.c src/games/cribbage/io.c cvs rdiff -u -r1.13 -r1.14 src/games/cribbage/cribbage.h cvs rdiff -u -r1.11 -r1.12 src/games/gomoku/bdisp.c cvs rdiff -u -r1.15 -r1.16 src/games/gomoku/gomoku.h cvs rdiff -u -r1.18 -r1.19 src/games/gomoku/main.c cvs rdiff -u -r1.60 -r1.61 src/libexec/ftpd/extern.h cvs rdiff -u -r1.89 -r1.90 src/libexec/ftpd/ftpcmd.y cvs rdiff -u -r1.193 -r1.194 src/libexec/ftpd/ftpd.c cvs rdiff -u -r1.4 -r1.5 src/usr.bin/csplit/csplit.c cvs rdiff -u -r1.18 -r1.19 src/usr.bin/ctags/C.c cvs rdiff -u -r1.8 -r1.9 src/usr.bin/ctags/ctags.h cvs rdiff -u -r1.10 -r1.11 src/usr.bin/ctags/fortran.c \ src/usr.bin/ctags/lisp.c cvs rdiff -u -r1.9 -r1.10 src/usr.bin/ctags/print.c cvs rdiff -u -r1.11 -r1.12 src/usr.bin/ctags/yacc.c cvs rdiff -u -r1.26 -r1.27 src/usr.bin/fsplit/fsplit.c cvs rdiff -u -r1.129 -r1.130 src/usr.bin/ftp/cmds.c cvs rdiff -u -r1.76 -r1.77 src/usr.bin/ftp/extern.h cvs rdiff -u -r1.187 -r1.188 src/usr.bin/ftp/fetch.c cvs rdiff -u -r1.116 -r1.117 src/usr.bin/ftp/main.c cvs rdiff -u -r1.151 -r1.152 src/usr.bin/ftp/util.c cvs rdiff -u -r1.29 -r1.30 src/usr.bin/gencat/gencat.c cvs rdiff -u -r1.13 -r1.14 src/usr.bin/rs/rs.c cvs rdiff -u -r1.14 -r1.15 src/usr.bin/unifdef/unifdef.c cvs rdiff -u -r1.112 -r1.113 src/usr.sbin/inetd/inetd.c cvs rdiff -u -r1.39 -r1.40 src/usr.sbin/lpr/common_source/common.c cvs rdiff -u -r1.33 -r1.34 src/usr.sbin/lpr/common_source/displayq.c cvs rdiff -u -r1.23 -r1.24 src/usr.sbin/lpr/common_source/lp.h cvs rdiff -u -r1.24 -r1.25 src/usr.sbin/lpr/common_source/rmjob.c cvs rdiff -u -r1.21 -r1.22 src/usr.sbin/lpr/lpc/cmds.c cvs rdiff -u -r1.54 -r1.55 src/usr.sbin/lpr/lpd/printjob.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/bin/pax/options.c diff -u src/bin/pax/options.c:1.104 src/bin/pax/options.c:1.105 --- src/bin/pax/options.c:1.104 Tue Apr 7 19:52:35 2009 +++ src/bin/pax/options.c Mon Jul 13 19:05:39 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: options.c,v 1.104 2009/04/07 19:52:35 perry Exp $ */ +/* $NetBSD: options.c,v 1.105 2009/07/13 19:05:39 roy Exp $ */ /*- * Copyright (c) 1992 Keith Muller. @@ -42,7 +42,7 @@ #if 0 static char sccsid[] = @(#)options.c 8.2 (Berkeley) 4/18/94; #else -__RCSID($NetBSD: options.c,v 1.104 2009/04/07 19:52:35 perry Exp $); +__RCSID($NetBSD: options.c,v 1.105 2009/07/13 19:05:39 roy Exp $); #endif #endif /* not lint */ @@ -85,7 +85,7 @@ static void printflg(unsigned int); static int c_frmt(const void *, const void *); static off_t str_offt(char *); -static char *getline(FILE *fp); +static char *get_line(FILE *fp); static void pax_options(int, char **); static void pax_usage(void); static void tar_options(int, char **); @@ -95,10 +95,10 @@ static void cpio_usage(void); #endif -/* errors from getline */ +/* errors from get_line */ #define GETLINE_FILE_CORRUPT 1 #define GETLINE_OUT_OF_MEM 2 -static int getline_error; +static int get_line_error; #define BZIP2_CMD bzip2 /* command to run as bzip2 */ #define GZIP_CMD gzip /* command to run as gzip */ @@ -1210,7 +1210,7 @@ tty_warn(1, Unable to open file '%s' for read, file); tar_usage(); } - while ((str = getline(fp)) != NULL) { + while ((str = get_line(fp)) != NULL) { if (dirisnext) { if (dir
CVS commit: src/usr.bin/fstat
Module Name:src Committed By: christos Date: Mon Jul 13 21:43:24 UTC 2009 Modified Files: src/usr.bin/fstat: misc.c Log Message: need _KMEMUSER too. To generate a diff of this commit: cvs rdiff -u -r1.5 -r1.6 src/usr.bin/fstat/misc.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/fstat/misc.c diff -u src/usr.bin/fstat/misc.c:1.5 src/usr.bin/fstat/misc.c:1.6 --- src/usr.bin/fstat/misc.c:1.5 Mon Jul 13 13:57:35 2009 +++ src/usr.bin/fstat/misc.c Mon Jul 13 17:43:24 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: misc.c,v 1.5 2009/07/13 17:57:35 christos Exp $ */ +/* $NetBSD: misc.c,v 1.6 2009/07/13 21:43:24 christos Exp $ */ /*- * Copyright (c) 2008 The NetBSD Foundation, Inc. @@ -30,10 +30,11 @@ */ #include sys/cdefs.h -__RCSID($NetBSD: misc.c,v 1.5 2009/07/13 17:57:35 christos Exp $); +__RCSID($NetBSD: misc.c,v 1.6 2009/07/13 21:43:24 christos Exp $); #include stdbool.h #include sys/param.h +#define _KMEMUSER #include sys/types.h #include sys/time.h #include sys/stat.h
CVS commit: src
Module Name:src Committed By: roy Date: Mon Jul 13 22:19:25 UTC 2009 Modified Files: src/distrib/sets/lists/comp: mi src/include: stdio.h src/lib/libc/stdio: Makefile.inc stdio.3 Added Files: src/lib/libc/stdio: getdelim.3 getdelim.c getline.c Log Message: Add implementations for getdelim(3) and getline(3). To generate a diff of this commit: cvs rdiff -u -r1.1277 -r1.1278 src/distrib/sets/lists/comp/mi cvs rdiff -u -r1.73 -r1.74 src/include/stdio.h cvs rdiff -u -r1.35 -r1.36 src/lib/libc/stdio/Makefile.inc cvs rdiff -u -r0 -r1.1 src/lib/libc/stdio/getdelim.3 \ src/lib/libc/stdio/getdelim.c src/lib/libc/stdio/getline.c cvs rdiff -u -r1.20 -r1.21 src/lib/libc/stdio/stdio.3 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/comp/mi diff -u src/distrib/sets/lists/comp/mi:1.1277 src/distrib/sets/lists/comp/mi:1.1278 --- src/distrib/sets/lists/comp/mi:1.1277 Wed Jul 8 21:23:52 2009 +++ src/distrib/sets/lists/comp/mi Mon Jul 13 22:19:24 2009 @@ -1,4 +1,4 @@ -# $NetBSD: mi,v 1.1277 2009/07/08 21:23:52 tls Exp $ +# $NetBSD: mi,v 1.1278 2009/07/13 22:19:24 roy Exp $ # # Note: don't delete entries from here - mark them as obsolete instead. # @@ -5557,6 +5557,7 @@ ./usr/share/man/cat3/getcwd.0 comp-c-catman .cat ./usr/share/man/cat3/getdate.0 comp-c-catman .cat ./usr/share/man/cat3/getdate_err.0 comp-c-catman .cat +./usr/share/man/cat3/getdelim.0 comp-c-catman .cat ./usr/share/man/cat3/getdevmajor.0 comp-c-catman .cat ./usr/share/man/cat3/getdirentries.0 comp-c-catman .cat ./usr/share/man/cat3/getdiskbyname.0 comp-c-catman .cat @@ -5586,6 +5587,7 @@ ./usr/share/man/cat3/getlabeloffset.0 comp-c-catman .cat ./usr/share/man/cat3/getlabelsector.0 comp-c-catman .cat ./usr/share/man/cat3/getlastlogx.0 comp-c-catman .cat +./usr/share/man/cat3/getline.0 comp-c-catman .cat ./usr/share/man/cat3/getloadavg.0 comp-c-catman .cat ./usr/share/man/cat3/getmaxpartitions.0 comp-c-catman .cat ./usr/share/man/cat3/getmaxx.0 comp-c-catman .cat @@ -16459,6 +16461,7 @@ ./usr/share/man/man3/getcwd.3 comp-c-man .man ./usr/share/man/man3/getdate.3 comp-c-man .man ./usr/share/man/man3/getdate_err.3 comp-c-man .man +./usr/share/man/man3/getdelim.3 comp-c-man .man ./usr/share/man/man3/getdevmajor.3 comp-c-man .man ./usr/share/man/man3/getdirentries.3 comp-c-man .man ./usr/share/man/man3/getdiskbyname.3 comp-c-man .man @@ -16488,6 +16491,7 @@ ./usr/share/man/man3/getlabeloffset.3 comp-c-man .man ./usr/share/man/man3/getlabelsector.3 comp-c-man .man ./usr/share/man/man3/getlastlogx.3 comp-c-man .man +./usr/share/man/man3/getline.3 comp-c-man .man ./usr/share/man/man3/getloadavg.3 comp-c-man .man ./usr/share/man/man3/getmaxpartitions.3 comp-c-man .man ./usr/share/man/man3/getmaxx.3 comp-c-man .man Index: src/include/stdio.h diff -u src/include/stdio.h:1.73 src/include/stdio.h:1.74 --- src/include/stdio.h:1.73 Sun Sep 21 16:59:46 2008 +++ src/include/stdio.h Mon Jul 13 22:19:24 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: stdio.h,v 1.73 2008/09/21 16:59:46 christos Exp $ */ +/* $NetBSD: stdio.h,v 1.74 2009/07/13 22:19:24 roy Exp $ */ /*- * Copyright (c) 1990, 1993 @@ -46,6 +46,10 @@ typedef _BSD_SIZE_T_ size_t; #undef _BSD_SIZE_T_ #endif +#ifdef _BSD_SSIZE_T_ +typedef _BSD_SSIZE_T_ ssize_t; +#undef _BSD_SSIZE_T_ +#endif #include sys/null.h @@ -236,6 +240,9 @@ size_t fwrite(const void * __restrict, size_t, size_t, FILE * __restrict); int getc(FILE *); int getchar(void); +ssize_t getdelim(char ** __restrict, size_t * __restrict, int, + FILE * __restrict); +ssize_t getline(char ** __restrict, size_t * __restrict, FILE * __restrict); void perror(const char *); int printf(const char * __restrict, ...) __attribute__((__format__(__printf__, 1, 2))); Index: src/lib/libc/stdio/Makefile.inc diff -u src/lib/libc/stdio/Makefile.inc:1.35 src/lib/libc/stdio/Makefile.inc:1.36 --- src/lib/libc/stdio/Makefile.inc:1.35 Sat Feb 3 00:28:56 2007 +++ src/lib/libc/stdio/Makefile.inc Mon Jul 13 22:19:25 2009 @@ -1,5 +1,5 @@ # from: @(#)Makefile.inc 5.7 (Berkeley) 6/27/91 -# $NetBSD: Makefile.inc,v 1.35 2007/02/03 00:28:56 christos Exp $ +# $NetBSD: Makefile.inc,v 1.36 2009/07/13 22:19:25 roy Exp $ # stdio sources .PATH: ${.CURDIR}/stdio @@ -12,10 +12,10 @@ fprintf.c fpurge.c fputc.c fputs.c fputwc.c fputws.c fread.c \ freopen.c fscanf.c fseek.c fseeko.c fsetpos.c ftell.c ftello.c \ funopen.c fvwrite.c fwalk.c fwide.c fwprintf.c fwrite.c fwscanf.c \ - getc.c getchar.c gettemp.c getw.c getwc.c getwchar.c makebuf.c \ - mkdtemp.c mkstemp.c perror.c printf.c putc.c putchar.c puts.c \ - putw.c putwc.c putwchar.c refill.c remove.c rewind.c rget.c \ - scanf.c setbuf.c setbuffer.c setvbuf.c snprintf.c snprintf_ss.c \ + getc.c getchar.c getdelim.c getline.c gettemp.c getw.c getwc.c \ +
CVS commit: src/doc
Module Name:src Committed By: roy Date: Mon Jul 13 22:25:30 UTC 2009 Modified Files: src/doc: CHANGES Log Message: Add getdelim(3) and getlime(3) To generate a diff of this commit: cvs rdiff -u -r1.1251 -r1.1252 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.1251 src/doc/CHANGES:1.1252 --- src/doc/CHANGES:1.1251 Fri Jul 10 15:59:38 2009 +++ src/doc/CHANGES Mon Jul 13 22:25:30 2009 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1251 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1252 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -318,4 +318,6 @@ dhcpcd(8): Import dhcpcd-5.0.6 [roy 20090708] sysmon_envsys(8): Enhancements to allow access to driver-internal limit values [pgoyette 20090710] + libc: Add getdelim(3) and getline(3) conforming to + IEEE Std 1003.1-2008 (``POSIX.1'')
CVS commit: src/lib/libc/stdio
Module Name:src Committed By: wiz Date: Mon Jul 13 22:30:53 UTC 2009 Modified Files: src/lib/libc/stdio: getdelim.3 Log Message: The character is NUL, the pointer is NULL. Fix a typo. It's \-1, not -1. Add and getline in a few places. Add comma in enumeration. No dot needed in SEE ALSO. End sentence with a dot. To generate a diff of this commit: cvs rdiff -u -r1.1 -r1.2 src/lib/libc/stdio/getdelim.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/stdio/getdelim.3 diff -u src/lib/libc/stdio/getdelim.3:1.1 src/lib/libc/stdio/getdelim.3:1.2 --- src/lib/libc/stdio/getdelim.3:1.1 Mon Jul 13 22:19:25 2009 +++ src/lib/libc/stdio/getdelim.3 Mon Jul 13 22:30:52 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: getdelim.3,v 1.1 2009/07/13 22:19:25 roy Exp $ +.\ $NetBSD: getdelim.3,v 1.2 2009/07/13 22:30:52 wiz Exp $ .\ .\ Copyright (c) 2009 The NetBSD Foundation, Inc. .\ All rights reserved. @@ -52,18 +52,18 @@ character, storing the input in .Fa *lineptr . The buffer is -.Dv NULL -terminated and includes the delimiter. +.Dv NUL Ns No -terminated +and includes the delimiter. .Pp If .Fa *n -is non zero, then +is non-zero, then .Fa *lineptr must be pre-allocated to at least .Fa *n bytes. .Fn getdelim -enures that +ensures that .Fa *lineptr is large enough to hold the input, updating .Fa *n @@ -76,8 +76,10 @@ .Sh RETURN VALUES The .Fn getdelim -function return the number of characters read, including the delimiter. -If an error occurs the function return -1 and the global variable +and +.Fn getline +functions return the number of characters read, including the delimiter. +If an error occurs, the functions return \-1 and the global variable .Va errno is set to indicate the error. .Sh ERRORS @@ -95,24 +97,25 @@ .Pp The .Fn getdelim -function may also fail and set +and +.Fn getline +functions may also fail and set .Va errno for any of the errors specified in the routines .Xr fflush 3 , .Xr malloc 3 , .Xr read 2 , -.Xr stat 2 +.Xr stat 2 , or .Xr realloc 3 . .Sh SEE ALSO .Xr ferror 3 , .Xr fgets 3 , -.Xr fopen 3 . +.Xr fopen 3 .Sh STANDARDS The .Fn getdelim and .Fn getline -functions -conform to -.St -p1003.1-2008 +functions conform to +.St -p1003.1-2008 .
CVS commit: src/lib/libc/stdio
Module Name:src Committed By: wiz Date: Mon Jul 13 22:31:59 UTC 2009 Modified Files: src/lib/libc/stdio: stdio.3 Log Message: Fix typo added in previous. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/lib/libc/stdio/stdio.3 Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/lib/libc/stdio/stdio.3 diff -u src/lib/libc/stdio/stdio.3:1.21 src/lib/libc/stdio/stdio.3:1.22 --- src/lib/libc/stdio/stdio.3:1.21 Mon Jul 13 22:19:25 2009 +++ src/lib/libc/stdio/stdio.3 Mon Jul 13 22:31:59 2009 @@ -1,4 +1,4 @@ -.\ $NetBSD: stdio.3,v 1.21 2009/07/13 22:19:25 roy Exp $ +.\ $NetBSD: stdio.3,v 1.22 2009/07/13 22:31:59 wiz Exp $ .\ .\ Copyright (c) 1990, 1991, 1993 .\ The Regents of the University of California. All rights reserved. @@ -271,7 +271,7 @@ .It fwide set/get orientation of a stream .It fwopen open a stream .It fwrite binary stream input/output -.It getc get next character or word from inputt stream +.It getc get next character or word from input stream .It getc_unlocked get next character or word from input stream .It Ta (no implicit locking) .It getchar get next character or word from input stream
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Mon Jul 13 23:31:19 UTC 2009 Modified Files: src/sys/dev/pci: if_wm.c Log Message: Check PCI-X mode as e1000 driver. To generate a diff of this commit: cvs rdiff -u -r1.175 -r1.176 src/sys/dev/pci/if_wm.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/pci/if_wm.c diff -u src/sys/dev/pci/if_wm.c:1.175 src/sys/dev/pci/if_wm.c:1.176 --- src/sys/dev/pci/if_wm.c:1.175 Fri May 29 04:57:04 2009 +++ src/sys/dev/pci/if_wm.c Mon Jul 13 23:31:19 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: if_wm.c,v 1.175 2009/05/29 04:57:04 darran Exp $ */ +/* $NetBSD: if_wm.c,v 1.176 2009/07/13 23:31:19 msaitoh Exp $ */ /* * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc. @@ -76,7 +76,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.175 2009/05/29 04:57:04 darran Exp $); +__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.176 2009/07/13 23:31:19 msaitoh Exp $); #include bpfilter.h #include rnd.h @@ -1129,8 +1129,7 @@ reg = CSR_READ(sc, WMREG_STATUS); if (reg STATUS_BUS64) sc-sc_flags |= WM_F_BUS64; - if (sc-sc_type = WM_T_82544 - (reg STATUS_PCIX_MODE) != 0) { + if ((reg STATUS_PCIX_MODE) != 0) { pcireg_t pcix_cmd, pcix_sts, bytecnt, maxb; sc-sc_flags |= WM_F_PCIX;
CVS commit: src/sys/dev/pci
Module Name:src Committed By: msaitoh Date: Tue Jul 14 00:00:44 UTC 2009 Modified Files: src/sys/dev/pci: if_wm.c if_wmreg.h Log Message: Some fixes for i80003 and ICH{8,9,10) from e1000 driver and document: Add setting for KABGTXD register for ICH{8,9,10}. ICH9 and ICH10 has no FCAL, FCAH and FCT like ICH8. Add special setting for FCTTV and TCTL_EXT register for i80003 The special setting fopr TIPG is only for i80003. Some of kumeran settings are only for i80003's bugs. Add some ICH10 fixes. To generate a diff of this commit: cvs rdiff -u -r1.176 -r1.177 src/sys/dev/pci/if_wm.c cvs rdiff -u -r1.27 -r1.28 src/sys/dev/pci/if_wmreg.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/pci/if_wm.c diff -u src/sys/dev/pci/if_wm.c:1.176 src/sys/dev/pci/if_wm.c:1.177 --- src/sys/dev/pci/if_wm.c:1.176 Mon Jul 13 23:31:19 2009 +++ src/sys/dev/pci/if_wm.c Tue Jul 14 00:00:44 2009 @@ -1,4 +1,4 @@ -/* $NetBSD: if_wm.c,v 1.176 2009/07/13 23:31:19 msaitoh Exp $ */ +/* $NetBSD: if_wm.c,v 1.177 2009/07/14 00:00:44 msaitoh Exp $ */ /* * Copyright (c) 2001, 2002, 2003, 2004 Wasabi Systems, Inc. @@ -76,7 +76,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.176 2009/07/13 23:31:19 msaitoh Exp $); +__KERNEL_RCSID(0, $NetBSD: if_wm.c,v 1.177 2009/07/14 00:00:44 msaitoh Exp $); #include bpfilter.h #include rnd.h @@ -3264,7 +3264,8 @@ * * XXX Values could probably stand some tuning. */ - if (sc-sc_type != WM_T_ICH8) { + if ((sc-sc_type != WM_T_ICH8) (sc-sc_type != WM_T_ICH9) + (sc-sc_type != WM_T_ICH10)) { CSR_WRITE(sc, WMREG_FCAL, FCAL_CONST); CSR_WRITE(sc, WMREG_FCAH, FCAH_CONST); CSR_WRITE(sc, WMREG_FCT, ETHERTYPE_FLOWCONTROL); @@ -3278,7 +3279,11 @@ CSR_WRITE(sc, WMREG_FCRTH, FCRTH_DFLT); CSR_WRITE(sc, WMREG_FCRTL, sc-sc_fcrtl); } - CSR_WRITE(sc, WMREG_FCTTV, FCTTV_DFLT); + + if (sc-sc_type == WM_T_80003) + CSR_WRITE(sc, WMREG_FCTTV, 0x); + else + CSR_WRITE(sc, WMREG_FCTTV, FCTTV_DFLT); /* Deal with VLAN enables. */ if (VLAN_ATTACHED(sc-sc_ethercom)) @@ -3288,29 +3293,47 @@ /* Write the control registers. */ CSR_WRITE(sc, WMREG_CTRL, sc-sc_ctrl); - if (sc-sc_type = WM_T_80003 (sc-sc_flags WM_F_HAS_MII)) { + + if (sc-sc_flags WM_F_HAS_MII) { int val; - val = CSR_READ(sc, WMREG_CTRL_EXT); - val = ~CTRL_EXT_LINK_MODE_MASK; - CSR_WRITE(sc, WMREG_CTRL_EXT, val); - - /* Bypass RX and TX FIFO's */ - wm_kmrn_i80003_writereg(sc, KUMCTRLSTA_OFFSET_FIFO_CTRL, - KUMCTRLSTA_FIFO_CTRL_RX_BYPASS | - KUMCTRLSTA_FIFO_CTRL_TX_BYPASS); + + switch (sc-sc_type) { + case WM_T_80003: + case WM_T_ICH8: + case WM_T_ICH9: + case WM_T_ICH10: + /* + * Set the mac to wait the maximum time between each + * iteration and increase the max iterations when + * polling the phy; this fixes erroneous timeouts at + * 10Mbps. + */ + wm_kmrn_i80003_writereg(sc, KUMCTRLSTA_OFFSET_TIMEOUTS, + 0x); + val = wm_kmrn_i80003_readreg(sc, + KUMCTRLSTA_OFFSET_INB_PARAM); + val |= 0x3F; + wm_kmrn_i80003_writereg(sc, + KUMCTRLSTA_OFFSET_INB_PARAM, val); + break; + default: + break; + } + + if (sc-sc_type == WM_T_80003) { + val = CSR_READ(sc, WMREG_CTRL_EXT); + val = ~CTRL_EXT_LINK_MODE_MASK; + CSR_WRITE(sc, WMREG_CTRL_EXT, val); + + /* Bypass RX and TX FIFO's */ + wm_kmrn_i80003_writereg(sc, KUMCTRLSTA_OFFSET_FIFO_CTRL, + KUMCTRLSTA_FIFO_CTRL_RX_BYPASS | + KUMCTRLSTA_FIFO_CTRL_TX_BYPASS); - wm_kmrn_i80003_writereg(sc, KUMCTRLSTA_OFFSET_INB_CTRL, - KUMCTRLSTA_INB_CTRL_DIS_PADDING | - KUMCTRLSTA_INB_CTRL_LINK_TMOUT_DFLT); - /* - * Set the mac to wait the maximum time between each - * iteration and increase the max iterations when - * polling the phy; this fixes erroneous timeouts at 10Mbps. - */ - wm_kmrn_i80003_writereg(sc, KUMCTRLSTA_OFFSET_TIMEOUTS, 0x); - val = wm_kmrn_i80003_readreg(sc, KUMCTRLSTA_OFFSET_INB_PARAM); - val |= 0x3F; - wm_kmrn_i80003_writereg(sc, KUMCTRLSTA_OFFSET_INB_PARAM, val); + wm_kmrn_i80003_writereg(sc, KUMCTRLSTA_OFFSET_INB_CTRL, + KUMCTRLSTA_INB_CTRL_DIS_PADDING | + KUMCTRLSTA_INB_CTRL_LINK_TMOUT_DFLT); + } } #if 0 CSR_WRITE(sc, WMREG_CTRL_EXT, sc-sc_ctrl_ext); @@ -3342,6 +3365,13 @@ sc-sc_icr |= ICR_RXCFG; CSR_WRITE(sc, WMREG_IMS, sc-sc_icr); + if ((sc-sc_type == WM_T_ICH8) || (sc-sc_type == WM_T_ICH9) + || (sc-sc_type == WM_T_ICH10)) { + reg = CSR_READ(sc, WMREG_KABGTXD); + reg |= KABGTXD_BGSQLBIAS; + CSR_WRITE(sc, WMREG_KABGTXD, reg); + } + /* Set up the inter-packet gap. */ CSR_WRITE(sc, WMREG_TIPG, sc-sc_tipg); @@ -3385,6 +3415,13 @@ sc-sc_tctl |= TCTL_RTLC; CSR_WRITE(sc, WMREG_TCTL, sc-sc_tctl); + if (sc-sc_type == WM_T_80003) { + reg = CSR_READ(sc, WMREG_TCTL_EXT); + reg = ~TCTL_EXT_GCEX_MASK; + reg |=
CVS commit: src/doc
Module Name:src Committed By: roy Date: Tue Jul 14 05:58:15 UTC 2009 Modified Files: src/doc: CHANGES Log Message: Add who and date to getdelim(3) and getline(3) additions. To generate a diff of this commit: cvs rdiff -u -r1.1252 -r1.1253 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.1252 src/doc/CHANGES:1.1253 --- src/doc/CHANGES:1.1252 Mon Jul 13 22:25:30 2009 +++ src/doc/CHANGES Tue Jul 14 05:58:15 2009 @@ -1,4 +1,4 @@ -# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1252 $ +# LIST OF CHANGES FROM LAST RELEASE: $Revision: 1.1253 $ # # # [Note: This file does not mention every change made to the NetBSD source tree. @@ -319,5 +319,5 @@ sysmon_envsys(8): Enhancements to allow access to driver-internal limit values [pgoyette 20090710] libc: Add getdelim(3) and getline(3) conforming to - IEEE Std 1003.1-2008 (``POSIX.1'') + IEEE Std 1003.1-2008 (``POSIX.1'') [roy 20090713]