svn commit: r200403 - head/sys/sys
Author: luigi
Date: Fri Dec 11 10:35:58 2009
New Revision: 200403
URL: http://svn.freebsd.org/changeset/base/200403
Log:
only export bio_cmd and flags to userland (bio_cmd are
used by ggatectl, flags are potentially useful).
Other parts are internal kernel data structures and should
not be visible to userland.
No API change involved.
MFC after:3 days
Modified:
head/sys/sys/bio.h
Modified: head/sys/sys/bio.h
==
--- head/sys/sys/bio.h Fri Dec 11 07:56:37 2009(r200402)
+++ head/sys/sys/bio.h Fri Dec 11 10:35:58 2009(r200403)
@@ -40,6 +40,22 @@
#include
+/* bio_cmd */
+#define BIO_READ 0x01
+#define BIO_WRITE 0x02
+#define BIO_DELETE 0x04
+#define BIO_GETATTR0x08
+#define BIO_FLUSH 0x10
+#define BIO_CMD0 0x20/* Available for local hacks */
+#define BIO_CMD1 0x40/* Available for local hacks */
+#define BIO_CMD2 0x80/* Available for local hacks */
+
+/* bio_flags */
+#define BIO_ERROR 0x01
+#define BIO_DONE 0x02
+#define BIO_ONQUEUE0x04
+
+#ifdef _KERNEL
struct disk;
struct bio;
@@ -95,23 +111,6 @@ struct bio {
daddr_t bio_pblkno; /* physical block number */
};
-/* bio_cmd */
-#define BIO_READ 0x01
-#define BIO_WRITE 0x02
-#define BIO_DELETE 0x04
-#define BIO_GETATTR0x08
-#define BIO_FLUSH 0x10
-#define BIO_CMD0 0x20/* Available for local hacks */
-#define BIO_CMD1 0x40/* Available for local hacks */
-#define BIO_CMD2 0x80/* Available for local hacks */
-
-/* bio_flags */
-#define BIO_ERROR 0x01
-#define BIO_DONE 0x02
-#define BIO_ONQUEUE0x04
-
-#ifdef _KERNEL
-
struct uio;
struct devstat;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r200404 - stable/8/sys/compat/freebsd32
Author: kib
Date: Fri Dec 11 11:07:05 2009
New Revision: 200404
URL: http://svn.freebsd.org/changeset/base/200404
Log:
MFC r200111:
Add several syscall compat32 entries for acl manipulation.
Modified:
stable/8/sys/compat/freebsd32/syscalls.master
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/compat/freebsd32/syscalls.master
==
--- stable/8/sys/compat/freebsd32/syscalls.master Fri Dec 11 10:35:58
2009(r200403)
+++ stable/8/sys/compat/freebsd32/syscalls.master Fri Dec 11 11:07:05
2009(r200404)
@@ -740,10 +740,14 @@
struct freebsd32_ucontext *oucp, \
const struct freebsd32_ucontext *ucp); }
424AUE_SWAPOFF UNIMPL swapoff
-425AUE_NULLUNIMPL __acl_get_link
-426AUE_NULLUNIMPL __acl_set_link
-427AUE_NULLUNIMPL __acl_delete_link
-428AUE_NULLUNIMPL __acl_aclcheck_link
+425AUE_NULLNOPROTO { int __acl_get_link(const char *path, \
+ acl_type_t type, struct acl *aclp); }
+426AUE_NULLNOPROTO { int __acl_set_link(const char *path, \
+ acl_type_t type, struct acl *aclp); }
+427AUE_NULLNOPROTO { int __acl_delete_link(const char *path, \
+ acl_type_t type); }
+428AUE_NULLNOPROTO { int __acl_aclcheck_link(const char *path, \
+ acl_type_t type, struct acl *aclp); }
429AUE_SIGWAIT NOPROTO { int sigwait(const sigset_t *set, \
int *sig); }
430AUE_NULLUNIMPL thr_create;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r200405 - stable/8/sys/compat/freebsd32
Author: kib
Date: Fri Dec 11 11:07:48 2009
New Revision: 200405
URL: http://svn.freebsd.org/changeset/base/200405
Log:
Regen
Modified:
stable/8/sys/compat/freebsd32/freebsd32_proto.h
stable/8/sys/compat/freebsd32/freebsd32_syscall.h
stable/8/sys/compat/freebsd32/freebsd32_syscalls.c
stable/8/sys/compat/freebsd32/freebsd32_sysent.c
Modified: stable/8/sys/compat/freebsd32/freebsd32_proto.h
==
--- stable/8/sys/compat/freebsd32/freebsd32_proto.h Fri Dec 11 11:07:05
2009(r200404)
+++ stable/8/sys/compat/freebsd32/freebsd32_proto.h Fri Dec 11 11:07:48
2009(r200405)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 195468
2009-07-08 16:26:43Z trasz
+ * created from FreeBSD: stable/8/sys/compat/freebsd32/syscalls.master 200404
2009-12-11 11:07:05Z kib
*/
#ifndef _FREEBSD32_SYSPROTO_H_
Modified: stable/8/sys/compat/freebsd32/freebsd32_syscall.h
==
--- stable/8/sys/compat/freebsd32/freebsd32_syscall.h Fri Dec 11 11:07:05
2009(r200404)
+++ stable/8/sys/compat/freebsd32/freebsd32_syscall.h Fri Dec 11 11:07:48
2009(r200405)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 195468
2009-07-08 16:26:43Z trasz
+ * created from FreeBSD: stable/8/sys/compat/freebsd32/syscalls.master 200404
2009-12-11 11:07:05Z kib
*/
#defineFREEBSD32_SYS_syscall 0
@@ -311,6 +311,10 @@
#defineFREEBSD32_SYS_freebsd32_getcontext 421
#defineFREEBSD32_SYS_freebsd32_setcontext 422
#defineFREEBSD32_SYS_freebsd32_swapcontext 423
+#defineFREEBSD32_SYS___acl_get_link425
+#defineFREEBSD32_SYS___acl_set_link426
+#defineFREEBSD32_SYS___acl_delete_link 427
+#defineFREEBSD32_SYS___acl_aclcheck_link 428
#defineFREEBSD32_SYS_sigwait 429
#defineFREEBSD32_SYS_thr_exit 431
#defineFREEBSD32_SYS_thr_self 432
Modified: stable/8/sys/compat/freebsd32/freebsd32_syscalls.c
==
--- stable/8/sys/compat/freebsd32/freebsd32_syscalls.c Fri Dec 11 11:07:05
2009(r200404)
+++ stable/8/sys/compat/freebsd32/freebsd32_syscalls.c Fri Dec 11 11:07:48
2009(r200405)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 195468
2009-07-08 16:26:43Z trasz
+ * created from FreeBSD: stable/8/sys/compat/freebsd32/syscalls.master 200404
2009-12-11 11:07:05Z kib
*/
const char *freebsd32_syscallnames[] = {
@@ -432,10 +432,10 @@ const char *freebsd32_syscallnames[] = {
"freebsd32_setcontext", /* 422 = freebsd32_setcontext */
"freebsd32_swapcontext",/* 423 =
freebsd32_swapcontext */
"#424", /* 424 = swapoff */
- "#425", /* 425 = __acl_get_link */
- "#426", /* 426 = __acl_set_link */
- "#427", /* 427 = __acl_delete_link */
- "#428", /* 428 = __acl_aclcheck_link */
+ "__acl_get_link", /* 425 = __acl_get_link */
+ "__acl_set_link", /* 426 = __acl_set_link */
+ "__acl_delete_link",/* 427 = __acl_delete_link */
+ "__acl_aclcheck_link", /* 428 = __acl_aclcheck_link */
"sigwait", /* 429 = sigwait */
"#430", /* 430 = thr_create; */
"thr_exit", /* 431 = thr_exit */
Modified: stable/8/sys/compat/freebsd32/freebsd32_sysent.c
==
--- stable/8/sys/compat/freebsd32/freebsd32_sysent.cFri Dec 11 11:07:05
2009(r200404)
+++ stable/8/sys/compat/freebsd32/freebsd32_sysent.cFri Dec 11 11:07:48
2009(r200405)
@@ -3,7 +3,7 @@
*
* DO NOT EDIT-- this file is automatically generated.
* $FreeBSD$
- * created from FreeBSD: head/sys/compat/freebsd32/syscalls.master 195468
2009-07-08 16:26:43Z trasz
+ * created from FreeBSD: stable/8/sys/compat/freebsd32/syscalls.master 200404
2009-12-11 11:07:05Z kib
*/
#include "opt_compat.h"
@@ -469,10 +469,10 @@ struct sysent freebsd32_sysent[] = {
{ AS(freebsd32_setcontext_args), (sy_call_t *)freebsd32_setcontext,
AUE_NULL, NULL, 0, 0, 0 }, /* 422 = freebsd32_setcontext */
{ AS(freebsd32_swapcontext_args), (sy_call_t *)freebsd32_swapcontext,
AUE_NULL, NULL, 0, 0, 0 },/* 423 = freebsd32_swapcontext */
{ 0, (sy_call_t *)
Re: svn commit: r200068 - head/usr.bin
Roman Divacky writes:
> Stefan Farfeleder wrote:
> > For me this breaks the ooo-3 build with:
> >
> > unzip: -n, -o and -u are contradictory
> >
> > The failing command is 'unzip -quo jurt_src.zip'.
>
> I dont see a reason why this check is there:
>
> if (n_opt + o_opt + u_opt > 1)
> errorx("-n, -o and -u are contradictory");
>
>
> dag, can you comment?
s/dag/des/, please.
The bug is in OOo.
If you look at extract_file(), you'll see that these three options are
handled in three separate branches of a multi-branch if.
-n means "never overwrite"
-o means "always overwrite"
-u means "sometimes overwrite"
so -uo does not make much sense, and -n along with either -u or -o does
not make any sense whatsoever.
> /usr/local/bin/unzip seems to accept those together happilly..
You should check if:
a) -uo gives the same result as -u
b) -uo gives the same result as -o
c) -ou gives the same result as -u
d) -ou gives the same result as -o
e) -uo and -ou give the same result
My guess would be either bc or bde. In either case, there is a risk
that this is not what the user wanted, so IMHO the best solution is to
not do anything at all.
DES
--
Dag-Erling Smørgrav - d...@des.no
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r200406 - stable/8/sys/dev/hwpmc
Author: fabient Date: Fri Dec 11 12:36:02 2009 New Revision: 200406 URL: http://svn.freebsd.org/changeset/base/200406 Log: MFC 196739: Add counters for the i7 architecture which were accidentally left out of the original commit of i7 support. These are all the counters on pages A-32 and A-33 of the _Intel(R) 64 and IA32 Architectures Software Developer's Manual Vol 3B_, June 2009. Almost all of these counters relate to operations on the L2 cache. Modified: stable/8/sys/dev/hwpmc/hwpmc_core.c stable/8/sys/dev/hwpmc/pmc_events.h Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) Modified: stable/8/sys/dev/hwpmc/hwpmc_core.c == --- stable/8/sys/dev/hwpmc/hwpmc_core.c Fri Dec 11 11:07:48 2009 (r200405) +++ stable/8/sys/dev/hwpmc/hwpmc_core.c Fri Dec 11 12:36:02 2009 (r200406) @@ -1182,6 +1182,29 @@ static struct iap_event_descr iap_events IAPDESCR(DBH_01H, 0xDB, 0x01, IAP_F_FM | IAP_F_I7), IAPDESCR(E4H_01H, 0xE4, 0x01, IAP_F_FM | IAP_F_I7), IAPDESCR(E5H_01H, 0xE5, 0x01, IAP_F_FM | IAP_F_I7), +IAPDESCR(E6H_01H, 0xE6, 0x01, IAP_F_FM | IAP_F_I7), +IAPDESCR(E6H_02H, 0xE6, 0x02, IAP_F_FM | IAP_F_I7), +IAPDESCR(E8H_01H, 0xE8, 0x01, IAP_F_FM | IAP_F_I7), +IAPDESCR(E8H_02H, 0xE8, 0x02, IAP_F_FM | IAP_F_I7), +IAPDESCR(E8H_03H, 0xE8, 0x03, IAP_F_FM | IAP_F_I7), +IAPDESCR(F0H_01H, 0xF0, 0x01, IAP_F_FM | IAP_F_I7), +IAPDESCR(F0H_02H, 0xF0, 0x02, IAP_F_FM | IAP_F_I7), +IAPDESCR(F0H_04H, 0xF0, 0x04, IAP_F_FM | IAP_F_I7), +IAPDESCR(F0H_08H, 0xF0, 0x08, IAP_F_FM | IAP_F_I7), +IAPDESCR(F0H_10H, 0xF0, 0x10, IAP_F_FM | IAP_F_I7), +IAPDESCR(F0H_20H, 0xF0, 0x20, IAP_F_FM | IAP_F_I7), +IAPDESCR(F0H_40H, 0xF0, 0x40, IAP_F_FM | IAP_F_I7), +IAPDESCR(F0H_80H, 0xF0, 0x80, IAP_F_FM | IAP_F_I7), +IAPDESCR(F1H_02H, 0xF1, 0x02, IAP_F_FM | IAP_F_I7), +IAPDESCR(F1H_04H, 0xF1, 0x04, IAP_F_FM | IAP_F_I7), +IAPDESCR(F1H_07H, 0xF1, 0x07, IAP_F_FM | IAP_F_I7), +IAPDESCR(F2H_01H, 0xF2, 0x01, IAP_F_FM | IAP_F_I7), +IAPDESCR(F2H_02H, 0xF2, 0x02, IAP_F_FM | IAP_F_I7), +IAPDESCR(F2H_04H, 0xF2, 0x04, IAP_F_FM | IAP_F_I7), +IAPDESCR(F2H_08H, 0xF2, 0x08, IAP_F_FM | IAP_F_I7), +IAPDESCR(F2H_0FH, 0xF2, 0x0F, IAP_F_FM | IAP_F_I7), +IAPDESCR(F3H_01H, 0xF3, 0x01, IAP_F_FM | IAP_F_I7), +IAPDESCR(F3H_02H, 0xF3, 0x02, IAP_F_FM | IAP_F_I7), IAPDESCR(F3H_04H, 0xF3, 0x04, IAP_F_FM | IAP_F_I7), IAPDESCR(F3H_08H, 0xF3, 0x08, IAP_F_FM | IAP_F_I7), IAPDESCR(F3H_10H, 0xF3, 0x10, IAP_F_FM | IAP_F_I7), Modified: stable/8/sys/dev/hwpmc/pmc_events.h == --- stable/8/sys/dev/hwpmc/pmc_events.h Fri Dec 11 11:07:48 2009 (r200405) +++ stable/8/sys/dev/hwpmc/pmc_events.h Fri Dec 11 12:36:02 2009 (r200406) @@ -29,8 +29,18 @@ #ifndef _DEV_HWPMC_PMC_EVENTS_H_ #define_DEV_HWPMC_PMC_EVENTS_H_ -/* - * PMC event codes. +/* + * Note: Documentation on adding events can be found both in + * the source tree at src/share/doc/papers/hwpmc/hwpmc.ms + * as well as on-line at: + * + * http://wiki.freebsd.org/PmcTools/PmcHardwareHowTo + * + * Please refer to those resources before you attempt to modify + * this file or the hwpmc driver/subsystem. + */ + +/* * PMC event codes. * * __PMC_EV(CLASS, SYMBOLIC-NAME) * @@ -973,7 +983,30 @@ __PMC_EV(IAP, EVENT_FDH_04H) \ __PMC_EV(IAP, EVENT_FDH_08H) \ __PMC_EV(IAP, EVENT_FDH_10H) \ __PMC_EV(IAP, EVENT_FDH_20H) \ -__PMC_EV(IAP, EVENT_FDH_40H) +__PMC_EV(IAP, EVENT_FDH_40H) \ +__PMC_EV(IAP, EVENT_E6H_02H) \ +__PMC_EV(IAP, EVENT_E8H_01H) \ +__PMC_EV(IAP, EVENT_E8H_02H) \ +__PMC_EV(IAP, EVENT_E8H_03H) \ +__PMC_EV(IAP, EVENT_F0H_01H) \ +__PMC_EV(IAP, EVENT_F0H_02H) \ +__PMC_EV(IAP, EVENT_F0H_04H) \ +__PMC_EV(IAP, EVENT_F0H_08H) \ +__PMC_EV(IAP, EVENT_F0H_10H) \ +__PMC_EV(IAP, EVENT_F0H_20H) \ +__PMC_EV(IAP, EVENT_F0H_40H) \ +__PMC_EV(IAP, EVENT_F0H_80H) \ +__PMC_EV(IAP, EVENT_F1H_02H) \ +__PMC_EV(IAP, EVENT_F1H_04H) \ +__PMC_EV(IAP, EVENT_F1H_07H) \ +__PMC_EV(IAP, EVENT_F2H_01H) \ +__PMC_EV(IAP, EVENT_F2H_02H) \ +__PMC_EV(IAP, EVENT_F2H_04H) \ +__PMC_EV(IAP, EVENT_F2H_08H) \ +__PMC_EV(IAP, EVENT_F2H_0FH) \ +__PMC_E
svn commit: r200407 - head/sys/boot/pc98/boot2
Author: nyan
Date: Fri Dec 11 12:36:59 2009
New Revision: 200407
URL: http://svn.freebsd.org/changeset/base/200407
Log:
Cleanups the boot2 for pc98. There is no functional change.
- Make setting machine type and getting geom conditional for future.
- Remove unused RAWBOOT and CDBOOT supports.
- Remove unneeded include.
- Fix warnings.
MFC after:1 week
Modified:
head/sys/boot/pc98/boot2/Makefile
head/sys/boot/pc98/boot2/bios.S
head/sys/boot/pc98/boot2/boot.c
head/sys/boot/pc98/boot2/boot.h
head/sys/boot/pc98/boot2/disk.c
head/sys/boot/pc98/boot2/io.c
head/sys/boot/pc98/boot2/serial_16550.S
head/sys/boot/pc98/boot2/sys.c
Modified: head/sys/boot/pc98/boot2/Makefile
==
--- head/sys/boot/pc98/boot2/Makefile Fri Dec 11 12:36:02 2009
(r200406)
+++ head/sys/boot/pc98/boot2/Makefile Fri Dec 11 12:36:59 2009
(r200407)
@@ -28,6 +28,12 @@ CFLAGS+= -DCOMCONSOLE=${BOOT_COMCONSOLE_
BOOT_COMCONSOLE_SPEED?=9600
CFLAGS+= -DCOMSPEED=${BOOT_COMCONSOLE_SPEED}
+# Set machine type to PC98_SYSTEM_PARAMETER
+CFLAGS+= -DSET_MACHINE_TYPE
+
+# Initialize the bi_bios_geom using the BIOS geometry
+CFLAGS+= -DGET_BIOSGEOM
+
# Enable code to take the default boot string from a fixed location on the
# disk. See nextboot(8) and README.386BSD for more info.
#CFLAGS+= -DNAMEBLOCK
Modified: head/sys/boot/pc98/boot2/bios.S
==
--- head/sys/boot/pc98/boot2/bios.S Fri Dec 11 12:36:02 2009
(r200406)
+++ head/sys/boot/pc98/boot2/bios.S Fri Dec 11 12:36:59 2009
(r200407)
@@ -91,8 +91,6 @@ WITH THE USE OR PERFORMANCE OF THIS SOFT
#include "asm.h"
.text
-#ifndef CDBOOT
-
/*
* PC-9801/PC-9821 SCSI MO booting
*2002/06/05-07/03 Kawanobe Koh
@@ -198,98 +196,6 @@ read_end:
ret
-#else /* CDBOOT */
-
-
-/*
- * int
- * getbootspec(struct specpacket *offset)
- *
- * Read CD-ROM boot specification packet to "offset".
- */
-ENTRY(getbootspec)
- push%ebp
- mov %esp, %ebp
-
- push%esi
- push%ebx
-
- movw0x8(%ebp), %si
- mov $0x7f, %edx
-
- /* prot_to_real will set %es to BOOTSEG */
- callEXT(prot_to_real) /* enter real mode */
- movw$0x4b01, %ax/* (do not) terminate disk emulation */
- movb$0x7f, %dl /* any drive */
-
- sti
- int $0x13
- cli
-
- /* save return value (actually movw %ax, %bx) */
- mov %eax, %ebx
-
- data32
- callEXT(real_to_prot) /* back to protected mode */
-
- xor %eax, %eax
- movb%bh, %al/* return value in %ax */
-
- pop %ebx
- pop %esi
- pop %ebp
-
- ret
-
-
-/*
- * int
- * biosreadlba(struct daddrpacket *daddr)
- * Read sectors using the BIOS "read extended" function
- * BIOS call "INT 0x13 Function 0x42" to read sectors from disk into memory
- * Call with %ah = 0x42
- * %dl = drive (0x0 for floppy disk, or emulated CD)
- * %ds:%si = ptr to disk address packet
- * Return:
- * %ah = 0x0 on success; err code on failure
- */
-
-ENTRY(biosreadlba)
- push%ebp
- mov %esp, %ebp
-
- push%ebx
- push%esi
-
- movw8(%ebp), %si
- movl$0, %edx/* emulated CD is always drive 0 */
-
- /* prot_to_real will set %es to BOOTSEG */
- callEXT(prot_to_real) /* enter real mode */
- movw$0x4200, %ax/* subfunction */
- movb$0, %dl
-
- sti
- int $0x13
- cli
-
- /* save return value (actually movw %ax, %bx) */
- mov %eax, %ebx
-
- data32
- callEXT(real_to_prot) /* back to protected mode */
-
- xor %eax, %eax
- movb%bh, %al/* return value in %ax */
-
- pop %esi
- pop %ebx
- pop %ebp
-
- ret
-
-#endif /* !CDBOOT */
-
/*
* getc()
* BIOS call "INT 18H Function 00H" to read character from keyboard
Modified: head/sys/boot/pc98/boot2/boot.c
==
--- head/sys/boot/pc98/boot2/boot.c Fri Dec 11 12:36:02 2009
(r200406)
+++ head/sys/boot/pc98/boot2/boot.c Fri Dec 11 12:36:59 2009
(r200407)
@@ -85,12 +85,13 @@ boot(int drive)
unsigned char disk_equips;
/* Pick up the story from the Bios on geometry of disks */
-
+#ifdef GET_BIOSGEOM
for(ret = 0; ret < 2; ret ++) {
if (*(unsigned char*)V(0xA155d) & (1 << ret)) {
bootinfo.bi_bios_geom[ret] = get_diskinfo(ret + 0x80);
}
}
+#endif
bootinfo.bi_ba
svn commit: r200408 - stable/7/sys/dev/hwpmc
Author: fabient Date: Fri Dec 11 12:38:15 2009 New Revision: 200408 URL: http://svn.freebsd.org/changeset/base/200408 Log: MFC 196739: Add counters for the i7 architecture which were accidentally left out of the original commit of i7 support. These are all the counters on pages A-32 and A-33 of the _Intel(R) 64 and IA32 Architectures Software Developer's Manual Vol 3B_, June 2009. Almost all of these counters relate to operations on the L2 cache. Modified: stable/7/sys/dev/hwpmc/hwpmc_core.c stable/7/sys/dev/hwpmc/pmc_events.h Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/dev/hwpmc/hwpmc_core.c == --- stable/7/sys/dev/hwpmc/hwpmc_core.c Fri Dec 11 12:36:59 2009 (r200407) +++ stable/7/sys/dev/hwpmc/hwpmc_core.c Fri Dec 11 12:38:15 2009 (r200408) @@ -1182,6 +1182,29 @@ static struct iap_event_descr iap_events IAPDESCR(DBH_01H, 0xDB, 0x01, IAP_F_FM | IAP_F_I7), IAPDESCR(E4H_01H, 0xE4, 0x01, IAP_F_FM | IAP_F_I7), IAPDESCR(E5H_01H, 0xE5, 0x01, IAP_F_FM | IAP_F_I7), +IAPDESCR(E6H_01H, 0xE6, 0x01, IAP_F_FM | IAP_F_I7), +IAPDESCR(E6H_02H, 0xE6, 0x02, IAP_F_FM | IAP_F_I7), +IAPDESCR(E8H_01H, 0xE8, 0x01, IAP_F_FM | IAP_F_I7), +IAPDESCR(E8H_02H, 0xE8, 0x02, IAP_F_FM | IAP_F_I7), +IAPDESCR(E8H_03H, 0xE8, 0x03, IAP_F_FM | IAP_F_I7), +IAPDESCR(F0H_01H, 0xF0, 0x01, IAP_F_FM | IAP_F_I7), +IAPDESCR(F0H_02H, 0xF0, 0x02, IAP_F_FM | IAP_F_I7), +IAPDESCR(F0H_04H, 0xF0, 0x04, IAP_F_FM | IAP_F_I7), +IAPDESCR(F0H_08H, 0xF0, 0x08, IAP_F_FM | IAP_F_I7), +IAPDESCR(F0H_10H, 0xF0, 0x10, IAP_F_FM | IAP_F_I7), +IAPDESCR(F0H_20H, 0xF0, 0x20, IAP_F_FM | IAP_F_I7), +IAPDESCR(F0H_40H, 0xF0, 0x40, IAP_F_FM | IAP_F_I7), +IAPDESCR(F0H_80H, 0xF0, 0x80, IAP_F_FM | IAP_F_I7), +IAPDESCR(F1H_02H, 0xF1, 0x02, IAP_F_FM | IAP_F_I7), +IAPDESCR(F1H_04H, 0xF1, 0x04, IAP_F_FM | IAP_F_I7), +IAPDESCR(F1H_07H, 0xF1, 0x07, IAP_F_FM | IAP_F_I7), +IAPDESCR(F2H_01H, 0xF2, 0x01, IAP_F_FM | IAP_F_I7), +IAPDESCR(F2H_02H, 0xF2, 0x02, IAP_F_FM | IAP_F_I7), +IAPDESCR(F2H_04H, 0xF2, 0x04, IAP_F_FM | IAP_F_I7), +IAPDESCR(F2H_08H, 0xF2, 0x08, IAP_F_FM | IAP_F_I7), +IAPDESCR(F2H_0FH, 0xF2, 0x0F, IAP_F_FM | IAP_F_I7), +IAPDESCR(F3H_01H, 0xF3, 0x01, IAP_F_FM | IAP_F_I7), +IAPDESCR(F3H_02H, 0xF3, 0x02, IAP_F_FM | IAP_F_I7), IAPDESCR(F3H_04H, 0xF3, 0x04, IAP_F_FM | IAP_F_I7), IAPDESCR(F3H_08H, 0xF3, 0x08, IAP_F_FM | IAP_F_I7), IAPDESCR(F3H_10H, 0xF3, 0x10, IAP_F_FM | IAP_F_I7), Modified: stable/7/sys/dev/hwpmc/pmc_events.h == --- stable/7/sys/dev/hwpmc/pmc_events.h Fri Dec 11 12:36:59 2009 (r200407) +++ stable/7/sys/dev/hwpmc/pmc_events.h Fri Dec 11 12:38:15 2009 (r200408) @@ -29,8 +29,18 @@ #ifndef _DEV_HWPMC_PMC_EVENTS_H_ #define_DEV_HWPMC_PMC_EVENTS_H_ -/* - * PMC event codes. +/* + * Note: Documentation on adding events can be found both in + * the source tree at src/share/doc/papers/hwpmc/hwpmc.ms + * as well as on-line at: + * + * http://wiki.freebsd.org/PmcTools/PmcHardwareHowTo + * + * Please refer to those resources before you attempt to modify + * this file or the hwpmc driver/subsystem. + */ + +/* * PMC event codes. * * __PMC_EV(CLASS, SYMBOLIC-NAME) * @@ -973,7 +983,30 @@ __PMC_EV(IAP, EVENT_FDH_04H) \ __PMC_EV(IAP, EVENT_FDH_08H) \ __PMC_EV(IAP, EVENT_FDH_10H) \ __PMC_EV(IAP, EVENT_FDH_20H) \ -__PMC_EV(IAP, EVENT_FDH_40H) +__PMC_EV(IAP, EVENT_FDH_40H) \ +__PMC_EV(IAP, EVENT_E6H_02H) \ +__PMC_EV(IAP, EVENT_E8H_01H) \ +__PMC_EV(IAP, EVENT_E8H_02H) \ +__PMC_EV(IAP, EVENT_E8H_03H) \ +__PMC_EV(IAP, EVENT_F0H_01H) \ +__PMC_EV(IAP, EVENT_F0H_02H) \ +__PMC_EV(IAP, EVENT_F0H_04H) \ +__PMC_EV(IAP, EVENT_F0H_08H) \ +__PMC_EV(IAP, EVENT_F0H_10H) \ +__PMC_EV(IAP, EVENT_F0H_20H) \ +__PMC_EV(IAP, EVENT_F0H_40H) \ +__PMC_EV(IAP, EVENT_F0H_80H) \ +__PMC_EV(IAP, EVENT_F1H_02H) \ +__PMC_EV(IAP, EVENT_F1H_04H) \ +__PMC_EV(IAP, EVENT_F1H_07H) \ +__PMC_EV(IAP, EVENT_F2H_01H) \ +__PMC_EV(IAP, EVENT_F2H_02H) \ +__PMC_EV(IAP, EVENT_F2H_04H) \ +__PMC_EV(IAP, EVENT_F2H_08H) \ +__PMC_EV(IAP, EVENT_F2H_0FH) \ +__PMC_EV(IAP, EVENT_F3H_01H) \ +__PMC_EV(IAP, EVENT_F3H_02H) + #defi
svn commit: r200409 - stable/8/sys/dev/ata
Author: mav Date: Fri Dec 11 12:44:44 2009 New Revision: 200409 URL: http://svn.freebsd.org/changeset/base/200409 Log: MFC r200353: Limit maximum I/O size, depending on command set supported by device. It is required to suppot non-LBA48 devices with MAXPHYS above 128K. Same is done in ada(4). Modified: stable/8/sys/dev/ata/ata-disk.c Directory Properties: stable/8/sys/ (props changed) stable/8/sys/amd64/include/xen/ (props changed) stable/8/sys/cddl/contrib/opensolaris/ (props changed) stable/8/sys/contrib/dev/acpica/ (props changed) stable/8/sys/contrib/pf/ (props changed) stable/8/sys/dev/xen/xenpci/ (props changed) Modified: stable/8/sys/dev/ata/ata-disk.c == --- stable/8/sys/dev/ata/ata-disk.c Fri Dec 11 12:38:15 2009 (r200408) +++ stable/8/sys/dev/ata/ata-disk.c Fri Dec 11 12:44:44 2009 (r200409) @@ -126,6 +126,10 @@ ad_attach(device_t dev) adp->disk->d_name = "ad"; adp->disk->d_drv1 = dev; adp->disk->d_maxsize = ch->dma.max_iosize ? ch->dma.max_iosize : DFLTPHYS; +if (atadev->param.support.command2 & ATA_SUPPORT_ADDRESS48) + adp->disk->d_maxsize = min(adp->disk->d_maxsize, 65536 * DEV_BSIZE); +else /* 28bit ATA command limit */ + adp->disk->d_maxsize = min(adp->disk->d_maxsize, 256 * DEV_BSIZE); adp->disk->d_sectorsize = DEV_BSIZE; adp->disk->d_mediasize = DEV_BSIZE * (off_t)adp->total_secs; adp->disk->d_fwsectors = adp->sectors; ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r200410 - stable/7/lib/libpmc
Author: fabient
Date: Fri Dec 11 12:46:41 2009
New Revision: 200410
URL: http://svn.freebsd.org/changeset/base/200410
Log:
MFC 193809:
Fix parsing of Core2 event qualifiers.
Modified:
stable/7/lib/libpmc/libpmc.c
Directory Properties:
stable/7/lib/libpmc/ (props changed)
Modified: stable/7/lib/libpmc/libpmc.c
==
--- stable/7/lib/libpmc/libpmc.cFri Dec 11 12:44:44 2009
(r200409)
+++ stable/7/lib/libpmc/libpmc.cFri Dec 11 12:46:41 2009
(r200410)
@@ -609,22 +609,22 @@ iap_allocate_pmc(enum pmc_event pe, char
pmc_config->pm_caps |= PMC_CAP_USER;
} else if (KWMATCH(p, IAP_KW_ANYTHREAD)) {
pmc_config->pm_md.pm_iap.pm_iap_config |= IAP_ANY;
- } else if (KWMATCH(p, IAP_KW_CORE)) {
+ } else if (KWPREFIXMATCH(p, IAP_KW_CORE "=")) {
n = pmc_parse_mask(iap_core_mask, p, &evmask);
if (n != 1)
return (-1);
- } else if (KWMATCH(p, IAP_KW_AGENT)) {
+ } else if (KWPREFIXMATCH(p, IAP_KW_AGENT "=")) {
n = pmc_parse_mask(iap_agent_mask, p, &evmask);
if (n != 1)
return (-1);
- } else if (KWMATCH(p, IAP_KW_PREFETCH)) {
+ } else if (KWPREFIXMATCH(p, IAP_KW_PREFETCH "=")) {
n = pmc_parse_mask(iap_prefetch_mask, p, &evmask);
if (n != 1)
return (-1);
- } else if (KWMATCH(p, IAP_KW_CACHESTATE)) {
+ } else if (KWPREFIXMATCH(p, IAP_KW_CACHESTATE "=")) {
n = pmc_parse_mask(iap_cachestate_mask, p, &cachestate);
} else if (cpu_info.pm_cputype == PMC_CPU_INTEL_CORE &&
- KWMATCH(p, IAP_KW_TRANSITION)) {
+ KWPREFIXMATCH(p, IAP_KW_TRANSITION "=")) {
n = pmc_parse_mask(iap_transition_mask, p, &evmask);
if (n != 1)
return (-1);
@@ -632,10 +632,10 @@ iap_allocate_pmc(enum pmc_event pe, char
cpu_info.pm_cputype == PMC_CPU_INTEL_CORE2 ||
cpu_info.pm_cputype == PMC_CPU_INTEL_CORE2EXTREME ||
cpu_info.pm_cputype == PMC_CPU_INTEL_COREI7) {
- if (KWMATCH(p, IAP_KW_SNOOPRESPONSE)) {
+ if (KWPREFIXMATCH(p, IAP_KW_SNOOPRESPONSE "=")) {
n = pmc_parse_mask(iap_snoopresponse_mask, p,
&evmask);
- } else if (KWMATCH(p, IAP_KW_SNOOPTYPE)) {
+ } else if (KWPREFIXMATCH(p, IAP_KW_SNOOPTYPE "=")) {
n = pmc_parse_mask(iap_snooptype_mask, p,
&evmask);
} else
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r200399 - head/lib/libtacplus
On Fri, 11 Dec 2009, Shteryana Shopova wrote: Author: syrinx Date: Fri Dec 11 07:53:44 2009 New Revision: 200399 URL: http://svn.freebsd.org/changeset/base/200399 Log: Add support for TACACS+ accounting to libtacplus(3). Submitted by: Michael Pounov mi...@aitbg.com OKed by: emaste Modified: head/lib/libtacplus/libtacplus.3 head/lib/libtacplus/taclib.c head/lib/libtacplus/taclib.h head/lib/libtacplus/taclib_private.h Modified: head/lib/libtacplus/libtacplus.3 == --- head/lib/libtacplus/libtacplus.3Fri Dec 11 04:14:44 2009 (r200398) +++ head/lib/libtacplus/libtacplus.3Fri Dec 11 07:53:44 2009 (r200399) Could you update the .Dd as well? /bz -- Bjoern A. Zeeb It will not break if you know what you are doing. ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r200411 - in stable/8/sys/cam: . ata
Author: mav
Date: Fri Dec 11 12:53:09 2009
New Revision: 200411
URL: http://svn.freebsd.org/changeset/base/200411
Log:
MFC r200180:
If we panicked with SIM lock held, do not try to flush caches.
Extra lock recursing will not make debugging easier.
Modified:
stable/8/sys/cam/ata/ata_da.c
stable/8/sys/cam/cam_periph.h
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/cam/ata/ata_da.c
==
--- stable/8/sys/cam/ata/ata_da.c Fri Dec 11 12:46:41 2009
(r200410)
+++ stable/8/sys/cam/ata/ata_da.c Fri Dec 11 12:53:09 2009
(r200411)
@@ -1040,6 +1040,9 @@ adashutdown(void * arg, int howto)
TAILQ_FOREACH(periph, &adadriver.units, unit_links) {
union ccb ccb;
+ /* If we paniced with lock held - not recurse here. */
+ if (cam_periph_owned(periph))
+ continue;
cam_periph_lock(periph);
softc = (struct ada_softc *)periph->softc;
/*
Modified: stable/8/sys/cam/cam_periph.h
==
--- stable/8/sys/cam/cam_periph.h Fri Dec 11 12:46:41 2009
(r200410)
+++ stable/8/sys/cam/cam_periph.h Fri Dec 11 12:53:09 2009
(r200411)
@@ -190,5 +190,11 @@ cam_periph_unlock(struct cam_periph *per
mtx_unlock(periph->sim->mtx);
}
+static __inline int
+cam_periph_owned(struct cam_periph *periph)
+{
+ return (mtx_owned(periph->sim->mtx));
+}
+
#endif /* _KERNEL */
#endif /* _CAM_CAM_PERIPH_H */
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r200412 - head/lib/libtacplus
Author: syrinx Date: Fri Dec 11 13:05:09 2009 New Revision: 200412 URL: http://svn.freebsd.org/changeset/base/200412 Log: Bump the man page date to the date of the last update. Noticed by: bz Modified: head/lib/libtacplus/libtacplus.3 Modified: head/lib/libtacplus/libtacplus.3 == --- head/lib/libtacplus/libtacplus.3Fri Dec 11 12:53:09 2009 (r200411) +++ head/lib/libtacplus/libtacplus.3Fri Dec 11 13:05:09 2009 (r200412) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd September 2, 1998 +.Dd December 11, 2009 .Dt LIBTACPLUS 3 .Os .Sh NAME ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r200068 - head/usr.bin
On Fri, 11 Dec 2009 12:57:12 +0100
Dag-Erling Sm__rgrav wrote:
> Roman Divacky writes:
> > Stefan Farfeleder wrote:
> > > For me this breaks the ooo-3 build with:
> > >
> > > unzip: -n, -o and -u are contradictory
> > >
> > > The failing command is 'unzip -quo jurt_src.zip'.
> >
> > I dont see a reason why this check is there:
> >
> > if (n_opt + o_opt + u_opt > 1)
> > errorx("-n, -o and -u are contradictory");
> >
> >
> > dag, can you comment?
>
> s/dag/des/, please.
>
> The bug is in OOo.
>
> If you look at extract_file(), you'll see that these three options are
> handled in three separate branches of a multi-branch if.
>
> -n means "never overwrite"
> -o means "always overwrite"
> -u means "sometimes overwrite"
>
> so -uo does not make much sense, and -n along with either -u or -o does
> not make any sense whatsoever.
>
> > /usr/local/bin/unzip seems to accept those together happilly..
>
> You should check if:
>
> a) -uo gives the same result as -u
> b) -uo gives the same result as -o
> c) -ou gives the same result as -u
> d) -ou gives the same result as -o
> e) -uo and -ou give the same result
>
> My guess would be either bc or bde. In either case, there is a risk
> that this is not what the user wanted, so IMHO the best solution is to
> not do anything at all.
>
root:ernst:~:bash:21> /usr/local/bin/unzip --help
-u update files, create if necessary
-n never overwrite existing files
-o overwrite files WITHOUT prompting
I deleted all but uon.
-u has a totally different meaning. Evidently o and n can be combined without
any problem.
---
Gary Jennejohn
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r200068 - head/usr.bin
On Fri, 11 Dec 2009 14:14:12 +0100
Gary Jennejohn wrote:
> On Fri, 11 Dec 2009 12:57:12 +0100
> Dag-Erling Sm__rgrav wrote:
>
> > Roman Divacky writes:
> > > Stefan Farfeleder wrote:
> > > > For me this breaks the ooo-3 build with:
> > > >
> > > > unzip: -n, -o and -u are contradictory
> > > >
> > > > The failing command is 'unzip -quo jurt_src.zip'.
> > >
> > > I dont see a reason why this check is there:
> > >
> > > if (n_opt + o_opt + u_opt > 1)
> > > errorx("-n, -o and -u are contradictory");
> > >
> > >
> > > dag, can you comment?
> >
> > s/dag/des/, please.
> >
> > The bug is in OOo.
> >
> > If you look at extract_file(), you'll see that these three options are
> > handled in three separate branches of a multi-branch if.
> >
> > -n means "never overwrite"
> > -o means "always overwrite"
> > -u means "sometimes overwrite"
> >
> > so -uo does not make much sense, and -n along with either -u or -o does
> > not make any sense whatsoever.
> >
> > > /usr/local/bin/unzip seems to accept those together happilly..
> >
> > You should check if:
> >
> > a) -uo gives the same result as -u
> > b) -uo gives the same result as -o
> > c) -ou gives the same result as -u
> > d) -ou gives the same result as -o
> > e) -uo and -ou give the same result
> >
> > My guess would be either bc or bde. In either case, there is a risk
> > that this is not what the user wanted, so IMHO the best solution is to
> > not do anything at all.
> >
>
> root:ernst:~:bash:21> /usr/local/bin/unzip --help
> -u update files, create if necessary
> -n never overwrite existing files
> -o overwrite files WITHOUT prompting
>
> I deleted all but uon.
>
> -u has a totally different meaning. Evidently o and n can be combined without
> any problem.
>
I meant to hit delete on this mail instead of send. I notice that -u
actually means exactly the same thing for both versions. Too many buttons
on claws-mail.
---
Gary Jennejohn
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r200399 - head/lib/libtacplus
On Fri, Dec 11, 2009 at 2:52 PM, Bjoern A. Zeeb wrote: > > > Could you update the .Dd as well? > Done, thanks! > ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r200413 - in head: . lib lib/libpam/modules/pam_lastlog
Author: ed
Date: Fri Dec 11 14:15:55 2009
New Revision: 200413
URL: http://svn.freebsd.org/changeset/base/200413
Log:
Convert pam_lastlog(8) to libulog.
The information used by the "Last login:"-line is obtained by using
ulog_setutxfile(3) to switch to the lastlog database. Login and logout
are performed using the utility functions ulog_login(3) and
ulog_logout(3).
This also means we must build libulog during bootstrap.
Approved by: des
Modified:
head/Makefile.inc1
head/lib/Makefile
head/lib/libpam/modules/pam_lastlog/Makefile
head/lib/libpam/modules/pam_lastlog/pam_lastlog.c
Modified: head/Makefile.inc1
==
--- head/Makefile.inc1 Fri Dec 11 13:05:09 2009(r200412)
+++ head/Makefile.inc1 Fri Dec 11 14:15:55 2009(r200413)
@@ -1103,8 +1103,8 @@ _prebuild_libs= ${_kerberos5_lib_libasn1
lib/libkiconv lib/libkvm lib/libmd \
lib/ncurses/ncurses lib/ncurses/ncursesw \
lib/libopie lib/libpam ${_lib_libthr} \
- lib/libradius lib/libsbuf lib/libtacplus lib/libutil \
- ${_lib_libypclnt} lib/libz lib/msun \
+ lib/libradius lib/libsbuf lib/libtacplus lib/libulog \
+ lib/libutil ${_lib_libypclnt} lib/libz lib/msun \
${_secure_lib_libcrypto} ${_secure_lib_libssh} \
${_secure_lib_libssl} lib/libdwarf lib/libproc
Modified: head/lib/Makefile
==
--- head/lib/Makefile Fri Dec 11 13:05:09 2009(r200412)
+++ head/lib/Makefile Fri Dec 11 14:15:55 2009(r200413)
@@ -21,6 +21,7 @@
# librpcsvc must be built before libpam.
# libsbuf must be built before libcam.
# libtacplus must be built before libpam.
+# libulog must be built before libpam.
# libutil must be built before libpam.
# libypclnt must be built before libpam.
# libgssapi must be built before librpcsec_gss
@@ -30,8 +31,8 @@
SUBDIR=${_csu} libc libbsm libauditd libcom_err libcrypt libelf libkvm
msun \
libmd \
ncurses ${_libnetgraph} libradius librpcsvc libsbuf \
- libtacplus libutil ${_libypclnt} libalias libarchive ${_libatm} \
- libbegemot ${_libbluetooth} ${_libbsnmp} libbz2 \
+ libtacplus libulog libutil ${_libypclnt} libalias libarchive \
+ ${_libatm} libbegemot ${_libbluetooth} ${_libbsnmp} libbz2 \
libcalendar libcam libcompat libdevinfo libdevstat libdisk \
libdwarf libedit libexpat libfetch libftpio libgeom ${_libgpib} \
${_libgssapi} ${_librpcsec_gss} libipsec \
@@ -40,8 +41,8 @@ SUBDIR= ${_csu} libc libbsm libauditd li
${_libpmc} libproc librt ${_libsdp} ${_libsm} ${_libsmb} \
${_libsmdb} \
${_libsmutil} libstand ${_libtelnet} ${_libthr} libthread_db libufs \
- libugidfw libulog ${_libusbhid} ${_libusb} ${_libvgl} libwrap \
- liby libz ${_bind}
+ libugidfw ${_libusbhid} ${_libusb} ${_libvgl} libwrap liby libz \
+ ${_bind}
.if exists(${.CURDIR}/csu/${MACHINE_ARCH}-elf)
_csu=csu/${MACHINE_ARCH}-elf
Modified: head/lib/libpam/modules/pam_lastlog/Makefile
==
--- head/lib/libpam/modules/pam_lastlog/MakefileFri Dec 11 13:05:09
2009(r200412)
+++ head/lib/libpam/modules/pam_lastlog/MakefileFri Dec 11 14:15:55
2009(r200413)
@@ -28,7 +28,7 @@ LIB= pam_lastlog
SRCS= pam_lastlog.c
MAN= pam_lastlog.8
-DPADD= ${LIBUTIL}
-LDADD= -lutil
+DPADD= ${LIBULOG}
+LDADD= -lulog
.include
Modified: head/lib/libpam/modules/pam_lastlog/pam_lastlog.c
==
--- head/lib/libpam/modules/pam_lastlog/pam_lastlog.c Fri Dec 11 13:05:09
2009(r200412)
+++ head/lib/libpam/modules/pam_lastlog/pam_lastlog.c Fri Dec 11 14:15:55
2009(r200413)
@@ -46,19 +46,9 @@ __FBSDID("$FreeBSD$");
#define _BSD_SOURCE
-#include
-
-#include
-#include
-#include
#include
-#include
-#include
-#include
-#include
#include
-#include
-#include
+#include
#define PAM_SM_SESSION
@@ -71,13 +61,11 @@ pam_sm_open_session(pam_handle_t *pamh,
int argc __unused, const char *argv[] __unused)
{
struct passwd *pwd;
- struct utmp utmp;
- struct lastlog ll;
+ struct ulog_utmpx *utx;
time_t t;
const char *user;
const void *rhost, *tty;
- off_t llpos;
- int fd, pam_err;
+ int pam_err;
pam_err = pam_get_user(pamh, &user, NULL);
if (pam_err != PAM_SUCCESS)
@@ -101,72 +89,29 @@ pam_sm_open_session(pam_handle_t *pamh,
pam_err = PAM_SERVICE_ERR;
goto err;
}
- if (strncmp(tty, _PATH_DEV, strlen(_PATH_DEV)) == 0)
- tty = (const char *)tty + strlen(_PATH_DEV);
- if
svn commit: r200414 - head/sys/dev/ata
Author: mav Date: Fri Dec 11 16:32:59 2009 New Revision: 200414 URL: http://svn.freebsd.org/changeset/base/200414 Log: CFA support doesn't exclude FLUSH support. Submitted by: Grzegorz Bernacki Modified: head/sys/dev/ata/ata-disk.c Modified: head/sys/dev/ata/ata-disk.c == --- head/sys/dev/ata/ata-disk.c Fri Dec 11 14:15:55 2009(r200413) +++ head/sys/dev/ata/ata-disk.c Fri Dec 11 16:32:59 2009(r200414) @@ -136,10 +136,10 @@ ad_attach(device_t dev) adp->disk->d_fwheads = adp->heads; adp->disk->d_unit = device_get_unit(dev); if (atadev->param.support.command2 & ATA_SUPPORT_FLUSHCACHE) - adp->disk->d_flags = DISKFLAG_CANFLUSHCACHE; + adp->disk->d_flags |= DISKFLAG_CANFLUSHCACHE; if ((atadev->param.support.command2 & ATA_SUPPORT_CFA) || atadev->param.config == ATA_PROTO_CFA) - adp->disk->d_flags = DISKFLAG_CANDELETE; + adp->disk->d_flags |= DISKFLAG_CANDELETE; strlcpy(adp->disk->d_ident, atadev->param.serial, sizeof(adp->disk->d_ident)); disk_create(adp->disk, DISK_VERSION); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r200369 - in head: etc share/termcap
Hi,
> On Thu, 10 Dec 2009 22:25:53 + (UTC)
> Ed Schouten said:
ed> Author: ed
ed> Date: Thu Dec 10 22:25:53 2009
ed> New Revision: 200369
ed> URL: http://svn.freebsd.org/changeset/base/200369
ed> Log:
ed> Update termcap entries for xterm.
ed>
ed> It turns out these entries do make Terminal.app behave a little better.
ed> According to Thomas Dickey, Terminal.app should use TERM=nsterm anyway,
ed> but we don't support this yet. Already having an improved termcap entry
ed> helps, so I am going to MFC this change after all.
ed>
ed> Suggested by: Leonidas Tsampros
ed> MFC after:1 month
ed> Modified:
ed> head/etc/termcap.small
ed> head/share/termcap/termcap.src
It's great, thank!!
I believe that our xterm entry was modified not to clear screen when
applications such as less(1) are terminated. Are there any chance to
back to the behavior?
Sincerely,
--
Hajimu UMEMOTO @ Internet Mutual Aid Society Yokohama, Japan
u...@mahoroba.org u...@{,jp.}FreeBSD.org
http://www.imasy.org/~ume/
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r200415 - head/share/man/man4
Author: bcr (doc committer) Date: Fri Dec 11 19:36:10 2009 New Revision: 200415 URL: http://svn.freebsd.org/changeset/base/200415 Log: Reference the correct man page for firmware(9). PR: docs/140985 Submitted by: Glen Barber (glen dot j dot barber at gmail dot com) MFC after: 7 days Reviewed by:rpaulo Approved by:rpaulo, jkois (mentor) Modified: head/share/man/man4/iwnfw.4 Modified: head/share/man/man4/iwnfw.4 == --- head/share/man/man4/iwnfw.4 Fri Dec 11 16:32:59 2009(r200414) +++ head/share/man/man4/iwnfw.4 Fri Dec 11 19:36:10 2009(r200415) @@ -60,4 +60,4 @@ It may be statically linked into the kernel, or loaded as a module. .Sh SEE ALSO .Xr iwn 4 , -.Xr firmware 8 +.Xr firmware 9 ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r200416 - head/usr.sbin/mergemaster
Author: dougb
Date: Fri Dec 11 23:03:35 2009
New Revision: 200416
URL: http://svn.freebsd.org/changeset/base/200416
Log:
Simplify handling of MTREEFILE relative to DESTDIR
Make the message about a missing MTREEFILE combined with -U
more informative
Modified:
head/usr.sbin/mergemaster/mergemaster.sh
Modified: head/usr.sbin/mergemaster/mergemaster.sh
==
--- head/usr.sbin/mergemaster/mergemaster.shFri Dec 11 19:36:10 2009
(r200415)
+++ head/usr.sbin/mergemaster/mergemaster.shFri Dec 11 23:03:35 2009
(r200416)
@@ -263,7 +263,7 @@ fi
# Assign the location of the mtree database
#
-MTREEDB=${MTREEDB:-/var/db}
+MTREEDB=${MTREEDB:-${DESTDIR}/var/db}
MTREEFILE="${MTREEDB}/mergemaster.mtree"
# Check the command line options
@@ -351,9 +351,10 @@ fi
case "${AUTO_UPGRADE}" in
'') ;; # If the option is not set no need to run the test or warn the user
*)
- if [ ! -s "${DESTDIR}${MTREEFILE}" ]; then
+ if [ ! -s "${MTREEFILE}" ]; then
echo ''
-echo "*** Unable to find mtree database. Skipping auto-upgrade on this
run."
+echo "*** Unable to find mtree database (${MTREEFILE})."
+echo "Skipping auto-upgrade on this run."
echo "It will be created for the next run when this one is complete."
echo ''
press_to_continue
@@ -463,9 +464,9 @@ MM_MAKE="make ${ARCHSTRING} -m ${SOURCED
# Check DESTDIR against the mergemaster mtree database to see what
# files the user changed from the reference files.
#
-if [ -n "${AUTO_UPGRADE}" -a -s "${DESTDIR}${MTREEFILE}" ]; then
+if [ -n "${AUTO_UPGRADE}" -a -s "${MTREEFILE}" ]; then
CHANGED=:
- for file in `mtree -eqL -f ${DESTDIR}${MTREEFILE} -p ${DESTDIR}/ \
+ for file in `mtree -eqL -f ${MTREEFILE} -p ${DESTDIR}/ \
2>/dev/null | awk '($2 == "changed") {print $1}'`; do
if [ -f "${DESTDIR}/$file" ]; then
CHANGED="${CHANGED}${DESTDIR}/${file}:"
@@ -1061,8 +1062,8 @@ echo "*** Comparison complete"
if [ -s "${MTREENEW}" ]; then
echo "*** Saving mtree database for future upgrades"
- test -e "${DESTDIR}${MTREEFILE}" && unlink ${DESTDIR}${MTREEFILE}
- mv ${MTREENEW} ${DESTDIR}${MTREEFILE}
+ test -e "${MTREEFILE}" && unlink ${MTREEFILE}
+ mv ${MTREENEW} ${MTREEFILE}
fi
echo ''
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r200417 - head/usr.bin/make
Author: delphij
Date: Fri Dec 11 23:20:02 2009
New Revision: 200417
URL: http://svn.freebsd.org/changeset/base/200417
Log:
Remove unnecessary includes.
Reviewed by: rodrigc
Modified:
head/usr.bin/make/arch.c
head/usr.bin/make/dir.c
head/usr.bin/make/for.c
head/usr.bin/make/globals.h
head/usr.bin/make/lst.c
head/usr.bin/make/lst.h
head/usr.bin/make/make.c
head/usr.bin/make/str.c
head/usr.bin/make/targ.c
head/usr.bin/make/var.c
Modified: head/usr.bin/make/arch.c
==
--- head/usr.bin/make/arch.cFri Dec 11 23:03:35 2009(r200416)
+++ head/usr.bin/make/arch.cFri Dec 11 23:20:02 2009(r200417)
@@ -103,7 +103,6 @@ __FBSDID("$FreeBSD$");
#include "arch.h"
#include "buf.h"
-#include "config.h"
#include "dir.h"
#include "globals.h"
#include "GNode.h"
Modified: head/usr.bin/make/dir.c
==
--- head/usr.bin/make/dir.c Fri Dec 11 23:03:35 2009(r200416)
+++ head/usr.bin/make/dir.c Fri Dec 11 23:20:02 2009(r200417)
@@ -90,7 +90,6 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
-#include
#include "arch.h"
#include "dir.h"
@@ -98,7 +97,6 @@ __FBSDID("$FreeBSD$");
#include "GNode.h"
#include "hash.h"
#include "lst.h"
-#include "make.h"
#include "str.h"
#include "targ.h"
#include "util.h"
Modified: head/usr.bin/make/for.c
==
--- head/usr.bin/make/for.c Fri Dec 11 23:03:35 2009(r200416)
+++ head/usr.bin/make/for.c Fri Dec 11 23:20:02 2009(r200417)
@@ -50,11 +50,9 @@ __FBSDID("$FreeBSD$");
#include
#include "buf.h"
-#include "dir.h"
#include "for.h"
#include "globals.h"
#include "lst.h"
-#include "make.h"
#include "parse.h"
#include "str.h"
#include "util.h"
Modified: head/usr.bin/make/globals.h
==
--- head/usr.bin/make/globals.h Fri Dec 11 23:03:35 2009(r200416)
+++ head/usr.bin/make/globals.h Fri Dec 11 23:20:02 2009(r200417)
@@ -45,9 +45,6 @@
* Global Variables
*/
-#include
-#include
-
#include "lst.h"
#include "util.h"
Modified: head/usr.bin/make/lst.c
==
--- head/usr.bin/make/lst.c Fri Dec 11 23:03:35 2009(r200416)
+++ head/usr.bin/make/lst.c Fri Dec 11 23:20:02 2009(r200417)
@@ -41,7 +41,6 @@
#include
#include "lst.h"
-#include "make.h"
#include "util.h"
/**
Modified: head/usr.bin/make/lst.h
==
--- head/usr.bin/make/lst.h Fri Dec 11 23:03:35 2009(r200416)
+++ head/usr.bin/make/lst.h Fri Dec 11 23:20:02 2009(r200417)
@@ -48,8 +48,6 @@
* Header for using the list library
*/
-#include "util.h"
-
/*
* Structure of a list node.
*/
Modified: head/usr.bin/make/make.c
==
--- head/usr.bin/make/make.cFri Dec 11 23:03:35 2009(r200416)
+++ head/usr.bin/make/make.cFri Dec 11 23:20:02 2009(r200417)
@@ -72,10 +72,7 @@ __FBSDID("$FreeBSD$");
* and perform the .USE actions if so.
*/
-#include
-
#include "arch.h"
-#include "config.h"
#include "dir.h"
#include "globals.h"
#include "GNode.h"
Modified: head/usr.bin/make/str.c
==
--- head/usr.bin/make/str.c Fri Dec 11 23:03:35 2009(r200416)
+++ head/usr.bin/make/str.c Fri Dec 11 23:20:02 2009(r200417)
@@ -41,12 +41,10 @@
#include
__FBSDID("$FreeBSD$");
-#include
#include
#include
#include "buf.h"
-#include "globals.h"
#include "str.h"
#include "util.h"
Modified: head/usr.bin/make/targ.c
==
--- head/usr.bin/make/targ.cFri Dec 11 23:03:35 2009(r200416)
+++ head/usr.bin/make/targ.cFri Dec 11 23:20:02 2009(r200417)
@@ -78,13 +78,11 @@ __FBSDID("$FreeBSD$");
*/
#include
-#include
#include "dir.h"
#include "globals.h"
#include "GNode.h"
#include "hash.h"
-#include "make.h"
#include "suff.h"
#include "targ.h"
#include "util.h"
Modified: head/usr.bin/make/var.c
==
--- head/usr.bin/make/var.c Fri Dec 11 23:03:35 2009(r200416)
+++ head/usr.bin/make/var.c Fri Dec 11 23:20:02 2009(r200417)
@@ -84,7 +84,6 @@ __FBSDID("$FreeBSD$");
* XXX: There's a lot of duplication in these functions.
*/
-#include
#include
#include
#include
@@ -97,7 +96,6 @@ __FBSDID("$FreeBSD$");
#include "GNode.h"
#include "job.h"
#include "lst.h"
-#include "make.h"
#include
svn commit: r200418 - head/usr.bin/talk
Author: delphij
Date: Fri Dec 11 23:23:57 2009
New Revision: 200418
URL: http://svn.freebsd.org/changeset/base/200418
Log:
Move unistd.h includes to individual .c files and remove unnecessary
includes.
Modified:
head/usr.bin/talk/ctl_transact.c
head/usr.bin/talk/display.c
head/usr.bin/talk/get_addrs.c
head/usr.bin/talk/get_iface.c
head/usr.bin/talk/get_names.c
head/usr.bin/talk/invite.c
head/usr.bin/talk/look_up.c
head/usr.bin/talk/talk.c
head/usr.bin/talk/talk.h
Modified: head/usr.bin/talk/ctl_transact.c
==
--- head/usr.bin/talk/ctl_transact.cFri Dec 11 23:20:02 2009
(r200417)
+++ head/usr.bin/talk/ctl_transact.cFri Dec 11 23:23:57 2009
(r200418)
@@ -42,7 +42,6 @@ static const char sccsid[] = "@(#)ctl_tr
#include
#include
-#include
#include "talk.h"
#include "talk_ctl.h"
Modified: head/usr.bin/talk/display.c
==
--- head/usr.bin/talk/display.c Fri Dec 11 23:20:02 2009(r200417)
+++ head/usr.bin/talk/display.c Fri Dec 11 23:23:57 2009(r200418)
@@ -44,6 +44,7 @@ static const char sccsid[] = "@(#)displa
* displaying of text
*/
#include
+#include
#include "talk.h"
Modified: head/usr.bin/talk/get_addrs.c
==
--- head/usr.bin/talk/get_addrs.c Fri Dec 11 23:20:02 2009
(r200417)
+++ head/usr.bin/talk/get_addrs.c Fri Dec 11 23:23:57 2009
(r200418)
@@ -42,6 +42,7 @@ static const char sccsid[] = "@(#)get_ad
#include
#include
#include
+#include
#include "talk.h"
#include "talk_ctl.h"
Modified: head/usr.bin/talk/get_iface.c
==
--- head/usr.bin/talk/get_iface.c Fri Dec 11 23:20:02 2009
(r200417)
+++ head/usr.bin/talk/get_iface.c Fri Dec 11 23:23:57 2009
(r200418)
@@ -38,6 +38,7 @@ __FBSDID("$FreeBSD$");
#include
#include
+#include
#include "talk.h"
Modified: head/usr.bin/talk/get_names.c
==
--- head/usr.bin/talk/get_names.c Fri Dec 11 23:20:02 2009
(r200417)
+++ head/usr.bin/talk/get_names.c Fri Dec 11 23:23:57 2009
(r200418)
@@ -45,6 +45,7 @@ static const char sccsid[] = "@(#)get_na
#include
#include
#include
+#include
#include "talk.h"
Modified: head/usr.bin/talk/invite.c
==
--- head/usr.bin/talk/invite.c Fri Dec 11 23:20:02 2009(r200417)
+++ head/usr.bin/talk/invite.c Fri Dec 11 23:23:57 2009(r200418)
@@ -47,6 +47,7 @@ static const char sccsid[] = "@(#)invite
#include
#include
#include
+#include
#include "talk_ctl.h"
#include "talk.h"
Modified: head/usr.bin/talk/look_up.c
==
--- head/usr.bin/talk/look_up.c Fri Dec 11 23:20:02 2009(r200417)
+++ head/usr.bin/talk/look_up.c Fri Dec 11 23:23:57 2009(r200418)
@@ -45,6 +45,7 @@ static const char sccsid[] = "@(#)look_u
#include
#include
+#include
#include "talk_ctl.h"
#include "talk.h"
Modified: head/usr.bin/talk/talk.c
==
--- head/usr.bin/talk/talk.cFri Dec 11 23:20:02 2009(r200417)
+++ head/usr.bin/talk/talk.cFri Dec 11 23:23:57 2009(r200418)
@@ -46,6 +46,7 @@ static const char copyright[] =
#endif
#include
+#include
#include "talk.h"
Modified: head/usr.bin/talk/talk.h
==
--- head/usr.bin/talk/talk.hFri Dec 11 23:20:02 2009(r200417)
+++ head/usr.bin/talk/talk.hFri Dec 11 23:23:57 2009(r200418)
@@ -42,7 +42,6 @@
#include
#include
#include
-#include
extern int sockt;
extern int curses_initialized;
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r200419 - head/usr.bin/tset
Author: delphij
Date: Fri Dec 11 23:30:22 2009
New Revision: 200419
URL: http://svn.freebsd.org/changeset/base/200419
Log:
Remove unnecessary termcap.h includes inherited from extern.h and other
unneeded headers. While I'm there, make function definations ANSI
prototypes.
Modified:
head/usr.bin/tset/extern.h
head/usr.bin/tset/map.c
head/usr.bin/tset/misc.c
head/usr.bin/tset/set.c
head/usr.bin/tset/term.c
head/usr.bin/tset/tset.c
head/usr.bin/tset/wrterm.c
Modified: head/usr.bin/tset/extern.h
==
--- head/usr.bin/tset/extern.h Fri Dec 11 23:23:57 2009(r200418)
+++ head/usr.bin/tset/extern.h Fri Dec 11 23:30:22 2009(r200419)
@@ -34,8 +34,6 @@
* $FreeBSD$
*/
-#include
-
extern struct termios mode, oldmode;
extern int Columns, isreset, Lines;
extern int erasech, intrchar, killch;
Modified: head/usr.bin/tset/map.c
==
--- head/usr.bin/tset/map.c Fri Dec 11 23:23:57 2009(r200418)
+++ head/usr.bin/tset/map.c Fri Dec 11 23:30:22 2009(r200419)
@@ -75,9 +75,7 @@ MAP *cur, *maplist;
* The baud rate tests are: >, <, @, =, !
*/
void
-add_mapping(port, arg)
- const char *port;
- char *arg;
+add_mapping(const char *port, char *arg)
{
MAP *mapp;
char *copy, *p, *termp;
@@ -190,8 +188,7 @@ badmopt:errx(1, "illegal -m option for
* 'type'.
*/
const char *
-mapped(type)
- const char *type;
+mapped(const char *type)
{
MAP *mapp;
int match;
@@ -240,8 +237,7 @@ SPEEDS speeds[] = {
};
speed_t
-tset_baudrate(rate)
- char *rate;
+tset_baudrate(char *rate)
{
SPEEDS *sp;
speed_t speed;
Modified: head/usr.bin/tset/misc.c
==
--- head/usr.bin/tset/misc.cFri Dec 11 23:23:57 2009(r200418)
+++ head/usr.bin/tset/misc.cFri Dec 11 23:30:22 2009(r200419)
@@ -42,15 +42,12 @@ static const char sccsid[] = "@(#)misc.c
#include
#include
#include
-#include
-#include
#include
#include "extern.h"
void
-cat(file)
- char *file;
+cat(char *file)
{
register int fd, nr, nw;
char buf[1024];
@@ -67,8 +64,7 @@ cat(file)
}
int
-outc(c)
- int c;
+outc(int c)
{
return putc(c, stderr);
}
Modified: head/usr.bin/tset/set.c
==
--- head/usr.bin/tset/set.c Fri Dec 11 23:23:57 2009(r200418)
+++ head/usr.bin/tset/set.c Fri Dec 11 23:30:22 2009(r200419)
@@ -40,6 +40,7 @@ static const char sccsid[] = "@(#)set.c
#endif
#include
+#include
#include
#include
@@ -54,7 +55,7 @@ int set_tabs(void);
* a child program dies in raw mode.
*/
void
-reset_mode()
+reset_mode(void)
{
tcgetattr(STDERR_FILENO, &mode);
@@ -155,7 +156,7 @@ reset_mode()
* entry and command line and update their values in 'mode'.
*/
void
-set_control_chars()
+set_control_chars(void)
{
char *bp, *p, bs_char, buf[1024];
@@ -192,8 +193,7 @@ set_control_chars()
* uppercase to internal lowercase.
*/
void
-set_conversions(usingupper)
- int usingupper;
+set_conversions(int usingupper)
{
if (tgetflag("UC") || usingupper) {
#ifdef IUCLC
@@ -238,7 +238,7 @@ set_conversions(usingupper)
/* Output startup string. */
void
-set_init()
+set_init(void)
{
char *bp, buf[1024];
int settle;
@@ -282,7 +282,7 @@ set_init()
* Return nonzero if we set any tab stops, zero if not.
*/
int
-set_tabs()
+set_tabs(void)
{
int c;
char *capsp, *clear_tabs;
Modified: head/usr.bin/tset/term.c
==
--- head/usr.bin/tset/term.cFri Dec 11 23:23:57 2009(r200418)
+++ head/usr.bin/tset/term.cFri Dec 11 23:30:22 2009(r200419)
@@ -45,6 +45,7 @@ static const char sccsid[] = "@(#)term.c
#include
#include
#include
+#include
#include
#include
#include "extern.h"
@@ -59,8 +60,7 @@ char *ttys(char *);
* its termcap entry.
*/
const char *
-get_termcap_entry(userarg, tcapbufp)
- char *userarg, **tcapbufp;
+get_termcap_entry(char *userarg, char **tcapbufp)
{
struct ttyent *t;
int rval;
@@ -125,8 +125,7 @@ found: if ((p = getenv("TERMCAP")) != NU
/* Prompt the user for a terminal type. */
const char *
-askuser(dflt)
- const char *dflt;
+askuser(const char *dflt)
{
static char answer[256];
char *p;
Modified: head/usr.bin/tset/tset.c
==
--- head/usr.bin/tset/tset.cFri Dec 11 23:23:57 2009(r200418)
+++ head/usr.bin/tset/tset.cFri Dec 11 23:30:22 2009(r200419)
@@ -53,6 +53,7 @@ static const char sccsid[
svn commit: r200420 - in head/usr.bin: ar c89 calendar cksum cmp colcrt colrm compress cpuset expand fetch file2c find finger fmt fold gcore getopt hexdump jot killall ktrace lastcomm limits lock l...
Author: delphij
Date: Fri Dec 11 23:35:38 2009
New Revision: 200420
URL: http://svn.freebsd.org/changeset/base/200420
Log:
Remove unneeded header includes from usr.bin/ except contributed code.
Tested with: make universe
Modified:
head/usr.bin/ar/util.c
head/usr.bin/c89/c89.c
head/usr.bin/calendar/calendar.c
head/usr.bin/calendar/day.c
head/usr.bin/calendar/ostern.c
head/usr.bin/calendar/paskha.c
head/usr.bin/cksum/Makefile
head/usr.bin/cksum/crc.c
head/usr.bin/cksum/crc32.c
head/usr.bin/cksum/sum1.c
head/usr.bin/cksum/sum2.c
head/usr.bin/cmp/regular.c
head/usr.bin/cmp/special.c
head/usr.bin/colcrt/colcrt.c
head/usr.bin/colrm/colrm.c
head/usr.bin/compress/zopen.c
head/usr.bin/cpuset/cpuset.c
head/usr.bin/expand/expand.c
head/usr.bin/fetch/fetch.c
head/usr.bin/file2c/file2c.c
head/usr.bin/find/find.c
head/usr.bin/find/getdate.y
head/usr.bin/find/ls.c
head/usr.bin/find/main.c
head/usr.bin/find/misc.c
head/usr.bin/find/option.c
head/usr.bin/finger/lprint.c
head/usr.bin/finger/net.c
head/usr.bin/finger/util.c
head/usr.bin/fmt/fmt.c
head/usr.bin/fold/fold.c
head/usr.bin/gcore/gcore.c
head/usr.bin/getopt/getopt.c
head/usr.bin/hexdump/display.c
head/usr.bin/hexdump/hexdump.c
head/usr.bin/jot/jot.c
head/usr.bin/killall/killall.c
head/usr.bin/ktrace/subr.c
head/usr.bin/lastcomm/lastcomm.c
head/usr.bin/lastcomm/pathnames.h
head/usr.bin/lastcomm/readrec.c
head/usr.bin/limits/limits.c
head/usr.bin/lock/lock.c
head/usr.bin/login/login.c
head/usr.bin/login/login_fbtab.c
head/usr.bin/login/pathnames.h
head/usr.bin/mesg/mesg.c
head/usr.bin/mkfifo/mkfifo.c
head/usr.bin/mklocale/yacc.y
head/usr.bin/mktemp/mktemp.c
head/usr.bin/ncal/ncal.c
head/usr.bin/netstat/atalk.c
head/usr.bin/netstat/bpf.c
head/usr.bin/netstat/if.c
head/usr.bin/netstat/ipsec.c
head/usr.bin/netstat/ipx.c
head/usr.bin/netstat/main.c
head/usr.bin/netstat/mbuf.c
head/usr.bin/netstat/netgraph.c
head/usr.bin/netstat/pfkey.c
head/usr.bin/netstat/route.c
head/usr.bin/netstat/sctp.c
head/usr.bin/newgrp/newgrp.c
head/usr.bin/newkey/update.c
head/usr.bin/nfsstat/nfsstat.c
head/usr.bin/nohup/nohup.c
head/usr.bin/passwd/passwd.c
head/usr.bin/paste/paste.c
head/usr.bin/pr/egetopt.c
head/usr.bin/procstat/procstat_args.c
head/usr.bin/procstat/procstat_basic.c
head/usr.bin/procstat/procstat_files.c
head/usr.bin/procstat/procstat_vm.c
head/usr.bin/rev/rev.c
head/usr.bin/rlogin/rlogin.c
head/usr.bin/rpcgen/rpc_clntout.c
head/usr.bin/rpcgen/rpc_hout.c
head/usr.bin/rpcgen/rpc_tblout.c
head/usr.bin/rpcgen/rpc_util.c
head/usr.bin/ruptime/ruptime.c
head/usr.bin/rwall/rwall.c
head/usr.bin/sed/main.c
head/usr.bin/sed/misc.c
head/usr.bin/showmount/showmount.c
head/usr.bin/su/su.c
head/usr.bin/systat/fetch.c
head/usr.bin/systat/icmp.c
head/usr.bin/systat/iostat.c
head/usr.bin/systat/ip.c
head/usr.bin/systat/main.c
head/usr.bin/systat/mbufs.c
head/usr.bin/systat/mode.c
head/usr.bin/systat/netstat.c
head/usr.bin/systat/swap.c
head/usr.bin/systat/tcp.c
head/usr.bin/systat/vmstat.c
head/usr.bin/tar/getdate.c
head/usr.bin/tee/tee.c
head/usr.bin/time/time.c
head/usr.bin/tput/tput.c
head/usr.bin/tr/cmap.c
head/usr.bin/tr/cmap.h
head/usr.bin/tr/cset.c
head/usr.bin/tr/cset.h
head/usr.bin/tr/str.c
head/usr.bin/tr/tr.c
head/usr.bin/truss/main.c
head/usr.bin/truss/setup.c
head/usr.bin/tsort/tsort.c
head/usr.bin/ul/ul.c
head/usr.bin/unexpand/unexpand.c
head/usr.bin/usbhidaction/usbhidaction.c
head/usr.bin/vis/foldit.c
head/usr.bin/w/pr_time.c
head/usr.bin/w/w.c
head/usr.bin/wall/ttymsg.c
head/usr.bin/who/who.c
head/usr.bin/xinstall/xinstall.c
head/usr.bin/ypcat/ypcat.c
head/usr.bin/ypmatch/ypmatch.c
head/usr.bin/ypwhich/ypwhich.c
Modified: head/usr.bin/ar/util.c
==
--- head/usr.bin/ar/util.c Fri Dec 11 23:30:22 2009(r200419)
+++ head/usr.bin/ar/util.c Fri Dec 11 23:35:38 2009(r200420)
@@ -29,7 +29,6 @@ __FBSDID("$FreeBSD$");
#include
#include
-#include
#include
#include
#include
Modified: head/usr.bin/c89/c89.c
==
--- head/usr.bin/c89/c89.c Fri Dec 11 23:30:22 2009(r200419)
+++ head/usr.bin/c89/c89.c Fri Dec 11 23:35:38 2009(r200420)
@@ -33,7 +33,6 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
-#include
#include
Modified: head/usr.bin/calendar/calendar.c
==
--- head/usr.bin/calendar/calendar.cFri Dec 11 23:30:22 2009
(r200419)
+++ head/usr.bin/calendar/calendar.cFri Dec 11 23:35:38 2009
(r200420)
@@ -55,7 +55,6 @@ __FBSDID("$FreeBSD$");
#include
#include
-#include "pathnames.h"
#include "calendar.h"
str
Re: svn commit: r200420 - in head/usr.bin: ar c89 calendar cksum cmp colcrt colrm compress cpuset expand fetch file2c find finger fmt fold gcore getopt hexdump jot killall ktrace lastcomm limits lock
* Xin LI wrote: > Author: delphij > Date: Fri Dec 11 23:35:38 2009 > New Revision: 200420 > URL: http://svn.freebsd.org/changeset/base/200420 > > Log: > Remove unneeded header includes from usr.bin/ except contributed code. Wow. Did you use any special tools to do this? -- Ed Schouten WWW: http://80386.nl/ pgp1H3dAef8TU.pgp Description: PGP signature
svn commit: r200421 - head/lib/libulog
Author: ed Date: Fri Dec 11 23:52:42 2009 New Revision: 200421 URL: http://svn.freebsd.org/changeset/base/200421 Log: The hostname passed to ulog_login(3) may be optional. Don't trip on a null pointer being passed to this function when performing a local login. Noticed by: dougb Modified: head/lib/libulog/ulog_login.c Modified: head/lib/libulog/ulog_login.c == --- head/lib/libulog/ulog_login.c Fri Dec 11 23:35:38 2009 (r200420) +++ head/lib/libulog/ulog_login.c Fri Dec 11 23:52:42 2009 (r200421) @@ -48,7 +48,8 @@ ulog_login(const char *line, const char utx.ut_type = USER_PROCESS; strncpy(utx.ut_line, line, sizeof utx.ut_line); strncpy(utx.ut_user, user, sizeof utx.ut_user); - strncpy(utx.ut_host, host, sizeof utx.ut_host); + if (host != NULL) + strncpy(utx.ut_host, host, sizeof utx.ut_host); gettimeofday(&utx.ut_tv, NULL); ulog_pututxline(&utx); ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r200422 - head/sys/dev/vge
Author: yongari Date: Sat Dec 12 00:06:43 2009 New Revision: 200422 URL: http://svn.freebsd.org/changeset/base/200422 Log: Remove driver lock assertion in MII register access. This change was made in r199543 to remove MTX_RECURSE. These routines can be called in device attach phase(e.g. mii_phy_probe()) so checking assertion here is not right as caller does not hold a driver lock. Modified: head/sys/dev/vge/if_vge.c Modified: head/sys/dev/vge/if_vge.c == --- head/sys/dev/vge/if_vge.c Fri Dec 11 23:52:42 2009(r200421) +++ head/sys/dev/vge/if_vge.c Sat Dec 12 00:06:43 2009(r200422) @@ -378,7 +378,6 @@ vge_miibus_readreg(dev, phy, reg) if (phy != (CSR_READ_1(sc, VGE_MIICFG) & 0x1F)) return(0); - VGE_LOCK_ASSERT(sc); vge_miipoll_stop(sc); /* Specify the register we want to read. */ @@ -417,7 +416,6 @@ vge_miibus_writereg(dev, phy, reg, data) if (phy != (CSR_READ_1(sc, VGE_MIICFG) & 0x1F)) return(0); - VGE_LOCK_ASSERT(sc); vge_miipoll_stop(sc); /* Specify the register we want to write. */ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r200423 - head/lib/libutil
Author: scf
Date: Sat Dec 12 00:11:40 2009
New Revision: 200423
URL: http://svn.freebsd.org/changeset/base/200423
Log:
Remove a dead store.
MFC after:5 days
Modified:
head/lib/libutil/gr_util.c
Modified: head/lib/libutil/gr_util.c
==
--- head/lib/libutil/gr_util.c Sat Dec 12 00:06:43 2009(r200422)
+++ head/lib/libutil/gr_util.c Sat Dec 12 00:11:40 2009(r200423)
@@ -117,8 +117,8 @@ gr_make(const struct group *gr)
/* Create the group line and fill it. */
if ((line = malloc(line_size)) == NULL)
return (NULL);
- line_size = snprintf(line, line_size, group_line_format, gr->gr_name,
- gr->gr_passwd, (uintmax_t)gr->gr_gid);
+ snprintf(line, line_size, group_line_format, gr->gr_name, gr->gr_passwd,
+ (uintmax_t)gr->gr_gid);
if (gr->gr_mem != NULL)
for (ndx = 0; gr->gr_mem[ndx] != NULL; ndx++) {
strcat(line, gr->gr_mem[ndx]);
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r200424 - head/lib/libusb
Author: scf
Date: Sat Dec 12 00:24:30 2009
New Revision: 200424
URL: http://svn.freebsd.org/changeset/base/200424
Log:
Fix libusb_open_device_with_vid_pid() to return a NULL if no device is
found instead of the last device in its search list.
Reviewed by: thompsa
MFC after:5 days
Modified:
head/lib/libusb/libusb10.c
Modified: head/lib/libusb/libusb10.c
==
--- head/lib/libusb/libusb10.c Sat Dec 12 00:11:40 2009(r200423)
+++ head/lib/libusb/libusb10.c Sat Dec 12 00:24:30 2009(r200424)
@@ -379,8 +379,6 @@ libusb_open_device_with_vid_pid(libusb_c
if ((i = libusb_get_device_list(ctx, &devs)) < 0)
return (NULL);
- pdev = NULL;
-
for (j = 0; j < i; j++) {
pdev = devs[j]->os_priv;
pdesc = libusb20_dev_get_device_desc(pdev);
@@ -396,6 +394,8 @@ libusb_open_device_with_vid_pid(libusb_c
break;
}
}
+ if (j == i)
+ pdev = NULL;
libusb_free_device_list(devs, 1);
DPRINTF(ctx, LIBUSB_DEBUG_FUNCTION, "libusb_open_device_width_vid_pid
leave");
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r200420 - in head/usr.bin: ar c89 calendar cksum cmp colcrt colrm compress cpuset expand fetch file2c find finger fmt fold gcore getopt hexdump jot killall ktrace lastcomm limits lock
On Sat, 12 Dec 2009 00:50:52 +0100 Ed Schouten wrote: > * Xin LI wrote: > > Author: delphij > > Date: Fri Dec 11 23:35:38 2009 > > New Revision: 200420 > > URL: http://svn.freebsd.org/changeset/base/200420 > > > > Log: > > Remove unneeded header includes from usr.bin/ except contributed > > code. > > Wow. Did you use any special tools to do this? > > -- > Ed Schouten > WWW: http://80386.nl/ Better yet, could you share the criteria used to determine which include is required and which is not? -- Alexander Kabaev signature.asc Description: PGP signature
svn commit: r200425 - head/usr.sbin/mergemaster
Author: dougb
Date: Sat Dec 12 02:19:41 2009
New Revision: 200425
URL: http://svn.freebsd.org/changeset/base/200425
Log:
Over time things that used to be files/directories/links can change
to something else. So add code to detect when things don't match and
give the user choices about how to fix it.
If we're using -P and something in the above check needs to be moved
we need to have the directory there for it, so create it at the
beginning and delete empty versions of it at the end.
The case where something used to be a file or link and now is supposed
to be a directory (e.g., /etc/security) is especially dangerous, so
make failure to install a necessary directory in $DESTDIR a fatal error.
Modified:
head/usr.sbin/mergemaster/mergemaster.sh
Modified: head/usr.sbin/mergemaster/mergemaster.sh
==
--- head/usr.sbin/mergemaster/mergemaster.shSat Dec 12 00:24:30 2009
(r200424)
+++ head/usr.sbin/mergemaster/mergemaster.shSat Dec 12 02:19:41 2009
(r200425)
@@ -345,6 +345,7 @@ done
# Don't force the user to set this in the mergemaster rc file
if [ -n "${PRESERVE_FILES}" -a -z "${PRESERVE_FILES_DIR}" ]; then
PRESERVE_FILES_DIR=/var/tmp/mergemaster/preserved-files-`date +%y%m%d-%H%M%S`
+ mkdir -p ${PRESERVE_FILES_DIR}
fi
# Check for the mtree database in DESTDIR
@@ -819,7 +820,8 @@ mm_install () {
if [ -n "${DESTDIR}${INSTALL_DIR}" -a ! -d "${DESTDIR}${INSTALL_DIR}" ]; then
DIR_MODE=`find_mode "${TEMPROOT}/${INSTALL_DIR}"`
-install -d -o root -g wheel -m "${DIR_MODE}" "${DESTDIR}${INSTALL_DIR}"
+install -d -o root -g wheel -m "${DIR_MODE}" "${DESTDIR}${INSTALL_DIR}" ||
+ install_error $1 ${DESTDIR}${INSTALL_DIR}
fi
FILE_MODE=`find_mode "${1}"`
@@ -968,6 +970,57 @@ if [ -r "${MM_PRE_COMPARE_SCRIPT}" ]; th
. "${MM_PRE_COMPARE_SCRIPT}"
fi
+# Things that were files/directories/links in one version can sometimes
+# change to something else in a newer version. So we need to explicitly
+# test for this, and warn the user if what we find does not match.
+#
+for COMPFILE in `find .` ; do
+ if [ -e "${DESTDIR}${COMPFILE#.}" ]; then
+INSTALLED_TYPE=`stat -f '%HT' ${DESTDIR}${COMPFILE#.}`
+ else
+continue
+ fi
+ TEMPROOT_TYPE=`stat -f '%HT' $COMPFILE`
+
+ if [ ! "$TEMPROOT_TYPE" = "$INSTALLED_TYPE" ]; then
+[ "$COMPFILE" = '.' ] && continue
+TEMPROOT_TYPE=`echo $TEMPROOT_TYPE | tr [:upper:] [:lower:]`
+INSTALLED_TYPE=`echo $INSTALLED_TYPE | tr [:upper:] [:lower:]`
+
+echo "*** The installed file ${DESTDIR}${COMPFILE#.} has the type
\"$INSTALLED_TYPE\""
+echo "but the new version has the type \"$TEMPROOT_TYPE\""
+echo ''
+echo "How would you like to handle this?"
+echo ''
+echo "Use 'r' to remove ${DESTDIR}${COMPFILE#.}"
+case "$TEMPROOT_TYPE" in
+'symbolic link')
+ TARGET=`readlink $COMPFILE`
+ echo "and create a link to $TARGET in its place" ;;
+*) echo "You will be able to install it as a \"$TEMPROOT_TYPE\"" ;;
+esac
+echo ''
+echo "Use 'i' to ignore this"
+echo ''
+echo -n "How to proceed? [i] "
+read ANSWER
+case "$ANSWER" in
+[rR]) case "${PRESERVE_FILES}" in
+ [Yy][Ee][Ss])
+ mv ${DESTDIR}${COMPFILE#.} ${PRESERVE_FILES_DIR}/ || exit 1 ;;
+ *) rm -rf ${DESTDIR}${COMPFILE#.} ;;
+ esac
+ case "$TEMPROOT_TYPE" in
+ 'symbolic link') ln -sf $TARGET ${DESTDIR}${COMPFILE#.} ;;
+ esac ;;
+*) echo ''
+echo "*** See the man page about adding ${COMPFILE#.} to the list of
IGNORE_FILES"
+press_to_continue ;;
+esac
+echo ''
+ fi
+done
+
for COMPFILE in `find . -type f`; do
# First, check to see if the file exists in DESTDIR. If not, the
@@ -1269,5 +1322,9 @@ case "${PRE_WORLD}" in
;;
esac
-exit 0
+if [ -n "${PRESERVE_FILES}" ]; then
+ find -d $PRESERVE_FILES_DIR -type d -empty -delete 2>/dev/null
+ rmdir $PRESERVE_FILES_DIR 2>/dev/null
+fi
+exit 0
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r200426 - stable/8/sys/powerpc/aim
Author: nwhitehorn
Date: Sat Dec 12 02:31:16 2009
New Revision: 200426
URL: http://svn.freebsd.org/changeset/base/200426
Log:
MFC r200083:
The first argument of dcbz interprets r0 as a literal zero, not the second.
This worked before by accident.
Modified:
stable/8/sys/powerpc/aim/machdep.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/powerpc/aim/machdep.c
==
--- stable/8/sys/powerpc/aim/machdep.c Sat Dec 12 02:19:41 2009
(r200425)
+++ stable/8/sys/powerpc/aim/machdep.c Sat Dec 12 02:31:16 2009
(r200426)
@@ -374,7 +374,7 @@ powerpc_init(u_int startkernel, u_int en
for (cacheline_size = 0; cacheline_size < 0x100; cacheline_size++)
cache_check[cacheline_size] = 0xff;
- __asm __volatile("dcbz %0,0":: "r" (cache_check) : "memory");
+ __asm __volatile("dcbz 0,%0":: "r" (cache_check) : "memory");
/* Find the first byte dcbz did not zero to get the cache line size */
for (cacheline_size = 0; cacheline_size < 0x100 &&
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r200427 - stable/8/sys/dev/adb
Author: nwhitehorn
Date: Sat Dec 12 02:34:00 2009
New Revision: 200427
URL: http://svn.freebsd.org/changeset/base/200427
Log:
MFC r199888:
Add support for interpreting taps on ADB touchpads as a button click.
Submitted by: Andreas Tobler
Modified:
stable/8/sys/dev/adb/adb.h
stable/8/sys/dev/adb/adb_bus.c
stable/8/sys/dev/adb/adb_mouse.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/dev/adb/adb.h
==
--- stable/8/sys/dev/adb/adb.h Sat Dec 12 02:31:16 2009(r200426)
+++ stable/8/sys/dev/adb/adb.h Sat Dec 12 02:34:00 2009(r200427)
@@ -69,6 +69,7 @@ uint8_t adb_get_device_handler(device_t
uint8_t adb_set_device_handler(device_t dev, uint8_t newhandler);
size_t adb_read_register(device_t dev, u_char reg, void *data);
+size_t adb_write_register(device_t dev, u_char reg, size_t len, void *data);
/* Bits for implementing ADB host bus adapters */
extern devclass_t adb_devclass;
Modified: stable/8/sys/dev/adb/adb_bus.c
==
--- stable/8/sys/dev/adb/adb_bus.c Sat Dec 12 02:31:16 2009
(r200426)
+++ stable/8/sys/dev/adb/adb_bus.c Sat Dec 12 02:34:00 2009
(r200427)
@@ -402,3 +402,21 @@ adb_read_register(device_t dev, u_char r
return (result);
}
+size_t
+adb_write_register(device_t dev, u_char reg, size_t len, void *data)
+{
+ struct adb_softc *sc;
+ struct adb_devinfo *dinfo;
+ size_t result;
+
+ dinfo = device_get_ivars(dev);
+ sc = device_get_softc(device_get_parent(dev));
+
+ result = adb_send_raw_packet_sync(sc->sc_dev,dinfo->address,
+ ADB_COMMAND_LISTEN, reg, len, (u_char *)data, NULL);
+
+ result = adb_send_raw_packet_sync(sc->sc_dev,dinfo->address,
+ ADB_COMMAND_TALK, reg, 0, NULL, NULL);
+
+ return (result);
+}
Modified: stable/8/sys/dev/adb/adb_mouse.c
==
--- stable/8/sys/dev/adb/adb_mouse.cSat Dec 12 02:31:16 2009
(r200426)
+++ stable/8/sys/dev/adb/adb_mouse.cSat Dec 12 02:34:00 2009
(r200427)
@@ -35,6 +35,7 @@
#include
#include
#include
+#include
#include
#include
#include
@@ -51,6 +52,8 @@
static int adb_mouse_probe(device_t dev);
static int adb_mouse_attach(device_t dev);
static int adb_mouse_detach(device_t dev);
+static void adb_init_trackpad(device_t dev);
+static int adb_tapping_sysctl(SYSCTL_HANDLER_ARGS);
static d_open_t ams_open;
static d_close_t ams_close;
@@ -77,6 +80,8 @@ struct adb_mouse_softc {
u_char id[4];
int buttons;
+ u_int sc_tapping;
+ int button_buf;
int last_buttons;
int xdelta, ydelta;
@@ -167,6 +172,8 @@ adb_mouse_attach(device_t dev)
sc->mode.packetsize = 5;
sc->buttons = 0;
+ sc->sc_tapping = 0;
+ sc->button_buf = 0;
sc->last_buttons = 0;
sc->packet_read_len = 0;
@@ -205,6 +212,7 @@ adb_mouse_attach(device_t dev)
case 3:
sc->flags |= AMS_TOUCHPAD;
sc->hw.type = MOUSE_PAD;
+ adb_init_trackpad(dev);
description = "Touchpad";
break;
}
@@ -259,6 +267,70 @@ adb_mouse_detach(device_t dev)
return (0);
}
+static void
+adb_init_trackpad(device_t dev)
+{
+ struct adb_mouse_softc *sc;
+ struct sysctl_ctx_list *ctx;
+ struct sysctl_oid *tree;
+
+ size_t r1_len;
+ u_char r1[8];
+ u_char r2[8];
+
+ sc = device_get_softc(dev);
+
+ r1_len = adb_read_register(dev, 1, r1);
+
+ /* An Extended Mouse register1 must return 8 bytes. */
+ if (r1_len != 8)
+ return;
+
+ if((r1[6] != 0x0d))
+ {
+ r1[6] = 0x0d;
+
+ adb_write_register(dev, 1, 8, r1);
+
+ r1_len = adb_read_register(dev, 1, r1);
+
+ if (r1[6] != 0x0d)
+ {
+ device_printf(dev, "ADB Mouse = 0x%x "
+ "(non-Extended Mode)\n", r1[6]);
+ return;
+ } else {
+ device_printf(dev, "ADB Mouse = 0x%x "
+ "(Extended Mode)\n", r1[6]);
+
+ /* Set ADB Extended Features to default values,
+ enabled. */
+ r2[0] = 0x19; /* Clicking: 0x19 disabled 0x9
svn commit: r200429 - stable/8/sys/dev/iir
Author: marcel
Date: Sat Dec 12 04:34:22 2009
New Revision: 200429
URL: http://svn.freebsd.org/changeset/base/200429
Log:
MFC rev 200045:
Include , to get the declarations of ostype and
osrelease. Remove the duplicate declarations from this file.
Modified:
stable/8/sys/dev/iir/iir_ctrl.c
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/dev/iir/iir_ctrl.c
==
--- stable/8/sys/dev/iir/iir_ctrl.c Sat Dec 12 03:35:49 2009
(r200428)
+++ stable/8/sys/dev/iir/iir_ctrl.c Sat Dec 12 04:34:22 2009
(r200429)
@@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$");
#include
#include
#include
+#include
#include
#include
@@ -83,8 +84,6 @@ static int iir_devsw_installed = 0;
static int sdev_made = 0;
#endif
extern int gdt_cnt;
-extern char ostype[];
-extern char osrelease[];
extern gdt_statist_t gdt_stat;
/*
___
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
svn commit: r200431 - in stable/8/sys/ia64: ia64 include
Author: marcel
Date: Sat Dec 12 05:14:40 2009
New Revision: 200431
URL: http://svn.freebsd.org/changeset/base/200431
Log:
MFC rev 199893, 199941, 200200 and 200207:
o Eliminate MAXCPU.
o Revamp the PCPU structure.
Modified:
stable/8/sys/ia64/ia64/clock.c
stable/8/sys/ia64/ia64/genassym.c
stable/8/sys/ia64/ia64/interrupt.c
stable/8/sys/ia64/ia64/machdep.c
stable/8/sys/ia64/ia64/mp_machdep.c
stable/8/sys/ia64/ia64/pmap.c
stable/8/sys/ia64/include/kdb.h
stable/8/sys/ia64/include/param.h
stable/8/sys/ia64/include/pcpu.h
stable/8/sys/ia64/include/pmap.h
Directory Properties:
stable/8/sys/ (props changed)
stable/8/sys/amd64/include/xen/ (props changed)
stable/8/sys/cddl/contrib/opensolaris/ (props changed)
stable/8/sys/contrib/dev/acpica/ (props changed)
stable/8/sys/contrib/pf/ (props changed)
stable/8/sys/dev/xen/xenpci/ (props changed)
Modified: stable/8/sys/ia64/ia64/clock.c
==
--- stable/8/sys/ia64/ia64/clock.c Sat Dec 12 04:50:04 2009
(r200430)
+++ stable/8/sys/ia64/ia64/clock.c Sat Dec 12 05:14:40 2009
(r200431)
@@ -64,9 +64,9 @@ void
pcpu_initclock(void)
{
- PCPU_SET(clockadj, 0);
- PCPU_SET(clock, ia64_get_itc());
- ia64_set_itm(PCPU_GET(clock) + ia64_clock_reload);
+ PCPU_SET(md.clockadj, 0);
+ PCPU_SET(md.clock, ia64_get_itc());
+ ia64_set_itm(PCPU_GET(md.clock) + ia64_clock_reload);
ia64_set_itv(CLOCK_VECTOR); /* highest priority class */
ia64_srlz_d();
}
Modified: stable/8/sys/ia64/ia64/genassym.c
==
--- stable/8/sys/ia64/ia64/genassym.c Sat Dec 12 04:50:04 2009
(r200430)
+++ stable/8/sys/ia64/ia64/genassym.c Sat Dec 12 05:14:40 2009
(r200431)
@@ -91,7 +91,7 @@ ASSYM(MC_SPECIAL_RNAT,offsetof(mcontext
ASSYM(PAGE_SHIFT, PAGE_SHIFT);
ASSYM(PAGE_SIZE, PAGE_SIZE);
-ASSYM(PC_CURRENT_PMAP, offsetof(struct pcpu, pc_current_pmap));
+ASSYM(PC_CURRENT_PMAP, offsetof(struct pcpu, pc_md.current_pmap));
ASSYM(PC_CURTHREAD,offsetof(struct pcpu, pc_curthread));
ASSYM(PC_IDLETHREAD, offsetof(struct pcpu, pc_idlethread));
Modified: stable/8/sys/ia64/ia64/interrupt.c
==
--- stable/8/sys/ia64/ia64/interrupt.c Sat Dec 12 04:50:04 2009
(r200430)
+++ stable/8/sys/ia64/ia64/interrupt.c Sat Dec 12 05:14:40 2009
(r200431)
@@ -84,28 +84,6 @@ dummy_perf(unsigned long vector, struct
void (*perf_irq)(unsigned long, struct trapframe *) = dummy_perf;
-static unsigned int ints[MAXCPU];
-SYSCTL_OPAQUE(_debug, OID_AUTO, ints, CTLFLAG_RW, &ints, sizeof(ints), "IU",
-"");
-
-static unsigned int clks[MAXCPU];
-#ifdef SMP
-SYSCTL_OPAQUE(_debug, OID_AUTO, clks, CTLFLAG_RW, &clks, sizeof(clks), "IU",
-"");
-#else
-SYSCTL_INT(_debug, OID_AUTO, clks, CTLFLAG_RW, clks, 0, "");
-#endif
-
-#ifdef SMP
-static unsigned int asts[MAXCPU];
-SYSCTL_OPAQUE(_debug, OID_AUTO, asts, CTLFLAG_RW, &asts, sizeof(asts), "IU",
-"");
-
-static unsigned int rdvs[MAXCPU];
-SYSCTL_OPAQUE(_debug, OID_AUTO, rdvs, CTLFLAG_RW, &rdvs, sizeof(rdvs), "IU",
-"");
-#endif
-
SYSCTL_NODE(_debug, OID_AUTO, clock, CTLFLAG_RW, 0, "clock statistics");
static int adjust_edges = 0;
@@ -139,6 +117,8 @@ interrupt(struct trapframe *tf)
td = curthread;
+ PCPU_INC(cnt.v_intr);
+
vector = tf->tf_special.ifa;
next:
@@ -149,33 +129,35 @@ interrupt(struct trapframe *tf)
* to add it to this switch-like construct.
*/
if (vector == 0) {
+ PCPU_INC(md.stats.pcs_nextints);
inta = ib->ib_inta;
- printf("ExtINT interrupt: vector=%u\n", (int)inta);
if (inta == 15) {
+ PCPU_INC(md.stats.pcs_nstrays);
__asm __volatile("mov cr.eoi = r0;; srlz.d");
goto stray;
}
vector = (int)inta;
- } else if (vector == 15)
+ } else if (vector == 15) {
+ PCPU_INC(md.stats.pcs_nstrays);
goto stray;
+ }
if (vector == CLOCK_VECTOR) {/* clock interrupt */
/* CTR0(KTR_INTR, "clock interrupt"); */
itc = ia64_get_itc();
- PCPU_INC(cnt.v_intr);
+ PCPU_INC(md.stats.pcs_nclks);
#ifdef EVCNT_COUNTERS
clock_intr_evcnt.ev_count++;
#else
intrcnt[INTRCNT_CLOCK]++;
#endif
- clks[PCPU_GET(cpuid)]++;
critical_enter();
- adj = PCPU_GET(clockadj);
- clk = PCPU_GET(clock);
+ adj = PCPU_GET(md.clockadj);
+ clk = PCPU_GET(md.clock);
delta = itc - clk;
count = 0;
while (delta
Re: svn commit: r200369 - in head: etc share/termcap
< said: > It's great, thank!! > I believe that our xterm entry was modified not to clear screen when > applications such as less(1) are terminated. Are there any chance to > back to the behavior? I don't understand why people put up with the unspeakably obnoxious "alternate screen" behavior. Please don't tell me someone actually thinks it's *useful*. -GAWollman ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r200274 - head/lib/libc/gen
< said: > It's beginning to sound like our POSIX semaphores should be behaving more > like > umtx, which requires only a shared page, and less like file descriptors. Of > course, that would make the global namespace more tricky... Ultimately, the problem is that "POSIX semaphores" are actually three different kinds of object, which just happen to ostensibly use the same programming interface. -GAWollman ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
Re: svn commit: r200369 - in head: etc share/termcap
Garrett Wollman wrote: > < said: > >> It's great, thank!! >> I believe that our xterm entry was modified not to clear screen when >> applications such as less(1) are terminated. Are there any chance to >> back to the behavior? > > > > I don't understand why people put up with the unspeakably obnoxious > "alternate screen" behavior. Please don't tell me someone actually > thinks it's *useful*. I actually liked having the remnants of whatever I was looking at in $PAGER left behind on the screen, and would appreciate it if someone could tell me how to restore that locally. I know that there was a thread about it recently, and I thought I'd saved the e-mail that discussed this issue but I didn't. Doug -- Improve the effectiveness of your Internet presence with a domain name makeover!http://SupersetSolutions.com/ ___ svn-src-all@freebsd.org mailing list http://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
