CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Mon Jan 21 08:02:01 UTC 2013 Modified Files: src/sys/dev/usb: dwc_otg.c Log Message: Don't use magic number To generate a diff of this commit: cvs rdiff -u -r1.30 -r1.31 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.30 src/sys/dev/usb/dwc_otg.c:1.31 --- src/sys/dev/usb/dwc_otg.c:1.30 Mon Jan 21 07:39:59 2013 +++ src/sys/dev/usb/dwc_otg.c Mon Jan 21 08:02:01 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: dwc_otg.c,v 1.30 2013/01/21 07:39:59 skrll Exp $ */ +/* $NetBSD: dwc_otg.c,v 1.31 2013/01/21 08:02:01 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.30 2013/01/21 07:39:59 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.31 2013/01/21 08:02:01 skrll Exp $); #include sys/param.h #include sys/systm.h @@ -3620,7 +3620,7 @@ dwc_otg_setup_standard_chain_sub(struct td-got_short = 0; td-did_nak = 0; td-channel = DWC_OTG_MAX_CHANNELS; - td-state = 0; + td-state = DWC_CHAN_ST_START; td-errcnt = 0; td-retrycnt = 0; td-toggle = 0;
CVS commit: src/sys/kern
Module Name:src
Committed By: hannken
Date: Mon Jan 21 09:14:01 UTC 2013
Modified Files:
src/sys/kern: vfs_trans.c
Log Message:
Replace the rwlock based implementation with passive serialization
from pserialize(9) and mutex / condvar.
The fast paths (fstrans_start/fstrans_done on a file system not
suspended or suspending and fscow_run with no change pending) now
run without locks or other atomic operations. Suspension and cow
handler insertion and removal is done with mutex / condvars.
The API remains unchanged.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/kern/vfs_trans.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/kern/vfs_trans.c
diff -u src/sys/kern/vfs_trans.c:1.25 src/sys/kern/vfs_trans.c:1.26
--- src/sys/kern/vfs_trans.c:1.25 Tue May 12 11:42:12 2009
+++ src/sys/kern/vfs_trans.c Mon Jan 21 09:14:01 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: vfs_trans.c,v 1.25 2009/05/12 11:42:12 yamt Exp $ */
+/* $NetBSD: vfs_trans.c,v 1.26 2013/01/21 09:14:01 hannken Exp $ */
/*-
* Copyright (c) 2007 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vfs_trans.c,v 1.25 2009/05/12 11:42:12 yamt Exp $);
+__KERNEL_RCSID(0, $NetBSD: vfs_trans.c,v 1.26 2013/01/21 09:14:01 hannken Exp $);
/*
* File system transaction operations.
@@ -38,16 +38,13 @@ __KERNEL_RCSID(0, $NetBSD: vfs_trans.c,
#include opt_ddb.h
-#if defined(DDB)
-#define _LWP_API_PRIVATE /* Need _lwp_getspecific_by_lwp() */
-#endif
-
#include sys/param.h
#include sys/systm.h
+#include sys/atomic.h
#include sys/buf.h
#include sys/kmem.h
#include sys/mount.h
-#include sys/rwlock.h
+#include sys/pserialize.h
#include sys/vnode.h
#define _FSTRANS_API_PRIVATE
#include sys/fstrans.h
@@ -57,34 +54,47 @@ __KERNEL_RCSID(0, $NetBSD: vfs_trans.c,
#include miscfs/syncfs/syncfs.h
struct fscow_handler {
- SLIST_ENTRY(fscow_handler) ch_list;
+ LIST_ENTRY(fscow_handler) ch_list;
int (*ch_func)(void *, struct buf *, bool);
void *ch_arg;
};
struct fstrans_lwp_info {
struct fstrans_lwp_info *fli_succ;
+ struct lwp *fli_self;
struct mount *fli_mount;
int fli_trans_cnt;
int fli_cow_cnt;
enum fstrans_lock_type fli_lock_type;
+ LIST_ENTRY(fstrans_lwp_info) fli_list;
};
struct fstrans_mount_info {
enum fstrans_state fmi_state;
- krwlock_t fmi_shared_lock;
- krwlock_t fmi_lazy_lock;
- krwlock_t fmi_cow_lock;
- SLIST_HEAD(, fscow_handler) fmi_cow_handler;
+ unsigned int fmi_ref_cnt;
+ bool fmi_cow_change;
+ LIST_HEAD(, fscow_handler) fmi_cow_handler;
};
-static specificdata_key_t lwp_data_key;
+static specificdata_key_t lwp_data_key; /* Our specific data key. */
static kmutex_t vfs_suspend_lock; /* Serialize suspensions. */
-static pool_cache_t fstrans_cache;
+static kmutex_t fstrans_lock; /* Fstrans big lock. */
+static kcondvar_t fstrans_state_cv; /* Fstrans or cow state changed. */
+static kcondvar_t fstrans_count_cv; /* Fstrans or cow count changed. */
+static pserialize_t fstrans_psz; /* Pserialize state. */
+static LIST_HEAD(fstrans_lwp_head, fstrans_lwp_info) fstrans_fli_head;
+ /* List of all fstrans_lwp_info. */
+static pool_cache_t fstrans_cache; /* Pool of struct fstrans_lwp_info. */
static void fstrans_lwp_dtor(void *);
-static struct fstrans_lwp_info *fstrans_get_lwp_info(struct mount *);
+static void fstrans_mount_dtor(struct mount *);
+static struct fstrans_lwp_info *fstrans_get_lwp_info(struct mount *, bool);
+static bool grant_lock(const enum fstrans_state, const enum fstrans_lock_type);
+static bool state_change_done(const struct mount *);
+static bool cow_state_change_done(const struct mount *);
+static void cow_change_enter(const struct mount *);
+static void cow_change_done(const struct mount *);
/*
- * Initialize
+ * Initialize.
*/
void
fstrans_init(void)
@@ -95,120 +105,183 @@ fstrans_init(void)
KASSERT(error == 0);
mutex_init(vfs_suspend_lock, MUTEX_DEFAULT, IPL_NONE);
+ mutex_init(fstrans_lock, MUTEX_DEFAULT, IPL_NONE);
+ cv_init(fstrans_state_cv, fstchg);
+ cv_init(fstrans_count_cv, fstcnt);
+ fstrans_psz = pserialize_create();
+ LIST_INIT(fstrans_fli_head);
fstrans_cache = pool_cache_init(sizeof(struct fstrans_lwp_info), 0, 0,
0, fstrans, NULL, IPL_NONE, NULL, NULL, NULL);
}
/*
- * Deallocate lwp state
+ * Deallocate lwp state.
*/
static void
fstrans_lwp_dtor(void *arg)
{
struct fstrans_lwp_info *fli, *fli_next;
+ mutex_enter(fstrans_lock);
for (fli = arg; fli; fli = fli_next) {
KASSERT(fli-fli_trans_cnt == 0);
KASSERT(fli-fli_cow_cnt == 0);
+ if (fli-fli_mount != NULL)
+ fstrans_mount_dtor(fli-fli_mount);
fli_next = fli-fli_succ;
+ LIST_REMOVE(fli, fli_list);
pool_cache_put(fstrans_cache, fli);
}
+ mutex_exit(fstrans_lock);
+}
+
+/*
+ * Dereference mount state.
+ */
+static void
+fstrans_mount_dtor(struct mount *mp)
+{
+ struct fstrans_mount_info
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src
Committed By: tsutsui
Date: Mon Jan 21 11:58:12 UTC 2013
Modified Files:
src/sys/arch/luna68k/stand/boot: Makefile bmc.c boot.c init_main.c
locore.S parse.c prf.c samachdep.h sio.c version
Added Files:
src/sys/arch/luna68k/stand/boot: awaitkey.c
Log Message:
Add support for await key to abort autoboot and get boot menu.
Also add command help. Bump version.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/luna68k/stand/boot/Makefile \
src/sys/arch/luna68k/stand/boot/locore.S \
src/sys/arch/luna68k/stand/boot/samachdep.h
cvs rdiff -u -r0 -r1.1 src/sys/arch/luna68k/stand/boot/awaitkey.c
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/luna68k/stand/boot/bmc.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/luna68k/stand/boot/boot.c \
src/sys/arch/luna68k/stand/boot/prf.c
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/luna68k/stand/boot/init_main.c \
src/sys/arch/luna68k/stand/boot/version
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/luna68k/stand/boot/parse.c \
src/sys/arch/luna68k/stand/boot/sio.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/luna68k/stand/boot/Makefile
diff -u src/sys/arch/luna68k/stand/boot/Makefile:1.7 src/sys/arch/luna68k/stand/boot/Makefile:1.8
--- src/sys/arch/luna68k/stand/boot/Makefile:1.7 Sun Jan 20 02:35:13 2013
+++ src/sys/arch/luna68k/stand/boot/Makefile Mon Jan 21 11:58:12 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2013/01/20 02:35:13 tsutsui Exp $
+# $NetBSD: Makefile,v 1.8 2013/01/21 11:58:12 tsutsui Exp $
# @(#)Makefile 8.2 (Berkeley) 8/15/93
NOMAN= # defined
@@ -39,7 +39,7 @@ SRCS+= conf.c
SRCS+= machdep.c
SRCS+= getline.c parse.c
SRCS+= boot.c
-SRCS+= cons.c prf.c
+SRCS+= cons.c prf.c awaitkey.c
SRCS+= romcons.c
SRCS+= sio.c
SRCS+= bmc.c bmd.c screen.c font.c kbd.c
Index: src/sys/arch/luna68k/stand/boot/locore.S
diff -u src/sys/arch/luna68k/stand/boot/locore.S:1.7 src/sys/arch/luna68k/stand/boot/locore.S:1.8
--- src/sys/arch/luna68k/stand/boot/locore.S:1.7 Sun Jan 20 03:40:55 2013
+++ src/sys/arch/luna68k/stand/boot/locore.S Mon Jan 21 11:58:12 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: locore.S,v 1.7 2013/01/20 03:40:55 tsutsui Exp $ */
+/* $NetBSD: locore.S,v 1.8 2013/01/21 11:58:12 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -535,9 +535,13 @@ ENTRY_NOPROFILE(lev5intr)
moveml %sp@+,#0x0303 | restore scratch regs
addql #2,%sp | pop pad word
jra _ASM_LABEL(rei) | all done
+
ENTRY_NOPROFILE(hardclock)
+ addql #1,_C_LABEL(tick)
rts
+BSS(tick,4)
+
ENTRY_NOPROFILE(lev6intr)
clrw %sp@-
moveml #0xC0C0,%sp@-
Index: src/sys/arch/luna68k/stand/boot/samachdep.h
diff -u src/sys/arch/luna68k/stand/boot/samachdep.h:1.7 src/sys/arch/luna68k/stand/boot/samachdep.h:1.8
--- src/sys/arch/luna68k/stand/boot/samachdep.h:1.7 Sun Jan 20 14:03:40 2013
+++ src/sys/arch/luna68k/stand/boot/samachdep.h Mon Jan 21 11:58:12 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: samachdep.h,v 1.7 2013/01/20 14:03:40 tsutsui Exp $ */
+/* $NetBSD: samachdep.h,v 1.8 2013/01/21 11:58:12 tsutsui Exp $ */
/*
* Copyright (c) 1982, 1990, 1993
@@ -54,10 +54,12 @@ typedef struct label_t {
} label_t;
/* autoconf.c */
-extern int cpuspeed;
void configure(void);
void find_devs(void);
+/* awaitkey.c */
+char awaitkey(const char *, int, bool);
+
/* bmc.c */
void bmccnprobe(struct consdev *);
void bmccninit(struct consdev *);
@@ -110,6 +112,8 @@ int getline(char *, char *);
int leinit(void *);
/* init_main.c */
+extern int cpuspeed;
+extern int hz;
extern int nplane;
extern int machtype;
@@ -130,6 +134,7 @@ int lance_intr(void);
extern u_int bootdev;
extern int dipsw1, dipsw2;
extern int cputype;
+extern volatile uint32_t tick;
int setjmp(label_t *);
int splhigh(void);
void splx(int);
@@ -153,9 +158,7 @@ void regdump(int *, int);
char *hexstr(int, int);
/* prf.c */
-#if 0
int tgetchar(void);
-#endif
/* parse.c */
int check_args(int, char **);
Index: src/sys/arch/luna68k/stand/boot/bmc.c
diff -u src/sys/arch/luna68k/stand/boot/bmc.c:1.3 src/sys/arch/luna68k/stand/boot/bmc.c:1.4
--- src/sys/arch/luna68k/stand/boot/bmc.c:1.3 Sun Jan 20 14:03:40 2013
+++ src/sys/arch/luna68k/stand/boot/bmc.c Mon Jan 21 11:58:12 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: bmc.c,v 1.3 2013/01/20 14:03:40 tsutsui Exp $ */
+/* $NetBSD: bmc.c,v 1.4 2013/01/21 11:58:12 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -116,9 +116,8 @@ bmccngetc(dev_t dev)
int c;
int unit = 1;
- while (RBUF_EMPTY(unit)) {
- DELAY(10);
- }
+ if (RBUF_EMPTY(unit))
+ return 0;
POP_RBUF(unit, c);
Index: src/sys/arch/luna68k/stand/boot/boot.c
diff -u src/sys/arch/luna68k/stand/boot/boot.c:1.1 src/sys/arch/luna68k/stand/boot/boot.c:1.2
--- src/sys/arch/luna68k/stand/boot/boot.c:1.1 Sat Jan 5 17:44:24 2013
+++ src/sys/arch/luna68k/stand/boot/boot.c Mon Jan 21 11:58:12 2013
@@ -1,4 +1,4 @@
-/* $NetBSD:
CVS commit: src/sys/arch/luna68k/stand/boot
Module Name:src
Committed By: tsutsui
Date: Mon Jan 21 13:21:05 UTC 2013
Modified Files:
src/sys/arch/luna68k/stand/boot: sd.c
Log Message:
Slightly modify sd attach message, as kernel does.
before:
sd0: HITACHI DK315C-14 rev H7H6, 2807459 512 byte blocks
after:
sd0: HITACHI DK315C-14 rev H7H6, 512 bytes/sect x 2807459 sectors
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/luna68k/stand/boot/sd.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/luna68k/stand/boot/sd.c
diff -u src/sys/arch/luna68k/stand/boot/sd.c:1.3 src/sys/arch/luna68k/stand/boot/sd.c:1.4
--- src/sys/arch/luna68k/stand/boot/sd.c:1.3 Mon Jan 14 01:37:57 2013
+++ src/sys/arch/luna68k/stand/boot/sd.c Mon Jan 21 13:21:04 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sd.c,v 1.3 2013/01/14 01:37:57 tsutsui Exp $ */
+/* $NetBSD: sd.c,v 1.4 2013/01/21 13:21:04 tsutsui Exp $ */
/*
* Copyright (c) 1992 OMRON Corporation.
@@ -199,7 +199,7 @@ sdident(struct sd_softc *sc, struct hp_d
printf(sd%d: %s %s rev %s, hd-hp_unit, idstr, idstr[8],
idstr[24]);
- printf(, %d %d byte blocks\n, sc-sc_blks, sc-sc_blksize);
+ printf(, %d bytes/sect x %d sectors\n, sc-sc_blksize, sc-sc_blks);
if (sc-sc_blksize != DEV_BSIZE) {
if (sc-sc_blksize DEV_BSIZE) {
printf(sd%d: need %d byte blocks - drive ignored\n,
CVS commit: src/sys/dev/usb
Module Name:src Committed By: skrll Date: Mon Jan 21 13:25:44 UTC 2013 Modified Files: src/sys/dev/usb: dwc_otg.c Log Message: Remove some #includes that shouldn't be here. To generate a diff of this commit: cvs rdiff -u -r1.31 -r1.32 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.31 src/sys/dev/usb/dwc_otg.c:1.32 --- src/sys/dev/usb/dwc_otg.c:1.31 Mon Jan 21 08:02:01 2013 +++ src/sys/dev/usb/dwc_otg.c Mon Jan 21 13:25:44 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: dwc_otg.c,v 1.31 2013/01/21 08:02:01 skrll Exp $ */ +/* $NetBSD: dwc_otg.c,v 1.32 2013/01/21 13:25:44 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.31 2013/01/21 08:02:01 skrll Exp $); +__KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v 1.32 2013/01/21 13:25:44 skrll Exp $); #include sys/param.h #include sys/systm.h @@ -84,9 +84,6 @@ __KERNEL_RCSID(0, $NetBSD: dwc_otg.c,v #include dev/usb/usbroothub_subr.h -#include arm/broadcom/bcm2835reg.h -#include arm/broadcom/bcm2835_mbox.h - #ifdef DOTG_COUNTERS #define DOTG_EVCNT_ADD(a,b) ((void)((a).ev_count += (b))) #else
CVS commit: src/sys/dev/wscons
Module Name:src
Committed By: macallan
Date: Mon Jan 21 14:15:03 UTC 2013
Modified Files:
src/sys/dev/wscons: wsconsio.h
Log Message:
add WSDISPLAY_TYPE_OMAP3
To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/sys/dev/wscons/wsconsio.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/wscons/wsconsio.h
diff -u src/sys/dev/wscons/wsconsio.h:1.105 src/sys/dev/wscons/wsconsio.h:1.106
--- src/sys/dev/wscons/wsconsio.h:1.105 Tue Jan 8 23:49:56 2013
+++ src/sys/dev/wscons/wsconsio.h Mon Jan 21 14:15:03 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: wsconsio.h,v 1.105 2013/01/08 23:49:56 jmcneill Exp $ */
+/* $NetBSD: wsconsio.h,v 1.106 2013/01/21 14:15:03 macallan Exp $ */
/*
* Copyright (c) 1996, 1997 Christopher G. Demetriou. All rights reserved.
@@ -330,6 +330,7 @@ struct wsmouse_repeat {
#define WSDISPLAY_TYPE_VALKYRIE 54 /* Apple onboard video 'valkyrie' */
#define WSDISPLAY_TYPE_IMXIPU 55 /* i.MX ipu */
#define WSDISPLAY_TYPE_VC4 56 /* Broadcom VideoCore 4 */
+#define WSDISPLAY_TYPE_OMAP3 57 /* OMAP 3530 */
/* Basic display information. Not applicable to all display types. */
struct wsdisplay_fbinfo {
CVS commit: src/sys/arch/arm/omap
Module Name:src
Committed By: macallan
Date: Mon Jan 21 14:17:39 UTC 2013
Modified Files:
src/sys/arch/arm/omap: omapfb.c
Log Message:
support WSDISPLAYIO_GET_BUSID
let WSDISPLAYIO_GTYPE return WSDISPLAY_TYPE_OMAP3
no more pretending we're some sort of PCI framebuffer
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/omap/omapfb.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/omap/omapfb.c
diff -u src/sys/arch/arm/omap/omapfb.c:1.13 src/sys/arch/arm/omap/omapfb.c:1.14
--- src/sys/arch/arm/omap/omapfb.c:1.13 Thu Jan 17 01:10:52 2013
+++ src/sys/arch/arm/omap/omapfb.c Mon Jan 21 14:17:39 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: omapfb.c,v 1.13 2013/01/17 01:10:52 macallan Exp $ */
+/* $NetBSD: omapfb.c,v 1.14 2013/01/21 14:17:39 macallan Exp $ */
/*
* Copyright (c) 2010 Michael Lorenz
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: omapfb.c,v 1.13 2013/01/17 01:10:52 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: omapfb.c,v 1.14 2013/01/21 14:17:39 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -435,9 +435,18 @@ omapfb_ioctl(void *v, void *vs, u_long c
switch (cmd) {
case WSDISPLAYIO_GTYPE:
- *(u_int *)data = WSDISPLAY_TYPE_PCIMISC;
+ *(u_int *)data = WSDISPLAY_TYPE_OMAP3;
return 0;
+ case WSDISPLAYIO_GET_BUSID:
+ {
+struct wsdisplayio_bus_id *busid;
+
+busid = data;
+busid-bus_type = WSDISPLAYIO_BUS_SOC;
+return 0;
+ }
+
case WSDISPLAYIO_GINFO:
if (ms == NULL)
return ENODEV;
CVS commit: src/sys/arch/luna68k/luna68k
Module Name:src Committed By: tsutsui Date: Mon Jan 21 14:42:24 UTC 2013 Modified Files: src/sys/arch/luna68k/luna68k: locore.s Log Message: Account idepth properly in timer interrupt handler. To generate a diff of this commit: cvs rdiff -u -r1.50 -r1.51 src/sys/arch/luna68k/luna68k/locore.s 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/luna68k/luna68k/locore.s diff -u src/sys/arch/luna68k/luna68k/locore.s:1.50 src/sys/arch/luna68k/luna68k/locore.s:1.51 --- src/sys/arch/luna68k/luna68k/locore.s:1.50 Fri Jan 18 18:41:12 2013 +++ src/sys/arch/luna68k/luna68k/locore.s Mon Jan 21 14:42:24 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.50 2013/01/18 18:41:12 tsutsui Exp $ */ +/* $NetBSD: locore.s,v 1.51 2013/01/21 14:42:24 tsutsui Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -819,6 +819,7 @@ ENTRY_NOPROFILE(intrhand_vectored) #if 1 /* XXX wild timer -- how can I disable/enable the interrupt? */ ENTRY_NOPROFILE(lev5intr) + addql #1,_C_LABEL(idepth) btst #7,0x6300 | check whether system clock beq 1f movb #1,0x6300 | clear the interrupt @@ -832,6 +833,7 @@ ENTRY_NOPROFILE(lev5intr) addql #1,_C_LABEL(intrcnt)+20 INTERRUPT_RESTOREREG 1: + addql #1,_C_LABEL(idepth) jra _ASM_LABEL(rei) | all done #endif
CVS commit: src/sys/arch/luna68k/luna68k
Module Name:src Committed By: tsutsui Date: Mon Jan 21 15:21:30 UTC 2013 Modified Files: src/sys/arch/luna68k/luna68k: locore.s Log Message: Umm, fix botch in previous. To generate a diff of this commit: cvs rdiff -u -r1.51 -r1.52 src/sys/arch/luna68k/luna68k/locore.s 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/luna68k/luna68k/locore.s diff -u src/sys/arch/luna68k/luna68k/locore.s:1.51 src/sys/arch/luna68k/luna68k/locore.s:1.52 --- src/sys/arch/luna68k/luna68k/locore.s:1.51 Mon Jan 21 14:42:24 2013 +++ src/sys/arch/luna68k/luna68k/locore.s Mon Jan 21 15:21:30 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: locore.s,v 1.51 2013/01/21 14:42:24 tsutsui Exp $ */ +/* $NetBSD: locore.s,v 1.52 2013/01/21 15:21:30 tsutsui Exp $ */ /* * Copyright (c) 1988 University of Utah. @@ -833,7 +833,7 @@ ENTRY_NOPROFILE(lev5intr) addql #1,_C_LABEL(intrcnt)+20 INTERRUPT_RESTOREREG 1: - addql #1,_C_LABEL(idepth) + subql #1,_C_LABEL(idepth) jra _ASM_LABEL(rei) | all done #endif
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: msaitoh Date: Mon Jan 21 15:32:48 UTC 2013 Modified Files: src/doc [netbsd-5]: CHANGES-5.2 Log Message: Fix the revision number of if_wm.c in ticket #1800. To generate a diff of this commit: cvs rdiff -u -r1.1.2.204 -r1.1.2.205 src/doc/CHANGES-5.2 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 diff -u src/doc/CHANGES-5.2:1.1.2.204 src/doc/CHANGES-5.2:1.1.2.205 --- src/doc/CHANGES-5.2:1.1.2.204 Tue Dec 18 19:45:46 2012 +++ src/doc/CHANGES-5.2 Mon Jan 21 15:32:47 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2,v 1.1.2.204 2012/12/18 19:45:46 riz Exp $ +# $NetBSD: CHANGES-5.2,v 1.1.2.205 2013/01/21 15:32:47 msaitoh Exp $ A complete list of changes from the NetBSD 5.1 release to the NetBSD 5.2 release: @@ -8655,7 +8655,7 @@ bin/pax/ftree.c 1.42 deal properly with empty lines in spec file [msaitoh, ticket #1799] -sys/dev/pci/if_wm.c1.231 via patch +sys/dev/pci/if_wm.c1.230-1.231 via patch Add workaround for QEMU and the variants that fail on EEPROM access. [msaitoh, ticket #1800]
CVS commit: src/sys/arch/arm/omap
Module Name:src
Committed By: macallan
Date: Mon Jan 21 16:08:30 UTC 2013
Modified Files:
src/sys/arch/arm/omap: omapfb.c
Log Message:
switch to 32bit colour for X, keep the console in 16bit for some extra speed
( yay, first commit from my BeagleBoard )
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/arm/omap/omapfb.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/omap/omapfb.c
diff -u src/sys/arch/arm/omap/omapfb.c:1.14 src/sys/arch/arm/omap/omapfb.c:1.15
--- src/sys/arch/arm/omap/omapfb.c:1.14 Mon Jan 21 14:17:39 2013
+++ src/sys/arch/arm/omap/omapfb.c Mon Jan 21 16:08:30 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: omapfb.c,v 1.14 2013/01/21 14:17:39 macallan Exp $ */
+/* $NetBSD: omapfb.c,v 1.15 2013/01/21 16:08:30 macallan Exp $ */
/*
* Copyright (c) 2010 Michael Lorenz
@@ -31,7 +31,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: omapfb.c,v 1.14 2013/01/21 14:17:39 macallan Exp $);
+__KERNEL_RCSID(0, $NetBSD: omapfb.c,v 1.15 2013/01/21 16:08:30 macallan Exp $);
#include sys/param.h
#include sys/systm.h
@@ -107,6 +107,8 @@ static void omapfb_restore_palette(struc
static void omapfb_putpalreg(struct omapfb_softc *, int, uint8_t,
uint8_t, uint8_t);
+static int omapfb_set_depth(struct omapfb_softc *, int);
+
#if NOMAPDMA 0
static void omapfb_init(struct omapfb_softc *);
static void omapfb_wait_idle(struct omapfb_softc *);
@@ -453,7 +455,7 @@ omapfb_ioctl(void *v, void *vs, u_long c
wdf = (void *)data;
wdf-height = ms-scr_ri.ri_height;
wdf-width = ms-scr_ri.ri_width;
- wdf-depth = ms-scr_ri.ri_depth;
+ wdf-depth = 32;
wdf-cmsize = 256;
return 0;
@@ -466,19 +468,21 @@ omapfb_ioctl(void *v, void *vs, u_long c
(struct wsdisplay_cmap *)data);
case WSDISPLAYIO_LINEBYTES:
- *(u_int *)data = sc-sc_stride;
+ *(u_int *)data = sc-sc_width * 4;
return 0;
case WSDISPLAYIO_SMODE:
{
int new_mode = *(int*)data;
-/* notify the bus backend */
if (new_mode != sc-sc_mode) {
sc-sc_mode = new_mode;
- if(new_mode == WSDISPLAYIO_MODE_EMUL) {
+ if (new_mode == WSDISPLAYIO_MODE_EMUL) {
+ omapfb_set_depth(sc, 16);
vcons_redraw_screen(ms);
- }
+ } else {
+ omapfb_set_depth(sc, 32);
+ }
}
}
return 0;
@@ -630,6 +634,49 @@ omapfb_putpalreg(struct omapfb_softc *sc
}
+static int
+omapfb_set_depth(struct omapfb_softc *sc, int d)
+{
+ uint32_t reg;
+
+ reg = OMAP_DISPC_ATTR_ENABLE |
+ OMAP_DISPC_ATTR_BURST_16x32 |
+ OMAP_DISPC_ATTR_REPLICATION;
+ switch (d) {
+ case 16:
+ reg |= OMAP_DISPC_ATTR_RGB16;
+ break;
+ case 32:
+ reg |= OMAP_DISPC_ATTR_RGB24;
+ break;
+ default:
+ aprint_error_dev(sc-sc_dev, unsupported depth (%d)\n, d);
+ return EINVAL;
+ }
+
+ bus_space_write_4(sc-sc_iot, sc-sc_regh,
+ OMAPFB_DISPC_GFX_ATTRIBUTES, reg);
+
+ /*
+ * now tell the video controller that we're done mucking around and
+ * actually update its settings
+ */
+ reg = bus_space_read_4(sc-sc_iot, sc-sc_regh, OMAPFB_DISPC_CONTROL);
+ bus_space_write_4(sc-sc_iot, sc-sc_regh, OMAPFB_DISPC_CONTROL,
+ reg | OMAP_DISPC_CTRL_GO_LCD | OMAP_DISPC_CTRL_GO_DIGITAL);
+
+ sc-sc_depth = d;
+ sc-sc_stride = sc-sc_width * (sc-sc_depth 3);
+
+ /* clear the screen here */
+#if NOMAPDMA 0
+ omapfb_rectfill(sc, 0, 0, sc-sc_width, sc-sc_height, 0);
+#else
+ memset(sc-sc_fbaddr, 0, sc-sc_stride * sc-sc_height);
+#endif
+ return 0;
+}
+
#if NOMAPDMA 0
static void
omapfb_init(struct omapfb_softc *sc)
CVS commit: src/sys/arch/evbarm/conf
Module Name:src Committed By: jakllsch Date: Mon Jan 21 16:25:09 UTC 2013 Modified Files: src/sys/arch/evbarm/conf: RPI Log Message: Change the root device to '?' instead of 'ld0a'. This was overriding the root=device passed in on the kernel command line. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/sys/arch/evbarm/conf/RPI 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/RPI diff -u src/sys/arch/evbarm/conf/RPI:1.21 src/sys/arch/evbarm/conf/RPI:1.22 --- src/sys/arch/evbarm/conf/RPI:1.21 Fri Jan 11 06:41:01 2013 +++ src/sys/arch/evbarm/conf/RPI Mon Jan 21 16:25:09 2013 @@ -1,5 +1,5 @@ # -# $NetBSD: RPI,v 1.21 2013/01/11 06:41:01 skrll Exp $ +# $NetBSD: RPI,v 1.22 2013/01/21 16:25:09 jakllsch Exp $ # # RPi -- Raspberry Pi # @@ -165,7 +165,7 @@ options USB_DEBUG # verbose Show aprint_normal and aprint_verbose output #options BOOT_ARGS=\\ -config netbsd root on ld0a type ? +config netbsd root on ? type ? # The main bus device mainbus0 at root
CVS commit: src/distrib/utils/embedded
Module Name:src
Committed By: skrll
Date: Mon Jan 21 16:47:23 UTC 2013
Modified Files:
src/distrib/utils/embedded: mkimage
Log Message:
Update usage output a little
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/distrib/utils/embedded/mkimage
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/embedded/mkimage
diff -u src/distrib/utils/embedded/mkimage:1.13 src/distrib/utils/embedded/mkimage:1.14
--- src/distrib/utils/embedded/mkimage:1.13 Wed Jan 16 23:27:34 2013
+++ src/distrib/utils/embedded/mkimage Mon Jan 21 16:47:23 2013
@@ -1,6 +1,6 @@
#! /bin/sh
-# $NetBSD: mkimage,v 1.13 2013/01/16 23:27:34 christos Exp $
+# $NetBSD: mkimage,v 1.14 2013/01/21 16:47:23 skrll Exp $
#
# Copyright (c) 2012 Alistair Crooks a...@netbsd.org
# All rights reserved.
@@ -70,7 +70,7 @@ next_avail ()
usage() {
cat EOF 12
-Usage: $PROG [-S setsdir] [-c custom-files-dir] [-h host-arch] [-s size]
+Usage: $PROG -h host-arch [-S setsdir] [-c custom-files-dir] [-s size]
EOF
exit 1
}
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: christos
Date: Mon Jan 21 16:48:23 UTC 2013
Modified Files:
src/sys/dev/usb: if_otusvar.h
Log Message:
remove trailing line
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/dev/usb/if_otusvar.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/if_otusvar.h
diff -u src/sys/dev/usb/if_otusvar.h:1.4 src/sys/dev/usb/if_otusvar.h:1.5
--- src/sys/dev/usb/if_otusvar.h:1.4 Sun Jan 20 16:50:41 2013
+++ src/sys/dev/usb/if_otusvar.h Mon Jan 21 11:48:23 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_otusvar.h,v 1.4 2013/01/20 21:50:41 christos Exp $ */
+/* $NetBSD: if_otusvar.h,v 1.5 2013/01/21 16:48:23 christos Exp $ */
/* $OpenBSD: if_otusreg.h,v 1.6 2009/04/06 18:17:01 damien Exp $ */
/*-
@@ -295,4 +295,3 @@ struct otus_softc {
};
#endif /* _IF_OTUSVAR_H_ */
-
CVS commit: src/distrib/utils/embedded
Module Name:src
Committed By: skrll
Date: Mon Jan 21 16:49:49 UTC 2013
Modified Files:
src/distrib/utils/embedded: mkimage
Log Message:
More usage updates
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/distrib/utils/embedded/mkimage
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/embedded/mkimage
diff -u src/distrib/utils/embedded/mkimage:1.14 src/distrib/utils/embedded/mkimage:1.15
--- src/distrib/utils/embedded/mkimage:1.14 Mon Jan 21 16:47:23 2013
+++ src/distrib/utils/embedded/mkimage Mon Jan 21 16:49:49 2013
@@ -1,6 +1,6 @@
#! /bin/sh
-# $NetBSD: mkimage,v 1.14 2013/01/21 16:47:23 skrll Exp $
+# $NetBSD: mkimage,v 1.15 2013/01/21 16:49:49 skrll Exp $
#
# Copyright (c) 2012 Alistair Crooks a...@netbsd.org
# All rights reserved.
@@ -70,7 +70,7 @@ next_avail ()
usage() {
cat EOF 12
-Usage: $PROG -h host-arch [-S setsdir] [-c custom-files-dir] [-s size]
+Usage: $PROG -h host-arch [-S setsdir] [-c custom-files-dir] [-s size] [image]
EOF
exit 1
}
CVS commit: src/sys/dev/usb
Module Name:src Committed By: christos Date: Mon Jan 21 16:52:56 UTC 2013 Modified Files: src/sys/dev/usb: if_otus.c if_urtwn.c Log Message: remove trailing lines To generate a diff of this commit: cvs rdiff -u -r1.20 -r1.21 src/sys/dev/usb/if_otus.c cvs rdiff -u -r1.14 -r1.15 src/sys/dev/usb/if_urtwn.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/dev/usb/if_otus.c diff -u src/sys/dev/usb/if_otus.c:1.20 src/sys/dev/usb/if_otus.c:1.21 --- src/sys/dev/usb/if_otus.c:1.20 Sun Jan 20 16:50:41 2013 +++ src/sys/dev/usb/if_otus.c Mon Jan 21 11:52:56 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: if_otus.c,v 1.20 2013/01/20 21:50:41 christos Exp $ */ +/* $NetBSD: if_otus.c,v 1.21 2013/01/21 16:52:56 christos Exp $ */ /* $OpenBSD: if_otus.c,v 1.18 2010/08/27 17:08:00 jsg Exp $ */ /*- @@ -23,7 +23,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_otus.c,v 1.20 2013/01/20 21:50:41 christos Exp $); +__KERNEL_RCSID(0, $NetBSD: if_otus.c,v 1.21 2013/01/21 16:52:56 christos Exp $); #include sys/param.h #include sys/sockio.h @@ -3369,4 +3369,3 @@ otus_output(struct ifnet *ifp, struct mb return ieee80211_output(ifp, m, dst, ic); } #endif /* IEEE80211_INJECTION */ - Index: src/sys/dev/usb/if_urtwn.c diff -u src/sys/dev/usb/if_urtwn.c:1.14 src/sys/dev/usb/if_urtwn.c:1.15 --- src/sys/dev/usb/if_urtwn.c:1.14 Sun Jan 20 19:02:11 2013 +++ src/sys/dev/usb/if_urtwn.c Mon Jan 21 11:52:56 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: if_urtwn.c,v 1.14 2013/01/21 00:02:11 jmcneill Exp $ */ +/* $NetBSD: if_urtwn.c,v 1.15 2013/01/21 16:52:56 christos Exp $ */ /* $OpenBSD: if_urtwn.c,v 1.20 2011/11/26 06:39:33 ckuethe Exp $ */ /*- @@ -22,7 +22,7 @@ */ #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: if_urtwn.c,v 1.14 2013/01/21 00:02:11 jmcneill Exp $); +__KERNEL_RCSID(0, $NetBSD: if_urtwn.c,v 1.15 2013/01/21 16:52:56 christos Exp $); #ifdef _KERNEL_OPT #include opt_inet.h @@ -4001,4 +4001,3 @@ if_urtwn_modcmd(modcmd_t cmd, void *aux) return (ENOTTY); } } -
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: skrll
Date: Mon Jan 21 16:59:23 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: evbarm.conf rpi.conf
Log Message:
kernel.img is for rpi only
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/distrib/utils/embedded/conf/evbarm.conf
cvs rdiff -u -r1.9 -r1.10 src/distrib/utils/embedded/conf/rpi.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/utils/embedded/conf/evbarm.conf
diff -u src/distrib/utils/embedded/conf/evbarm.conf:1.1 src/distrib/utils/embedded/conf/evbarm.conf:1.2
--- src/distrib/utils/embedded/conf/evbarm.conf:1.1 Wed Jan 16 23:27:34 2013
+++ src/distrib/utils/embedded/conf/evbarm.conf Mon Jan 21 16:59:23 2013
@@ -1,4 +1,4 @@
-# $NetBSD: evbarm.conf,v 1.1 2013/01/16 23:27:34 christos Exp $
+# $NetBSD: evbarm.conf,v 1.2 2013/01/21 16:59:23 skrll Exp $
# evbarm shared config
#
image=$HOME/${board}.img
@@ -88,13 +88,6 @@ sshd=YES
dhcpcd=YES
mdnsd=YES
EOF
- if [ ! -f ${kerneldir}/kernel.img ]; then
- echo ${PROG}: Missing ${kerneldir}/kernel.img 12
- exit 1
- fi
- echo ${bar} installing kernel ${bar}
- ${sudo} cp ${kerneldir}/kernel.img ${mnt}/boot
-
if [ ! -f ${mnt}/dev/MAKEDEV ]; then
echo ${PROG}: Missing ${mnt}/dev/MAKEDEV 12
exit 1
Index: src/distrib/utils/embedded/conf/rpi.conf
diff -u src/distrib/utils/embedded/conf/rpi.conf:1.9 src/distrib/utils/embedded/conf/rpi.conf:1.10
--- src/distrib/utils/embedded/conf/rpi.conf:1.9 Wed Jan 16 23:27:34 2013
+++ src/distrib/utils/embedded/conf/rpi.conf Mon Jan 21 16:59:23 2013
@@ -1,4 +1,4 @@
-# $NetBSD: rpi.conf,v 1.9 2013/01/16 23:27:34 christos Exp $
+# $NetBSD: rpi.conf,v 1.10 2013/01/21 16:59:23 skrll Exp $
# Raspberry PI customization script used by mkimage
#
@@ -27,10 +27,18 @@ EOF
${sudo} cat ${mnt}/boot/cmdline.txt EOF
console=fb
-#fb=1280x1024 # to select a mode, otherwise EDID will be tried and fallback to
+#fb=1280x1024 # to select a mode, otherwise try EDID
#fb=disable # to disable fb completely
EOF
+ if [ ! -f ${kerneldir}/kernel.img ]; then
+ echo ${PROG}: Missing ${kerneldir}/kernel.img 12
+ exit 1
+ fi
+
+ echo ${bar} installing kernel ${bar}
+ ${sudo} cp ${kerneldir}/kernel.img ${mnt}/boot
+
echo -n ${bar} installing firmware files:
(cd ${mnt}/boot
for f in ${firmwarefiles}; do
CVS commit: src/distrib/utils/embedded/conf
Module Name:src
Committed By: jakllsch
Date: Mon Jan 21 17:14:23 UTC 2013
Modified Files:
src/distrib/utils/embedded/conf: rpi.conf
Log Message:
Specify the root device in cmdline.txt, also, it's 'Pi', not 'PI'.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/distrib/utils/embedded/conf/rpi.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/utils/embedded/conf/rpi.conf
diff -u src/distrib/utils/embedded/conf/rpi.conf:1.10 src/distrib/utils/embedded/conf/rpi.conf:1.11
--- src/distrib/utils/embedded/conf/rpi.conf:1.10 Mon Jan 21 16:59:23 2013
+++ src/distrib/utils/embedded/conf/rpi.conf Mon Jan 21 17:14:23 2013
@@ -1,5 +1,5 @@
-# $NetBSD: rpi.conf,v 1.10 2013/01/21 16:59:23 skrll Exp $
-# Raspberry PI customization script used by mkimage
+# $NetBSD: rpi.conf,v 1.11 2013/01/21 17:14:23 jakllsch Exp $
+# Raspberry Pi customization script used by mkimage
#
board=rpi
@@ -26,6 +26,7 @@ wscons=YES
EOF
${sudo} cat ${mnt}/boot/cmdline.txt EOF
+root=ld0a
console=fb
#fb=1280x1024 # to select a mode, otherwise try EDID
#fb=disable # to disable fb completely
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: mlelstv
Date: Mon Jan 21 19:08:43 UTC 2013
Modified Files:
src/sys/dev/usb: uftdi.c uftdireg.h
Log Message:
force chip into serial mode
add 232RL product id
To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 src/sys/dev/usb/uftdi.c
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/usb/uftdireg.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/uftdi.c
diff -u src/sys/dev/usb/uftdi.c:1.55 src/sys/dev/usb/uftdi.c:1.56
--- src/sys/dev/usb/uftdi.c:1.55 Sun Jan 20 13:43:24 2013
+++ src/sys/dev/usb/uftdi.c Mon Jan 21 19:08:42 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: uftdi.c,v 1.55 2013/01/20 13:43:24 reinoud Exp $ */
+/* $NetBSD: uftdi.c,v 1.56 2013/01/21 19:08:42 mlelstv Exp $ */
/*
* Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: uftdi.c,v 1.55 2013/01/20 13:43:24 reinoud Exp $);
+__KERNEL_RCSID(0, $NetBSD: uftdi.c,v 1.56 2013/01/21 19:08:42 mlelstv Exp $);
#include sys/param.h
#include sys/systm.h
@@ -126,6 +126,7 @@ static const struct usb_devno uftdi_devs
{ USB_VENDOR_FALCOM, USB_PRODUCT_FALCOM_TWIST },
{ USB_VENDOR_FALCOM, USB_PRODUCT_FALCOM_SAMBA },
{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_232H },
+ { USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_232RL },
{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_2232C },
{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_4232H },
{ USB_VENDOR_FTDI, USB_PRODUCT_FTDI_SERIAL_8U100AX },
@@ -525,6 +526,15 @@ uftdi_param(void *vsc, int portno, struc
if (sc-sc_dying)
return (EIO);
+ req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
+ req.bRequest = FTDI_SIO_SET_BITMODE;
+ USETW(req.wValue, FTDI_BITMODE_RESET 8 | 0x00);
+ USETW(req.wIndex, portno);
+ USETW(req.wLength, 0);
+ err = usbd_do_request(sc-sc_udev, req, NULL);
+ if (err)
+ return (EIO);
+
switch (sc-sc_type) {
case UFTDI_TYPE_SIO:
switch (t-c_ospeed) {
Index: src/sys/dev/usb/uftdireg.h
diff -u src/sys/dev/usb/uftdireg.h:1.7 src/sys/dev/usb/uftdireg.h:1.8
--- src/sys/dev/usb/uftdireg.h:1.7 Fri Aug 24 01:36:14 2012
+++ src/sys/dev/usb/uftdireg.h Mon Jan 21 19:08:42 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: uftdireg.h,v 1.7 2012/08/24 01:36:14 msaitoh Exp $ */
+/* $NetBSD: uftdireg.h,v 1.8 2013/01/21 19:08:42 mlelstv Exp $ */
/*
* Definitions for the FTDI USB Single Port Serial Converter -
@@ -17,14 +17,15 @@
/* Modified by Lennart Augustsson */
/* Vendor Request Interface */
-#define FTDI_SIO_RESET 0 /* Reset the port */
-#define FTDI_SIO_MODEM_CTRL 1 /* Set the modem control register */
-#define FTDI_SIO_SET_FLOW_CTRL 2 /* Set flow control register */
-#define FTDI_SIO_SET_BAUD_RATE 3 /* Set baud rate */
-#define FTDI_SIO_SET_DATA 4 /* Set the data characteristics of the port */
-#define FTDI_SIO_GET_STATUS 5 /* Retrieve current value of status reg */
-#define FTDI_SIO_SET_EVENT_CHAR 6 /* Set the event character */
-#define FTDI_SIO_SET_ERROR_CHAR 7 /* Set the error character */
+#define FTDI_SIO_RESET 0 /* Reset the port */
+#define FTDI_SIO_MODEM_CTRL 1 /* Set the modem control register */
+#define FTDI_SIO_SET_FLOW_CTRL 2 /* Set flow control register */
+#define FTDI_SIO_SET_BAUD_RATE 3 /* Set baud rate */
+#define FTDI_SIO_SET_DATA 4 /* Set the data characteristics of the port */
+#define FTDI_SIO_GET_STATUS 5 /* Retrieve current value of status reg */
+#define FTDI_SIO_SET_EVENT_CHAR 6 /* Set the event character */
+#define FTDI_SIO_SET_ERROR_CHAR 7 /* Set the error character */
+#define FTDI_SIO_SET_BITMODE11 /* Set FIFO/Serial mode */
/* Port Identifier Table */
#define FTDI_PIT_DEFAULT 0 /* SIOA */
@@ -345,3 +346,24 @@ enum {
#define FTDI_GET_LSR(p) ((p)[1])
#define FTDI_LSR_MASK (~0x60) /* interesting bits */
#define FTDI_OUT_TAG(len, port) (((len) 2) | (port))
+
+/*
+ * BmRequestType: 0100 B
+ * bRequest: FTDI_SIO_SET_BITMODE
+ * wValue: Bitmode value - see below
+ * wIndex: Port
+ * wLength:0
+ * Data: None
+ *
+ * Not all modes are available on all chips
+ */
+/* FTDI_SIO_SET_BITMODE */
+#define FTDI_BITMODE_RESET 0x00 /* UART mode */
+#define FTDI_BITMODE_BITBANG 0x01 /* asynchrounous bitbang mode */
+#define FTDI_BITMODE_MPSSE 0x02 /* MPSSE mode */
+#define FTDI_BITMODE_SYNCBB 0x04 /* synchronous bitbang mode */
+#define FTDI_BITMODE_MCU 0x08 /* MCU Host Bus Emulation mode */
+#define FTDI_BITMODE_OPTO0x10 /* Fast Opto-Isolated Serial Interface Mode */
+#define FTDI_BITMODE_CBUS0x20 /* Bitbang on CBUS pins */
+#define FTDI_BITMODE_SYNCFF 0x40 /* Synchronous FIFO mode */
+
CVS commit: src/sys/dev/ic
Module Name:src
Committed By: mlelstv
Date: Mon Jan 21 19:49:16 UTC 2013
Modified Files:
src/sys/dev/ic: vga.c vga_raster.c vgavar.h
Log Message:
Make internal functions static
To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/sys/dev/ic/vga.c
cvs rdiff -u -r1.35 -r1.36 src/sys/dev/ic/vga_raster.c
cvs rdiff -u -r1.29 -r1.30 src/sys/dev/ic/vgavar.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/ic/vga.c
diff -u src/sys/dev/ic/vga.c:1.109 src/sys/dev/ic/vga.c:1.110
--- src/sys/dev/ic/vga.c:1.109 Thu Aug 9 23:56:35 2012
+++ src/sys/dev/ic/vga.c Mon Jan 21 19:49:15 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: vga.c,v 1.109 2012/08/09 23:56:35 uwe Exp $ */
+/* $NetBSD: vga.c,v 1.110 2013/01/21 19:49:15 mlelstv Exp $ */
/*
* Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -28,7 +28,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: vga.c,v 1.109 2012/08/09 23:56:35 uwe Exp $);
+__KERNEL_RCSID(0, $NetBSD: vga.c,v 1.110 2013/01/21 19:49:15 mlelstv Exp $);
/* for WSCONS_SUPPORT_PCVTFONTS */
#include opt_wsdisplay_compat.h
@@ -111,23 +111,23 @@ static int vgaconsole, vga_console_type,
static struct vgascreen vga_console_screen;
static struct vga_config vga_console_vc;
-struct egavga_font *egavga_getfont(struct vga_config *, struct vgascreen *,
+static struct egavga_font *egavga_getfont(struct vga_config *, struct vgascreen *,
const char *, int);
-void egavga_unreffont(struct vga_config *, struct egavga_font *);
+static void egavga_unreffont(struct vga_config *, struct egavga_font *);
-int vga_selectfont(struct vga_config *, struct vgascreen *, const char *,
+static int vga_selectfont(struct vga_config *, struct vgascreen *, const char *,
const char *);
-void vga_init_screen(struct vga_config *, struct vgascreen *,
+static void vga_init_screen(struct vga_config *, struct vgascreen *,
const struct wsscreen_descr *, int, long *);
-void vga_init(struct vga_config *, bus_space_tag_t, bus_space_tag_t);
+static void vga_init(struct vga_config *, bus_space_tag_t, bus_space_tag_t);
static void vga_setfont(struct vga_config *, struct vgascreen *);
static int vga_mapchar(void *, int, unsigned int *);
-void vga_putchar(void *, int, int, u_int, long);
+static void vga_putchar(void *, int, int, u_int, long);
static int vga_allocattr(void *, int, int, int, long *);
static void vga_copyrows(void *, int, int, int);
#ifdef WSDISPLAY_SCROLLSUPPORT
-void vga_scroll (void *, void *, int);
+static void vga_scroll (void *, void *, int);
#endif
const struct wsdisplay_emulops vga_emulops = {
@@ -287,7 +287,10 @@ static int vga_getborder(struct vga_conf
static int vga_setborder(struct vga_config *, u_int);
#endif /* WSDISPLAY_CUSTOM_BORDER */
-void vga_doswitch(struct vga_config *);
+static void vga_doswitch(struct vga_config *);
+static voidvga_save_palette(struct vga_config *);
+static voidvga_restore_palette(struct vga_config *);
+
const struct wsdisplay_accessops vga_accessops = {
vga_ioctl,
@@ -315,7 +318,7 @@ const struct wsdisplay_accessops vga_acc
f-wsfont-encoding == WSDISPLAY_FONTENC_ISO7 || \
f-wsfont-encoding == WSDISPLAY_FONTENC_KOI8_R)
-struct egavga_font *
+static struct egavga_font *
egavga_getfont(struct vga_config *vc, struct vgascreen *scr, const char *name,
int primary)
{
@@ -376,7 +379,7 @@ found:
return (f);
}
-void
+static void
egavga_unreffont(struct vga_config *vc, struct egavga_font *f)
{
@@ -398,7 +401,7 @@ egavga_unreffont(struct vga_config *vc,
}
}
-int
+static int
vga_selectfont(struct vga_config *vc, struct vgascreen *scr, const char *name1,
const char *name2)
{
@@ -437,7 +440,7 @@ vga_selectfont(struct vga_config *vc, st
return (0);
}
-void
+static void
vga_init_screen(struct vga_config *vc, struct vgascreen *scr,
const struct wsscreen_descr *type, int existing, long *attrp)
{
@@ -523,7 +526,7 @@ vga_init_screen(struct vga_config *vc, s
LIST_INSERT_HEAD(vc-screens, scr, next);
}
-void
+static void
vga_init(struct vga_config *vc, bus_space_tag_t iot, bus_space_tag_t memt)
{
struct vga_handle *vh = vc-hdl;
@@ -775,7 +778,7 @@ vga_set_video(struct vga_config *vc, int
vga_ts_write(vc-hdl, syncreset, 0x03);
}
-int
+static int
vga_ioctl(void *v, void *vs, u_long cmd, void *data, int flag, struct lwp *l)
{
struct vga_config *vc = v;
@@ -858,7 +861,7 @@ vga_mmap(void *v, void *vs, off_t offset
return ((*vf-vf_mmap)(v, offset, prot));
}
-int
+static int
vga_alloc_screen(void *v, const struct wsscreen_descr *type, void **cookiep,
int *curxp, int *curyp, long *defattrp)
{
@@ -893,7 +896,7 @@ vga_alloc_screen(void *v, const struct w
return (0);
}
-void
+static void
vga_free_screen(void *v, void *cookie)
{
struct vgascreen *vs = cookie;
@@ -973,7 +976,7 @@ vga_setfont(struct vga_config *vc, struc
}
}
-int
CVS commit: [netbsd-5] src/sys/dist/ipf/netinet
Module Name:src Committed By: bouyer Date: Mon Jan 21 20:18:35 UTC 2013 Modified Files: src/sys/dist/ipf/netinet [netbsd-5]: ip_fil_netbsd.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1840): sys/external/bsd/ipf/netinet/ip_fil_netbsd.c: revision 1.4 via patch Fix off-by-one read error. To generate a diff of this commit: cvs rdiff -u -r1.46.8.3 -r1.46.8.4 src/sys/dist/ipf/netinet/ip_fil_netbsd.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/dist/ipf/netinet/ip_fil_netbsd.c diff -u src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.46.8.3 src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.46.8.4 --- src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.46.8.3 Sun Sep 12 18:59:01 2010 +++ src/sys/dist/ipf/netinet/ip_fil_netbsd.c Mon Jan 21 20:18:35 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_fil_netbsd.c,v 1.46.8.3 2010/09/12 18:59:01 snj Exp $ */ +/* $NetBSD: ip_fil_netbsd.c,v 1.46.8.4 2013/01/21 20:18:35 bouyer Exp $ */ /* * Copyright (C) 1993-2003 by Darren Reed. @@ -8,7 +8,7 @@ #if !defined(lint) #if defined(__NetBSD__) #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ip_fil_netbsd.c,v 1.46.8.3 2010/09/12 18:59:01 snj Exp $); +__KERNEL_RCSID(0, $NetBSD: ip_fil_netbsd.c,v 1.46.8.4 2013/01/21 20:18:35 bouyer Exp $); #else static const char sccsid[] = @(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed; static const char rcsid[] = @(#)Id: ip_fil_netbsd.c,v 2.55.2.59 2008/03/01 23:16:38 darrenr Exp; @@ -958,7 +958,7 @@ int dst; code = fin-fin_icode; #ifdef USE_INET6 - if ((code 0) || (code sizeof(icmptoicmp6unreach)/sizeof(int))) + if ((code 0) || (code = sizeof(icmptoicmp6unreach)/sizeof(int))) return -1; #endif
CVS commit: [netbsd-5] src/doc
Module Name:src Committed By: bouyer Date: Mon Jan 21 20:18:59 UTC 2013 Modified Files: src/doc [netbsd-5]: CHANGES-5.3 Log Message: ticket 1840 To generate a diff of this commit: cvs rdiff -u -r1.1.2.4 -r1.1.2.5 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.4 src/doc/CHANGES-5.3:1.1.2.5 --- src/doc/CHANGES-5.3:1.1.2.4 Sun Jan 20 12:22:22 2013 +++ src/doc/CHANGES-5.3 Mon Jan 21 20:18:59 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.3,v 1.1.2.4 2013/01/20 12:22:22 bouyer Exp $ +# $NetBSD: CHANGES-5.3,v 1.1.2.5 2013/01/21 20:18:59 bouyer Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.3 release: @@ -165,3 +165,8 @@ sys/dev/pci/viaide.c 1.58 Add VT8237S Integrated SATA Controller support (PR#47452). [msaitoh, ticket #1842] +sys/external/bsd/ipf/netinet/ip_fil_netbsd.c 1.4 via patch + + Fix off-by-one read error. + [msaitoh, ticket #1840] +
CVS commit: src/sys/arch/evbarm/evbarm
Module Name:src
Committed By: jakllsch
Date: Mon Jan 21 20:20:32 UTC 2013
Modified Files:
src/sys/arch/evbarm/evbarm: autoconf.c
Log Message:
Correct off-by-one in validation of booted partition number.
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/evbarm/evbarm/autoconf.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/evbarm/autoconf.c
diff -u src/sys/arch/evbarm/evbarm/autoconf.c:1.15 src/sys/arch/evbarm/evbarm/autoconf.c:1.16
--- src/sys/arch/evbarm/evbarm/autoconf.c:1.15 Sun Dec 2 18:22:45 2012
+++ src/sys/arch/evbarm/evbarm/autoconf.c Mon Jan 21 20:20:32 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: autoconf.c,v 1.15 2012/12/02 18:22:45 msaitoh Exp $ */
+/* $NetBSD: autoconf.c,v 1.16 2013/01/21 20:20:32 jakllsch Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.15 2012/12/02 18:22:45 msaitoh Exp $);
+__KERNEL_RCSID(0, $NetBSD: autoconf.c,v 1.16 2013/01/21 20:20:32 jakllsch Exp $);
#include opt_md.h
@@ -79,7 +79,7 @@ get_device(char *name)
if (cp == name)
return;
- if (*cp = 'a' *cp = ('a' + MAXPARTITIONS))
+ if (*cp = 'a' *cp ('a' + MAXPARTITIONS))
part = *cp - 'a';
else if (*cp != '\0' *cp != ' ')
return;
CVS commit: [netbsd-5-0] src/sys/dist/ipf/netinet
Module Name:src Committed By: bouyer Date: Mon Jan 21 20:21:58 UTC 2013 Modified Files: src/sys/dist/ipf/netinet [netbsd-5-0]: ip_fil_netbsd.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1840): sys/external/bsd/ipf/netinet/ip_fil_netbsd.c: revision 1.4 via patch Fix off-by-one read error. To generate a diff of this commit: cvs rdiff -u -r1.46.8.1.2.1 -r1.46.8.1.2.2 \ src/sys/dist/ipf/netinet/ip_fil_netbsd.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/dist/ipf/netinet/ip_fil_netbsd.c diff -u src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.46.8.1.2.1 src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.46.8.1.2.2 --- src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.46.8.1.2.1 Mon May 11 20:03:08 2009 +++ src/sys/dist/ipf/netinet/ip_fil_netbsd.c Mon Jan 21 20:21:57 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_fil_netbsd.c,v 1.46.8.1.2.1 2009/05/11 20:03:08 bouyer Exp $ */ +/* $NetBSD: ip_fil_netbsd.c,v 1.46.8.1.2.2 2013/01/21 20:21:57 bouyer Exp $ */ /* * Copyright (C) 1993-2003 by Darren Reed. @@ -8,7 +8,7 @@ #if !defined(lint) #if defined(__NetBSD__) #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ip_fil_netbsd.c,v 1.46.8.1.2.1 2009/05/11 20:03:08 bouyer Exp $); +__KERNEL_RCSID(0, $NetBSD: ip_fil_netbsd.c,v 1.46.8.1.2.2 2013/01/21 20:21:57 bouyer Exp $); #else static const char sccsid[] = @(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed; static const char rcsid[] = @(#)Id: ip_fil_netbsd.c,v 2.55.2.59 2008/03/01 23:16:38 darrenr Exp; @@ -958,7 +958,7 @@ int dst; code = fin-fin_icode; #ifdef USE_INET6 - if ((code 0) || (code sizeof(icmptoicmp6unreach)/sizeof(int))) + if ((code 0) || (code = sizeof(icmptoicmp6unreach)/sizeof(int))) return -1; #endif
CVS commit: [netbsd-5-0] src/doc
Module Name:src Committed By: bouyer Date: Mon Jan 21 20:22:18 UTC 2013 Modified Files: src/doc [netbsd-5-0]: CHANGES-5.0.3 Log Message: ticket 1840 To generate a diff of this commit: cvs rdiff -u -r1.1.2.92 -r1.1.2.93 src/doc/CHANGES-5.0.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.0.3 diff -u src/doc/CHANGES-5.0.3:1.1.2.92 src/doc/CHANGES-5.0.3:1.1.2.93 --- src/doc/CHANGES-5.0.3:1.1.2.92 Sun Jan 13 17:17:46 2013 +++ src/doc/CHANGES-5.0.3 Mon Jan 21 20:22:18 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.0.3,v 1.1.2.92 2013/01/13 17:17:46 bouyer Exp $ +# $NetBSD: CHANGES-5.0.3,v 1.1.2.93 2013/01/21 20:22:18 bouyer Exp $ A complete list of changes from the NetBSD 5.0.2 release to the NetBSD 5.0.3 release: @@ -5247,3 +5247,8 @@ gnu/dist/grep/src/search.c 1.4 [apb, ticket #1838] +sys/external/bsd/ipf/netinet/ip_fil_netbsd.c 1.4 via patch + + Fix off-by-one read error. + [msaitoh, ticket #1840] +
CVS commit: [netbsd-5-1] src/sys/dist/ipf/netinet
Module Name:src Committed By: bouyer Date: Mon Jan 21 20:22:38 UTC 2013 Modified Files: src/sys/dist/ipf/netinet [netbsd-5-1]: ip_fil_netbsd.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1840): sys/external/bsd/ipf/netinet/ip_fil_netbsd.c: revision 1.4 via patch Fix off-by-one read error. To generate a diff of this commit: cvs rdiff -u -r1.46.8.3 -r1.46.8.3.2.1 \ src/sys/dist/ipf/netinet/ip_fil_netbsd.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/dist/ipf/netinet/ip_fil_netbsd.c diff -u src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.46.8.3 src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.46.8.3.2.1 --- src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.46.8.3 Sun Sep 12 18:59:01 2010 +++ src/sys/dist/ipf/netinet/ip_fil_netbsd.c Mon Jan 21 20:22:38 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_fil_netbsd.c,v 1.46.8.3 2010/09/12 18:59:01 snj Exp $ */ +/* $NetBSD: ip_fil_netbsd.c,v 1.46.8.3.2.1 2013/01/21 20:22:38 bouyer Exp $ */ /* * Copyright (C) 1993-2003 by Darren Reed. @@ -8,7 +8,7 @@ #if !defined(lint) #if defined(__NetBSD__) #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ip_fil_netbsd.c,v 1.46.8.3 2010/09/12 18:59:01 snj Exp $); +__KERNEL_RCSID(0, $NetBSD: ip_fil_netbsd.c,v 1.46.8.3.2.1 2013/01/21 20:22:38 bouyer Exp $); #else static const char sccsid[] = @(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed; static const char rcsid[] = @(#)Id: ip_fil_netbsd.c,v 2.55.2.59 2008/03/01 23:16:38 darrenr Exp; @@ -958,7 +958,7 @@ int dst; code = fin-fin_icode; #ifdef USE_INET6 - if ((code 0) || (code sizeof(icmptoicmp6unreach)/sizeof(int))) + if ((code 0) || (code = sizeof(icmptoicmp6unreach)/sizeof(int))) return -1; #endif
CVS commit: [netbsd-5-1] src/doc
Module Name:src Committed By: bouyer Date: Mon Jan 21 20:22:55 UTC 2013 Modified Files: src/doc [netbsd-5-1]: CHANGES-5.1.3 Log Message: ticket 1840 To generate a diff of this commit: cvs rdiff -u -r1.1.2.34 -r1.1.2.35 src/doc/CHANGES-5.1.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.1.3 diff -u src/doc/CHANGES-5.1.3:1.1.2.34 src/doc/CHANGES-5.1.3:1.1.2.35 --- src/doc/CHANGES-5.1.3:1.1.2.34 Sun Jan 13 17:18:30 2013 +++ src/doc/CHANGES-5.1.3 Mon Jan 21 20:22:55 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.1.3,v 1.1.2.34 2013/01/13 17:18:30 bouyer Exp $ +# $NetBSD: CHANGES-5.1.3,v 1.1.2.35 2013/01/21 20:22:55 bouyer Exp $ A complete list of changes from the NetBSD 5.1.2 release to the NetBSD 5.1.3 release: @@ -2344,3 +2344,8 @@ gnu/dist/grep/src/search.c 1.4 [apb, ticket #1838] +sys/external/bsd/ipf/netinet/ip_fil_netbsd.c 1.4 via patch + + Fix off-by-one read error. + [msaitoh, ticket #1840] +
CVS commit: [netbsd-5-2] src/sys/dist/ipf/netinet
Module Name:src Committed By: bouyer Date: Mon Jan 21 20:23:21 UTC 2013 Modified Files: src/sys/dist/ipf/netinet [netbsd-5-2]: ip_fil_netbsd.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1840): sys/external/bsd/ipf/netinet/ip_fil_netbsd.c: revision 1.4 via patch Fix off-by-one read error. To generate a diff of this commit: cvs rdiff -u -r1.46.8.3 -r1.46.8.3.6.1 \ src/sys/dist/ipf/netinet/ip_fil_netbsd.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/dist/ipf/netinet/ip_fil_netbsd.c diff -u src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.46.8.3 src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.46.8.3.6.1 --- src/sys/dist/ipf/netinet/ip_fil_netbsd.c:1.46.8.3 Sun Sep 12 18:59:01 2010 +++ src/sys/dist/ipf/netinet/ip_fil_netbsd.c Mon Jan 21 20:23:21 2013 @@ -1,4 +1,4 @@ -/* $NetBSD: ip_fil_netbsd.c,v 1.46.8.3 2010/09/12 18:59:01 snj Exp $ */ +/* $NetBSD: ip_fil_netbsd.c,v 1.46.8.3.6.1 2013/01/21 20:23:21 bouyer Exp $ */ /* * Copyright (C) 1993-2003 by Darren Reed. @@ -8,7 +8,7 @@ #if !defined(lint) #if defined(__NetBSD__) #include sys/cdefs.h -__KERNEL_RCSID(0, $NetBSD: ip_fil_netbsd.c,v 1.46.8.3 2010/09/12 18:59:01 snj Exp $); +__KERNEL_RCSID(0, $NetBSD: ip_fil_netbsd.c,v 1.46.8.3.6.1 2013/01/21 20:23:21 bouyer Exp $); #else static const char sccsid[] = @(#)ip_fil.c 2.41 6/5/96 (C) 1993-2000 Darren Reed; static const char rcsid[] = @(#)Id: ip_fil_netbsd.c,v 2.55.2.59 2008/03/01 23:16:38 darrenr Exp; @@ -958,7 +958,7 @@ int dst; code = fin-fin_icode; #ifdef USE_INET6 - if ((code 0) || (code sizeof(icmptoicmp6unreach)/sizeof(int))) + if ((code 0) || (code = sizeof(icmptoicmp6unreach)/sizeof(int))) return -1; #endif
CVS commit: [netbsd-5-2] src/doc
Module Name:src Committed By: bouyer Date: Mon Jan 21 20:23:36 UTC 2013 Modified Files: src/doc [netbsd-5-2]: CHANGES-5.2.1 Log Message: ticket 1840 To generate a diff of this commit: cvs rdiff -u -r1.1.2.2 -r1.1.2.3 src/doc/CHANGES-5.2.1 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.1 diff -u src/doc/CHANGES-5.2.1:1.1.2.2 src/doc/CHANGES-5.2.1:1.1.2.3 --- src/doc/CHANGES-5.2.1:1.1.2.2 Sun Jan 13 17:19:01 2013 +++ src/doc/CHANGES-5.2.1 Mon Jan 21 20:23:36 2013 @@ -1,4 +1,4 @@ -# $NetBSD: CHANGES-5.2.1,v 1.1.2.2 2013/01/13 17:19:01 bouyer Exp $ +# $NetBSD: CHANGES-5.2.1,v 1.1.2.3 2013/01/21 20:23:36 bouyer Exp $ A complete list of changes from the NetBSD 5.2 release to the NetBSD 5.2.1 release: @@ -58,3 +58,8 @@ gnu/dist/grep/src/search.c 1.4 [apb, ticket #1838] +sys/external/bsd/ipf/netinet/ip_fil_netbsd.c 1.4 via patch + + Fix off-by-one read error. + [msaitoh, ticket #1840] +
CVS commit: src/sys/arch/evbarm/rpi
Module Name:src
Committed By: jakllsch
Date: Mon Jan 21 20:42:22 UTC 2013
Modified Files:
src/sys/arch/evbarm/rpi: rpi_machdep.c
Log Message:
Assume the first ld@sdmmc to attach is the booted device until
possibily-otherwise specified during evbarm cpu_rootconf().
To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 src/sys/arch/evbarm/rpi/rpi_machdep.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/rpi/rpi_machdep.c
diff -u src/sys/arch/evbarm/rpi/rpi_machdep.c:1.29 src/sys/arch/evbarm/rpi/rpi_machdep.c:1.30
--- src/sys/arch/evbarm/rpi/rpi_machdep.c:1.29 Sat Jan 19 17:45:28 2013
+++ src/sys/arch/evbarm/rpi/rpi_machdep.c Mon Jan 21 20:42:22 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: rpi_machdep.c,v 1.29 2013/01/19 17:45:28 jmcneill Exp $ */
+/* $NetBSD: rpi_machdep.c,v 1.30 2013/01/21 20:42:22 jakllsch Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: rpi_machdep.c,v 1.29 2013/01/19 17:45:28 jmcneill Exp $);
+__KERNEL_RCSID(0, $NetBSD: rpi_machdep.c,v 1.30 2013/01/21 20:42:22 jakllsch Exp $);
#include opt_evbarm_boardtype.h
@@ -738,6 +738,12 @@ rpi_device_register(device_t dev, void *
prop_dictionary_set_uint32(dict,
frequency, vb.vbt_emmcclockrate.rate);
}
+ if (booted_device == NULL
+ device_is_a(dev, ld)
+ device_is_a(device_parent(dev), sdmmc)) {
+ booted_partition = 0;
+ booted_device = dev;
+ }
#endif
if (device_is_a(dev, usmsc)
vcprop_tag_success_p(vb.vbt_macaddr.tag)) {
CVS commit: src/external/bsd/elftosb/dist/common
Module Name:src
Committed By: christos
Date: Mon Jan 21 21:38:03 UTC 2013
Modified Files:
src/external/bsd/elftosb/dist/common: EncoreBootImage.h
Log Message:
When abusing enums, please at least use valid constants...
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 \
src/external/bsd/elftosb/dist/common/EncoreBootImage.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/bsd/elftosb/dist/common/EncoreBootImage.h
diff -u src/external/bsd/elftosb/dist/common/EncoreBootImage.h:1.1 src/external/bsd/elftosb/dist/common/EncoreBootImage.h:1.2
--- src/external/bsd/elftosb/dist/common/EncoreBootImage.h:1.1 Thu Nov 15 14:49:13 2012
+++ src/external/bsd/elftosb/dist/common/EncoreBootImage.h Mon Jan 21 16:38:02 2013
@@ -97,12 +97,10 @@ public:
ROM_VERBOSE_PROGRESS = (1 1) //! Progress reports are verbose.
};
- enum {
- ROM_IMAGE_HEADER_SIGNATURE = 'STMP', //! Signature in #elftosb::EncoreBootImage::boot_image_header_t::m_signature.
- ROM_IMAGE_HEADER_SIGNATURE2 = 'sgtl', //! Value for #elftosb::EncoreBootImage::boot_image_header_t::m_signature2;
- ROM_BOOT_IMAGE_MAJOR_VERSION = 1, //! Current boot image major version.
- ROM_BOOT_IMAGE_MINOR_VERSION = 1 //! Current boot image minor version.
- };
+#define ROM_IMAGE_HEADER_SIGNATURE STMP //! Signature in #elftosb::EncoreBootImage::boot_image_header_t::m_signature.
+#define ROM_IMAGE_HEADER_SIGNATURE2 sgtl //! Value for #elftosb::EncoreBootImage::boot_image_header_t::m_signature2;
+#define ROM_BOOT_IMAGE_MAJOR_VERSION 1 //! Current boot image major version.
+#define ROM_BOOT_IMAGE_MINOR_VERSION 1 //! Current boot image minor version.
enum {
//! Minimum alignment for a section is 16 bytes.
CVS commit: src/sys/dev/usb
Module Name:src
Committed By: jmcneill
Date: Mon Jan 21 23:42:46 UTC 2013
Modified Files:
src/sys/dev/usb: if_urtwn.c
Log Message:
some more urtwn fixes:
- support manual roaming (used by wpa_supplicant)
- simplify ioctl handler
- add our own reset callback
- acquire KERNEL_LOCK before using net80211 or the network stack
- clear IFF_OACTIVE even in the event of an endpoint stall
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/dev/usb/if_urtwn.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/if_urtwn.c
diff -u src/sys/dev/usb/if_urtwn.c:1.15 src/sys/dev/usb/if_urtwn.c:1.16
--- src/sys/dev/usb/if_urtwn.c:1.15 Mon Jan 21 16:52:56 2013
+++ src/sys/dev/usb/if_urtwn.c Mon Jan 21 23:42:45 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: if_urtwn.c,v 1.15 2013/01/21 16:52:56 christos Exp $ */
+/* $NetBSD: if_urtwn.c,v 1.16 2013/01/21 23:42:45 jmcneill Exp $ */
/* $OpenBSD: if_urtwn.c,v 1.20 2011/11/26 06:39:33 ckuethe Exp $ */
/*-
@@ -22,7 +22,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: if_urtwn.c,v 1.15 2013/01/21 16:52:56 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: if_urtwn.c,v 1.16 2013/01/21 23:42:45 jmcneill Exp $);
#ifdef _KERNEL_OPT
#include opt_inet.h
@@ -243,6 +243,7 @@ static void urtwn_lc_calib(struct urtwn_
static void urtwn_temp_calib(struct urtwn_softc *);
static int urtwn_init(struct ifnet *);
static void urtwn_stop(struct ifnet *, int);
+static int urtwn_reset(struct ifnet *);
static void urtwn_chip_stop(struct urtwn_softc *);
/* Aliases. */
@@ -378,7 +379,9 @@ urtwn_attach(device_t parent, device_t s
if_attach(ifp);
ieee80211_ifattach(ic);
+
/* override default methods */
+ ic-ic_reset = urtwn_reset;
ic-ic_wme.wme_update = urtwn_wme_update;
/* Override state transition machine. */
@@ -685,8 +688,10 @@ urtwn_task(void *arg)
cmd = ring-cmd[ring-next];
mutex_spin_exit(sc-sc_task_mtx);
splx(s);
- /* Invoke callback. */
+ /* Invoke callback with kernel lock held. */
+ KERNEL_LOCK(1, curlwp);
cmd-cb(sc, cmd-data);
+ KERNEL_UNLOCK_ONE(curlwp);
s = splusb();
mutex_spin_enter(sc-sc_task_mtx);
ring-queued--;
@@ -1475,14 +1480,17 @@ static void
urtwn_next_scan(void *arg)
{
struct urtwn_softc *sc = arg;
+ int s;
DPRINTFN(DBG_FN, (%s: %s\n, device_xname(sc-sc_dev), __func__));
if (sc-sc_dying)
return;
+ s = splnet();
if (sc-sc_ic.ic_state == IEEE80211_S_SCAN)
ieee80211_next_scan(sc-sc_ic);
+ splx(s);
}
static int
@@ -2072,7 +2080,9 @@ urtwn_rxeof(usbd_xfer_handle xfer, usbd_
}
/* Process 802.11 frame. */
+ KERNEL_LOCK(1, curlwp);
urtwn_rx_frame(sc, buf, pktlen);
+ KERNEL_UNLOCK_ONE(curlwp);
/* Next chunk is 128-byte aligned. */
totlen = roundup2(totlen, 128);
@@ -2103,23 +2113,26 @@ urtwn_txeof(usbd_xfer_handle xfer, usbd_
TAILQ_INSERT_TAIL(sc-tx_free_list, data, next);
mutex_exit(sc-sc_tx_mtx);
+ s = splnet();
+ sc-tx_timer = 0;
+ ifp-if_flags = ~IFF_OACTIVE;
+ ifp-if_opackets++;
+
if (__predict_false(status != USBD_NORMAL_COMPLETION)) {
if (status != USBD_NOT_STARTED status != USBD_CANCELLED) {
if (status == USBD_STALLED)
usbd_clear_endpoint_stall_async(data-pipe);
ifp-if_oerrors++;
}
+ splx(s);
return;
}
- ifp-if_opackets++;
+ KERNEL_LOCK(1, curlwp);
+ urtwn_start(ifp);
+ KERNEL_UNLOCK_ONE(curlwp);
- s = splnet();
- sc-tx_timer = 0;
- ifp-if_flags = ~IFF_OACTIVE;
splx(s);
-
- urtwn_start(ifp);
}
static int
@@ -2415,7 +2428,6 @@ urtwn_ioctl(struct ifnet *ifp, u_long cm
{
struct urtwn_softc *sc = ifp-if_softc;
struct ieee80211com *ic = sc-sc_ic;
- struct ifaddr *ifa;
int s, error = 0;
DPRINTFN(DBG_FN, (%s: %s: cmd=0x%08lx, data=%p\n,
@@ -2424,14 +2436,6 @@ urtwn_ioctl(struct ifnet *ifp, u_long cm
s = splnet();
switch (cmd) {
- case SIOCSIFADDR:
- ifa = (struct ifaddr *)data;
- ifp-if_flags |= IFF_UP;
-#ifdef INET
- if (ifa-ifa_addr-sa_family == AF_INET)
- arp_ifinit(ifp, ifa);
-#endif
- /*FALLTHROUGH*/
case SIOCSIFFLAGS:
if ((error = ifioctl_common(ifp, cmd, data)) != 0)
break;
@@ -2457,28 +2461,14 @@ urtwn_ioctl(struct ifnet *ifp, u_long cm
}
break;
- case SIOCS80211CHANNEL:
- error = ieee80211_ioctl(ic, cmd, data);
- if (error == ENETRESET
- ic-ic_opmode == IEEE80211_M_MONITOR) {
- if ((ifp-if_flags (IFF_UP | IFF_RUNNING)) ==
- (IFF_UP | IFF_RUNNING)) {
-mutex_enter(sc-sc_write_mtx);
-urtwn_set_chan(sc, ic-ic_curchan,
-IEEE80211_HTINFO_2NDCHAN_NONE);
-mutex_exit(sc-sc_write_mtx);
- }
- error = 0;
- }
- break;
-
default:
error = ieee80211_ioctl(ic, cmd, data);
break;
}
if (error == ENETRESET) {
if ((ifp-if_flags (IFF_UP | IFF_RUNNING)) ==
- (IFF_UP | IFF_RUNNING)) {
+ (IFF_UP | IFF_RUNNING)
+ ic-ic_roaming != IEEE80211_ROAMING_MANUAL) {
urtwn_init(ifp);
}
error = 0;
@@ -3805,12
CVS commit: src/sys/kern
Module Name:src
Committed By: christos
Date: Tue Jan 22 01:45:59 UTC 2013
Modified Files:
src/sys/kern: sys_sig.c
Log Message:
It is useless to check for sigcontext_vec and compat module loading for
PK_32 processes. The correct modules are already loaded, otherwise how
is the process running?
To generate a diff of this commit:
cvs rdiff -u -r1.38 -r1.39 src/sys/kern/sys_sig.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/kern/sys_sig.c
diff -u src/sys/kern/sys_sig.c:1.38 src/sys/kern/sys_sig.c:1.39
--- src/sys/kern/sys_sig.c:1.38 Wed Jul 18 16:30:07 2012
+++ src/sys/kern/sys_sig.c Mon Jan 21 20:45:59 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: sys_sig.c,v 1.38 2012/07/18 20:30:07 christos Exp $ */
+/* $NetBSD: sys_sig.c,v 1.39 2013/01/22 01:45:59 christos Exp $ */
/*-
* Copyright (c) 2006, 2007, 2008 The NetBSD Foundation, Inc.
@@ -66,7 +66,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: sys_sig.c,v 1.38 2012/07/18 20:30:07 christos Exp $);
+__KERNEL_RCSID(0, $NetBSD: sys_sig.c,v 1.39 2013/01/22 01:45:59 christos Exp $);
#include sys/param.h
#include sys/kernel.h
@@ -399,30 +399,33 @@ sigaction1(struct lwp *l, int signum, co
* again for this process.
*/
if (nsa != NULL) {
- if (__predict_false(vers 2)
- (p-p_lflag PL_SIGCOMPAT) == 0) {
- kernconfig_lock();
- if (sendsig_sigcontext_vec == NULL) {
-(void)module_autoload(compat,
-MODULE_CLASS_ANY);
- }
- if (sendsig_sigcontext_vec != NULL) {
+ if (__predict_false(vers 2)) {
+ if (p-p_flag PK_32)
+v0v1valid = true;
+ else if ((p-p_lflag PL_SIGCOMPAT) == 0) {
+kernconfig_lock();
+if (sendsig_sigcontext_vec == NULL) {
+ (void)module_autoload(compat,
+ MODULE_CLASS_ANY);
+}
+if (sendsig_sigcontext_vec != NULL) {
+ /*
+ * We need to remember if the
+ * sigcontext method may be useable,
+ * because libc may use it even
+ * if siginfo is available.
+ */
+ v0v1valid = true;
+}
+mutex_enter(proc_lock);
/*
- * We need to remember if the
- * sigcontext method may be useable,
- * because libc may use it even
- * if siginfo is available.
+ * Prevent unload of compat module while
+ * this process remains.
*/
-v0v1valid = true;
+p-p_lflag |= PL_SIGCOMPAT;
+mutex_exit(proc_lock);
+kernconfig_unlock();
}
- mutex_enter(proc_lock);
- /*
- * Prevent unload of compat module while
- * this process remains.
- */
- p-p_lflag |= PL_SIGCOMPAT;
- mutex_exit(proc_lock);
- kernconfig_unlock();
}
switch (vers) {
CVS commit: src/sys/compat/common
Module Name:src
Committed By: christos
Date: Tue Jan 22 01:47:21 UTC 2013
Modified Files:
src/sys/compat/common: compat_mod.c
Log Message:
Simplify the ifdef mess. No functional context.
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/compat/common/compat_mod.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/compat/common/compat_mod.c
diff -u src/sys/compat/common/compat_mod.c:1.14 src/sys/compat/common/compat_mod.c:1.15
--- src/sys/compat/common/compat_mod.c:1.14 Mon Aug 8 19:44:06 2011
+++ src/sys/compat/common/compat_mod.c Mon Jan 21 20:47:20 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: compat_mod.c,v 1.14 2011/08/08 23:44:06 jakllsch Exp $ */
+/* $NetBSD: compat_mod.c,v 1.15 2013/01/22 01:47:20 christos Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -34,7 +34,7 @@
*/
#include sys/cdefs.h
-__KERNEL_RCSID(0, $NetBSD: compat_mod.c,v 1.14 2011/08/08 23:44:06 jakllsch Exp $);
+__KERNEL_RCSID(0, $NetBSD: compat_mod.c,v 1.15 2013/01/22 01:47:20 christos Exp $);
#ifdef _KERNEL_OPT
#include opt_compat_netbsd.h
@@ -63,7 +63,8 @@ MODULE(MODULE_CLASS_MISC, compat, NULL);
int ttcompat(struct tty *, u_long, void *, int, struct lwp *);
#ifdef COMPAT_16
-#if !(defined(__amd64__) !defined(COMPAT_NETBSD32))
+#if !defined(__amd64__) || defined(COMPAT_NETBSD32)
+#define COMPAT_SIGCONTEXT
extern char sigcode[], esigcode[];
struct uvm_object *emul_netbsd_object;
#endif
@@ -159,7 +160,7 @@ static const struct syscall_package comp
#endif
#if defined(COMPAT_16)
-#if !(defined(__amd64__) !defined(COMPAT_NETBSD32))
+#if defined(COMPAT_SIGCONTEXT)
{ SYS_compat_16___sigaction14, 0, (sy_call_t *)compat_16_sys___sigaction14 },
{ SYS_compat_16___sigreturn14, 0, (sy_call_t *)compat_16_sys___sigreturn14 },
#endif
@@ -258,7 +259,7 @@ compat_modcmd(modcmd_t cmd, void *arg)
ttcompatvec = ttcompat;
#endif
#ifdef COMPAT_16
-#if !(defined(__amd64__) !defined(COMPAT_NETBSD32))
+#if defined(COMPAT_SIGCONTEXT)
KASSERT(emul_netbsd.e_sigobject == NULL);
rw_enter(exec_lock, RW_WRITER);
emul_netbsd.e_sigcode = sigcode;
@@ -311,7 +312,7 @@ compat_modcmd(modcmd_t cmd, void *arg)
}
#endif
#ifdef COMPAT_16
-#if !(defined(__amd64__) !defined(COMPAT_NETBSD32))
+#if defined(COMPAT_SIGCONTEXT)
/*
* The sigobject may persist if still in use, but
* is reference counted so will die eventually.
CVS commit: src/sys/modules/compat
Module Name:src
Committed By: christos
Date: Tue Jan 22 01:48:34 UTC 2013
Modified Files:
src/sys/modules/compat: Makefile
Log Message:
No need to wrap each version with a separate conditional.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/modules/compat/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/compat/Makefile
diff -u src/sys/modules/compat/Makefile:1.6 src/sys/modules/compat/Makefile:1.7
--- src/sys/modules/compat/Makefile:1.6 Mon Jan 17 10:57:04 2011
+++ src/sys/modules/compat/Makefile Mon Jan 21 20:48:34 2013
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2011/01/17 15:57:04 pooka Exp $
+# $NetBSD: Makefile,v 1.7 2013/01/22 01:48:34 christos Exp $
.include ../Makefile.inc
@@ -13,26 +13,12 @@ KMOD= compat
#
.if (${MACHINE_ARCH} != x86_64)
CPPFLAGS+= -DCOMPAT_09
-.endif
-.if (${MACHINE_ARCH} != x86_64)
CPPFLAGS+= -DCOMPAT_10
-.endif
-.if (${MACHINE_ARCH} != x86_64)
CPPFLAGS+= -DCOMPAT_11
-.endif
-.if (${MACHINE_ARCH} != x86_64)
CPPFLAGS+= -DCOMPAT_12
-.endif
-.if (${MACHINE_ARCH} != x86_64)
CPPFLAGS+= -DCOMPAT_13
-.endif
-.if (${MACHINE_ARCH} != x86_64)
CPPFLAGS+= -DCOMPAT_14
-.endif
-.if (${MACHINE_ARCH} != x86_64)
CPPFLAGS+= -DCOMPAT_15
-.endif
-.if (${MACHINE_ARCH} != x86_64)
CPPFLAGS+= -DCOMPAT_16
.endif
CVS commit: src/sys/modules/compat_netbsd32
Module Name:src
Committed By: christos
Date: Tue Jan 22 01:50:25 UTC 2013
Modified Files:
src/sys/modules/compat_netbsd32: Makefile
Log Message:
We need more defines for this to actually work!
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/modules/compat_netbsd32/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/modules/compat_netbsd32/Makefile
diff -u src/sys/modules/compat_netbsd32/Makefile:1.9 src/sys/modules/compat_netbsd32/Makefile:1.10
--- src/sys/modules/compat_netbsd32/Makefile:1.9 Sat Mar 10 16:52:00 2012
+++ src/sys/modules/compat_netbsd32/Makefile Mon Jan 21 20:50:25 2013
@@ -1,13 +1,26 @@
-# $NetBSD: Makefile,v 1.9 2012/03/10 21:52:00 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2013/01/22 01:50:25 christos Exp $
.include ../Makefile.inc
.include ../Makefile.assym
KMOD= compat_netbsd32
+CPPFLAGS+= -DCOMPAT_09
+CPPFLAGS+= -DCOMPAT_10
+CPPFLAGS+= -DCOMPAT_11
+CPPFLAGS+= -DCOMPAT_12
+CPPFLAGS+= -DCOMPAT_13
+CPPFLAGS+= -DCOMPAT_14
+CPPFLAGS+= -DCOMPAT_15
+CPPFLAGS+= -DCOMPAT_16
+
+CPPFLAGS+= -DCOMPAT_20
+CPPFLAGS+= -DCOMPAT_30 -DCOMPAT_40 -DCOMPAT_50
+CPPFLAGS+= -DCOMPAT_60 -DCOMPAT_70 -DCOMPAT_80
+CPPFLAGS+= -DCOMPAT_43
CPPFLAGS+= -DSYSVSHM -DSYSVSEM -DSYSVMSG -DCOMPAT_NETBSD32
CPPFLAGS+= -DEXEC_ELF32 -DEXEC_ELF64 -DEXEC_AOUT
-CPPFLAGS+= -DCOREDUMP
+CPPFLAGS+= -DCOREDUMP -DNTP
.PATH: ${S}/compat/netbsd32
SRCS+= netbsd32_compat_09.c netbsd32_compat_10.c
CVS commit: src/tests/fs/ffs
Module Name:src
Committed By: dholland
Date: Tue Jan 22 06:24:12 UTC 2013
Modified Files:
src/tests/fs/ffs: t_miscquota.sh
Log Message:
spelling
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/fs/ffs/t_miscquota.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/fs/ffs/t_miscquota.sh
diff -u src/tests/fs/ffs/t_miscquota.sh:1.7 src/tests/fs/ffs/t_miscquota.sh:1.8
--- src/tests/fs/ffs/t_miscquota.sh:1.7 Sun Sep 30 21:26:58 2012
+++ src/tests/fs/ffs/t_miscquota.sh Tue Jan 22 06:24:11 2013
@@ -1,4 +1,4 @@
-# $NetBSD: t_miscquota.sh,v 1.7 2012/09/30 21:26:58 bouyer Exp $
+# $NetBSD: t_miscquota.sh,v 1.8 2013/01/22 06:24:11 dholland Exp $
#
# Copyright (c) 2011 Manuel Bouyer
# All rights reserved.
@@ -53,10 +53,10 @@ test_case log_unlink_remount quota_log \
-oRL le 1 user
-test_case_root defaut_deny_user quota_defaut_deny \
+test_case_root default_deny_user quota_default_deny \
new quota entry denied by default entry 5 -b le 1 user
-test_case_root defaut_deny_user_big quota_defaut_deny \
+test_case_root default_deny_user_big quota_default_deny \
new quota entry denied by default entry, with list on more than one block 5000 -b le 1 user
@@ -170,7 +170,7 @@ quota_log()
rump_quota_shutdown
}
-quota_defaut_deny()
+quota_default_deny()
{
local nusers=$1; shift
create_ffs_server $*
