PERFORCE change 105604 for review
Matt Jacob
mjacob at FreeBSD.org
Sun Sep 3 16:54:40 UTC 2006
http://perforce.freebsd.org/chv.cgi?CH=105604
Change 105604 by mjacob at newisp on 2006/09/03 16:54:13
Sync with head.
Affected files ...
.. //depot/projects/newisp/bsm/audit_internal.h#2 integrate
.. //depot/projects/newisp/bsm/audit_record.h#2 integrate
.. //depot/projects/newisp/compat/freebsd32/freebsd32_proto.h#2 integrate
.. //depot/projects/newisp/compat/freebsd32/freebsd32_syscall.h#2 integrate
.. //depot/projects/newisp/compat/freebsd32/freebsd32_syscalls.c#2 integrate
.. //depot/projects/newisp/compat/freebsd32/freebsd32_sysent.c#2 integrate
.. //depot/projects/newisp/compat/freebsd32/syscalls.master#2 integrate
.. //depot/projects/newisp/compat/svr4/svr4_stat.c#2 integrate
.. //depot/projects/newisp/dev/acpica/acpi_thermal.c#2 integrate
.. //depot/projects/newisp/dev/aic7xxx/ahc_eisa.c#2 integrate
.. //depot/projects/newisp/dev/aic7xxx/ahc_isa.c#2 integrate
.. //depot/projects/newisp/dev/aic7xxx/ahc_pci.c#2 integrate
.. //depot/projects/newisp/dev/aic7xxx/ahd_pci.c#2 integrate
.. //depot/projects/newisp/dev/ata/ata-chipset.c#3 integrate
.. //depot/projects/newisp/dev/ata/ata-dma.c#2 integrate
.. //depot/projects/newisp/dev/ata/ata-pci.h#2 integrate
.. //depot/projects/newisp/dev/bge/if_bge.c#2 integrate
.. //depot/projects/newisp/dev/bge/if_bgereg.h#2 integrate
.. //depot/projects/newisp/dev/em/if_em.c#3 integrate
.. //depot/projects/newisp/dev/gem/if_gem.c#2 integrate
.. //depot/projects/newisp/dev/isp/isp_pci.c#9 integrate
.. //depot/projects/newisp/dev/mk48txx/mk48txx.c#2 integrate
.. //depot/projects/newisp/dev/ofw/openfirmio.c#2 integrate
.. //depot/projects/newisp/dev/usb/ohci_pci.c#2 integrate
.. //depot/projects/newisp/kern/bus_if.m#2 integrate
.. //depot/projects/newisp/kern/init_sysent.c#3 integrate
.. //depot/projects/newisp/kern/kern_exec.c#2 integrate
.. //depot/projects/newisp/kern/kern_umtx.c#4 integrate
.. //depot/projects/newisp/kern/subr_bus.c#2 integrate
.. //depot/projects/newisp/kern/syscalls.c#3 integrate
.. //depot/projects/newisp/kern/syscalls.master#3 integrate
.. //depot/projects/newisp/kern/systrace_args.c#3 integrate
.. //depot/projects/newisp/modules/Makefile#2 integrate
.. //depot/projects/newisp/powerpc/powerpc/vm_machdep.c#2 integrate
.. //depot/projects/newisp/security/audit/audit.c#2 integrate
.. //depot/projects/newisp/security/audit/audit.h#2 integrate
.. //depot/projects/newisp/security/audit/audit_arg.c#2 integrate
.. //depot/projects/newisp/security/audit/audit_bsm.c#2 integrate
.. //depot/projects/newisp/security/audit/audit_bsm_token.c#2 integrate
.. //depot/projects/newisp/security/audit/audit_private.h#2 integrate
.. //depot/projects/newisp/security/audit/audit_syscalls.c#2 integrate
.. //depot/projects/newisp/sys/_bus_dma.h#1 branch
.. //depot/projects/newisp/sys/bus.h#2 integrate
.. //depot/projects/newisp/sys/bus_dma.h#2 integrate
.. //depot/projects/newisp/sys/msgbuf.h#2 integrate
.. //depot/projects/newisp/sys/param.h#2 integrate
.. //depot/projects/newisp/sys/syscall.h#3 integrate
.. //depot/projects/newisp/sys/syscall.mk#3 integrate
.. //depot/projects/newisp/sys/sysproto.h#3 integrate
Differences ...
==== //depot/projects/newisp/bsm/audit_internal.h#2 (text) ====
@@ -35,7 +35,7 @@
* @APPLE_BSD_LICENSE_HEADER_END@
*
* $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_internal.h#11 $
- * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.3 2006/08/26 08:17:58 rwatson Exp $
+ * $FreeBSD: src/sys/bsm/audit_internal.h,v 1.4 2006/09/02 10:49:44 rwatson Exp $
*/
#ifndef _AUDIT_INTERNAL_H
@@ -71,9 +71,9 @@
/*
* We could determined the header and trailer sizes by defining appropriate
- * structures. We hold off that approach until we have a consistant way of
+ * structures. We hold off that approach until we have a consistent way of
* using structures for all tokens. This is not straightforward since these
- * token structures may contain pointers of whose contents we dont know the
+ * token structures may contain pointers of whose contents we do not know the
* size (e.g text tokens).
*/
#define AUDIT_HEADER_SIZE 18
==== //depot/projects/newisp/bsm/audit_record.h#2 (text) ====
@@ -31,7 +31,7 @@
* @APPLE_BSD_LICENSE_HEADER_END@
*
* $P4: //depot/projects/trustedbsd/audit3/sys/bsm/audit_record.h#19 $
- * $FreeBSD: src/sys/bsm/audit_record.h,v 1.4 2006/08/26 08:17:58 rwatson Exp $
+ * $FreeBSD: src/sys/bsm/audit_record.h,v 1.5 2006/09/01 11:45:39 wsalamon Exp $
*/
#ifndef _BSM_AUDIT_RECORD_H_
@@ -319,8 +319,13 @@
gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid);
token_t *au_to_subject64_ex(au_id_t auid, uid_t euid, gid_t egid, uid_t ruid,
gid_t rgid, pid_t pid, au_asid_t sid, au_tid_addr_t *tid);
-token_t *au_to_exec_args(const char **);
-token_t *au_to_exec_env(const char **);
+#if defined(_KERNEL) || defined(KERNEL)
+token_t *au_to_exec_args(char *args, int argc);
+token_t *au_to_exec_env(char *envs, int envc);
+#else
+token_t *au_to_exec_args(char **argv);
+token_t *au_to_exec_env(char **envp);
+#endif
token_t *au_to_text(char *text);
token_t *au_to_kevent(struct kevent *kev);
token_t *au_to_trailer(int rec_size);
==== //depot/projects/newisp/compat/freebsd32/freebsd32_proto.h#2 (text+ko) ====
@@ -2,8 +2,8 @@
* System call prototypes.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.58 2006/08/15 17:36:59 jhb Exp $
- * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.70 2006/07/28 19:05:26 jhb Exp
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.60 2006/09/03 16:24:36 rwatson Exp $
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.73 2006/09/03 16:17:49 rwatson Exp
*/
#ifndef _FREEBSD32_SYSPROTO_H_
@@ -455,7 +455,7 @@
#define FREEBSD32_SYS_AUE_freebsd32_pwritev AUE_PWRITEV
#define FREEBSD32_SYS_AUE_freebsd32_modstat AUE_NULL
#define FREEBSD32_SYS_AUE_freebsd32_kevent AUE_NULL
-#define FREEBSD32_SYS_AUE_freebsd32_sendfile AUE_NULL
+#define FREEBSD32_SYS_AUE_freebsd32_sendfile AUE_SENDFILE
#define FREEBSD32_SYS_AUE_freebsd32_sigaction AUE_SIGACTION
#define FREEBSD32_SYS_AUE_freebsd32_sigreturn AUE_SIGRETURN
#define FREEBSD32_SYS_AUE_freebsd32_getcontext AUE_NULL
==== //depot/projects/newisp/compat/freebsd32/freebsd32_syscall.h#2 (text+ko) ====
@@ -2,8 +2,8 @@
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.56 2006/08/15 17:36:59 jhb Exp $
- * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.70 2006/07/28 19:05:26 jhb Exp
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.58 2006/09/03 16:24:36 rwatson Exp $
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.73 2006/09/03 16:17:49 rwatson Exp
*/
#define FREEBSD32_SYS_syscall 0
@@ -311,4 +311,4 @@
#define FREEBSD32_SYS_thr_wake 443
#define FREEBSD32_SYS_kldunloadf 444
#define FREEBSD32_SYS_abort2 463
-#define FREEBSD32_SYS_MAXSYSCALL 469
+#define FREEBSD32_SYS_MAXSYSCALL 471
==== //depot/projects/newisp/compat/freebsd32/freebsd32_syscalls.c#2 (text+ko) ====
@@ -2,8 +2,8 @@
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.47 2006/08/15 17:36:59 jhb Exp $
- * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.70 2006/07/28 19:05:26 jhb Exp
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.49 2006/09/03 16:24:36 rwatson Exp $
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.73 2006/09/03 16:17:49 rwatson Exp
*/
const char *freebsd32_syscallnames[] = {
@@ -167,7 +167,7 @@
"old.freebsd32_statfs", /* 157 = old freebsd32_statfs */
"old.freebsd32_fstatfs", /* 158 = old freebsd32_fstatfs */
"#159", /* 159 = nosys */
- "#160", /* 160 = nosys */
+ "#160", /* 160 = lgetfh */
"getfh", /* 161 = getfh */
"getdomainname", /* 162 = getdomainname */
"setdomainname", /* 163 = setdomainname */
@@ -476,4 +476,6 @@
"#466", /* 466 = thr_setscheduler */
"#467", /* 467 = thr_getscheduler */
"#468", /* 468 = thr_setschedparam */
+ "#469", /* 469 = __getpath_fromfd */
+ "#470", /* 470 = __getpath_fromaddr */
};
==== //depot/projects/newisp/compat/freebsd32/freebsd32_sysent.c#2 (text+ko) ====
@@ -2,8 +2,8 @@
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.57 2006/08/15 17:36:59 jhb Exp $
- * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.70 2006/07/28 19:05:26 jhb Exp
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.59 2006/09/03 16:24:36 rwatson Exp $
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.73 2006/09/03 16:17:49 rwatson Exp
*/
#include "opt_compat.h"
@@ -192,13 +192,13 @@
{ compat4(AS(freebsd4_freebsd32_statfs_args),freebsd32_statfs), AUE_STATFS, NULL, 0, 0 }, /* 157 = old freebsd32_statfs */
{ compat4(AS(freebsd4_freebsd32_fstatfs_args),freebsd32_fstatfs), AUE_FSTATFS, NULL, 0, 0 }, /* 158 = old freebsd32_fstatfs */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 159 = nosys */
- { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 160 = nosys */
+ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 160 = lgetfh */
{ AS(getfh_args), (sy_call_t *)getfh, AUE_NFS_GETFH, NULL, 0, 0 }, /* 161 = getfh */
- { AS(getdomainname_args), (sy_call_t *)getdomainname, AUE_O_GETDOMAINNAME, NULL, 0, 0 }, /* 162 = getdomainname */
- { AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_O_SETDOMAINNAME, NULL, 0, 0 }, /* 163 = setdomainname */
+ { AS(getdomainname_args), (sy_call_t *)getdomainname, AUE_SYSCTL, NULL, 0, 0 }, /* 162 = getdomainname */
+ { AS(setdomainname_args), (sy_call_t *)setdomainname, AUE_SYSCTL, NULL, 0, 0 }, /* 163 = setdomainname */
{ AS(uname_args), (sy_call_t *)uname, AUE_NULL, NULL, 0, 0 }, /* 164 = uname */
- { AS(sysarch_args), (sy_call_t *)sysarch, AUE_NULL, NULL, 0, 0 }, /* 165 = sysarch */
- { AS(rtprio_args), (sy_call_t *)rtprio, AUE_NULL, NULL, 0, 0 }, /* 166 = rtprio */
+ { AS(sysarch_args), (sy_call_t *)sysarch, AUE_SYSARCH, NULL, 0, 0 }, /* 165 = sysarch */
+ { AS(rtprio_args), (sy_call_t *)rtprio, AUE_RTPRIO, NULL, 0, 0 }, /* 166 = rtprio */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 167 = nosys */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 168 = nosys */
{ AS(freebsd32_semsys_args), (sy_call_t *)freebsd32_semsys, AUE_SEMSYS, NULL, 0, 0 }, /* 169 = freebsd32_semsys */
@@ -208,7 +208,7 @@
{ AS(freebsd32_pread_args), (sy_call_t *)freebsd32_pread, AUE_PREAD, NULL, 0, 0 }, /* 173 = freebsd32_pread */
{ AS(freebsd32_pwrite_args), (sy_call_t *)freebsd32_pwrite, AUE_PWRITE, NULL, 0, 0 }, /* 174 = freebsd32_pwrite */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 175 = nosys */
- { AS(ntp_adjtime_args), (sy_call_t *)ntp_adjtime, AUE_ADJTIME, NULL, 0, 0 }, /* 176 = ntp_adjtime */
+ { AS(ntp_adjtime_args), (sy_call_t *)ntp_adjtime, AUE_NTP_ADJTIME, NULL, 0, 0 }, /* 176 = ntp_adjtime */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 177 = sfork */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 178 = getdescriptor */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 179 = setdescriptor */
@@ -358,7 +358,7 @@
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 323 = obsolete thr_wakeup */
{ AS(mlockall_args), (sy_call_t *)mlockall, AUE_MLOCKALL, NULL, 0, 0 }, /* 324 = mlockall */
{ 0, (sy_call_t *)munlockall, AUE_MUNLOCKALL, NULL, 0, 0 }, /* 325 = munlockall */
- { AS(__getcwd_args), (sy_call_t *)__getcwd, AUE_NULL, NULL, 0, 0 }, /* 326 = __getcwd */
+ { AS(__getcwd_args), (sy_call_t *)__getcwd, AUE_GETCWD, NULL, 0, 0 }, /* 326 = __getcwd */
{ AS(sched_setparam_args), (sy_call_t *)sched_setparam, AUE_NULL, NULL, 0, 0 }, /* 327 = sched_setparam */
{ AS(sched_getparam_args), (sy_call_t *)sched_getparam, AUE_NULL, NULL, 0, 0 }, /* 328 = sched_getparam */
{ AS(sched_setscheduler_args), (sy_call_t *)sched_setscheduler, AUE_NULL, NULL, 0, 0 }, /* 329 = sched_setscheduler */
@@ -370,7 +370,7 @@
{ AS(utrace_args), (sy_call_t *)utrace, AUE_NULL, NULL, 0, 0 }, /* 335 = utrace */
{ compat4(AS(freebsd4_freebsd32_sendfile_args),freebsd32_sendfile), AUE_SENDFILE, NULL, 0, 0 }, /* 336 = old freebsd32_sendfile */
{ AS(kldsym_args), (sy_call_t *)kldsym, AUE_NULL, NULL, 0, 0 }, /* 337 = kldsym */
- { AS(jail_args), (sy_call_t *)jail, AUE_NULL, NULL, 0, 0 }, /* 338 = jail */
+ { AS(jail_args), (sy_call_t *)jail, AUE_JAIL, NULL, 0, 0 }, /* 338 = jail */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 339 = pioctl */
{ AS(sigprocmask_args), (sy_call_t *)sigprocmask, AUE_SIGPROCMASK, NULL, 0, 0 }, /* 340 = sigprocmask */
{ AS(sigsuspend_args), (sy_call_t *)sigsuspend, AUE_SIGSUSPEND, NULL, 0, 0 }, /* 341 = sigsuspend */
@@ -379,7 +379,7 @@
{ compat4(AS(freebsd4_freebsd32_sigreturn_args),freebsd32_sigreturn), AUE_SIGRETURN, NULL, 0, 0 }, /* 344 = old freebsd32_sigreturn */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 345 = sigtimedwait */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 346 = sigwaitinfo */
- { AS(__acl_get_file_args), (sy_call_t *)__acl_get_file, AUE_JAIL, NULL, 0, 0 }, /* 347 = __acl_get_file */
+ { AS(__acl_get_file_args), (sy_call_t *)__acl_get_file, AUE_NULL, NULL, 0, 0 }, /* 347 = __acl_get_file */
{ AS(__acl_set_file_args), (sy_call_t *)__acl_set_file, AUE_NULL, NULL, 0, 0 }, /* 348 = __acl_set_file */
{ AS(__acl_get_fd_args), (sy_call_t *)__acl_get_fd, AUE_NULL, NULL, 0, 0 }, /* 349 = __acl_get_fd */
{ AS(__acl_set_fd_args), (sy_call_t *)__acl_set_fd, AUE_NULL, NULL, 0, 0 }, /* 350 = __acl_set_fd */
@@ -387,14 +387,14 @@
{ AS(__acl_delete_fd_args), (sy_call_t *)__acl_delete_fd, AUE_NULL, NULL, 0, 0 }, /* 352 = __acl_delete_fd */
{ AS(__acl_aclcheck_file_args), (sy_call_t *)__acl_aclcheck_file, AUE_NULL, NULL, 0, 0 }, /* 353 = __acl_aclcheck_file */
{ AS(__acl_aclcheck_fd_args), (sy_call_t *)__acl_aclcheck_fd, AUE_NULL, NULL, 0, 0 }, /* 354 = __acl_aclcheck_fd */
- { AS(extattrctl_args), (sy_call_t *)extattrctl, AUE_NULL, NULL, 0, 0 }, /* 355 = extattrctl */
- { AS(extattr_set_file_args), (sy_call_t *)extattr_set_file, AUE_NULL, NULL, 0, 0 }, /* 356 = extattr_set_file */
- { AS(extattr_get_file_args), (sy_call_t *)extattr_get_file, AUE_NULL, NULL, 0, 0 }, /* 357 = extattr_get_file */
- { AS(extattr_delete_file_args), (sy_call_t *)extattr_delete_file, AUE_NULL, NULL, 0, 0 }, /* 358 = extattr_delete_file */
+ { AS(extattrctl_args), (sy_call_t *)extattrctl, AUE_EXTATTRCTL, NULL, 0, 0 }, /* 355 = extattrctl */
+ { AS(extattr_set_file_args), (sy_call_t *)extattr_set_file, AUE_EXTATTR_SET_FILE, NULL, 0, 0 }, /* 356 = extattr_set_file */
+ { AS(extattr_get_file_args), (sy_call_t *)extattr_get_file, AUE_EXTATTR_GET_FILE, NULL, 0, 0 }, /* 357 = extattr_get_file */
+ { AS(extattr_delete_file_args), (sy_call_t *)extattr_delete_file, AUE_EXTATTR_DELETE_FILE, NULL, 0, 0 }, /* 358 = extattr_delete_file */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 359 = aio_waitcomplete */
- { AS(getresuid_args), (sy_call_t *)getresuid, AUE_NULL, NULL, 0, 0 }, /* 360 = getresuid */
- { AS(getresgid_args), (sy_call_t *)getresgid, AUE_NULL, NULL, 0, 0 }, /* 361 = getresgid */
- { 0, (sy_call_t *)kqueue, AUE_NULL, NULL, 0, 0 }, /* 362 = kqueue */
+ { AS(getresuid_args), (sy_call_t *)getresuid, AUE_GETRESUID, NULL, 0, 0 }, /* 360 = getresuid */
+ { AS(getresgid_args), (sy_call_t *)getresgid, AUE_GETRESGID, NULL, 0, 0 }, /* 361 = getresgid */
+ { 0, (sy_call_t *)kqueue, AUE_KQUEUE, NULL, 0, 0 }, /* 362 = kqueue */
{ AS(freebsd32_kevent_args), (sy_call_t *)freebsd32_kevent, AUE_NULL, NULL, 0, 0 }, /* 363 = freebsd32_kevent */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 364 = __cap_get_proc */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 365 = __cap_set_proc */
@@ -403,14 +403,14 @@
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 368 = __cap_set_fd */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 369 = __cap_set_file */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 370 = lkmressys */
- { AS(extattr_set_fd_args), (sy_call_t *)extattr_set_fd, AUE_NULL, NULL, 0, 0 }, /* 371 = extattr_set_fd */
- { AS(extattr_get_fd_args), (sy_call_t *)extattr_get_fd, AUE_NULL, NULL, 0, 0 }, /* 372 = extattr_get_fd */
- { AS(extattr_delete_fd_args), (sy_call_t *)extattr_delete_fd, AUE_NULL, NULL, 0, 0 }, /* 373 = extattr_delete_fd */
+ { AS(extattr_set_fd_args), (sy_call_t *)extattr_set_fd, AUE_EXTATTR_SET_FD, NULL, 0, 0 }, /* 371 = extattr_set_fd */
+ { AS(extattr_get_fd_args), (sy_call_t *)extattr_get_fd, AUE_EXTATTR_GET_FD, NULL, 0, 0 }, /* 372 = extattr_get_fd */
+ { AS(extattr_delete_fd_args), (sy_call_t *)extattr_delete_fd, AUE_EXTATTR_DELETE_FD, NULL, 0, 0 }, /* 373 = extattr_delete_fd */
{ AS(__setugid_args), (sy_call_t *)__setugid, AUE_NULL, NULL, 0, 0 }, /* 374 = __setugid */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 375 = nfsclnt */
- { AS(eaccess_args), (sy_call_t *)eaccess, AUE_NULL, NULL, 0, 0 }, /* 376 = eaccess */
+ { AS(eaccess_args), (sy_call_t *)eaccess, AUE_EACCESS, NULL, 0, 0 }, /* 376 = eaccess */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 377 = afs_syscall */
- { AS(nmount_args), (sy_call_t *)nmount, AUE_NULL, NULL, 0, 0 }, /* 378 = nmount */
+ { AS(nmount_args), (sy_call_t *)nmount, AUE_NMOUNT, NULL, 0, 0 }, /* 378 = nmount */
{ 0, (sy_call_t *)kse_exit, AUE_NULL, NULL, 0, 0 }, /* 379 = kse_exit */
{ AS(kse_wakeup_args), (sy_call_t *)kse_wakeup, AUE_NULL, NULL, 0, 0 }, /* 380 = kse_wakeup */
{ AS(kse_create_args), (sy_call_t *)kse_create, AUE_NULL, NULL, 0, 0 }, /* 381 = kse_create */
@@ -425,12 +425,12 @@
{ AS(kenv_args), (sy_call_t *)kenv, AUE_NULL, NULL, 0, 0 }, /* 390 = kenv */
{ AS(lchflags_args), (sy_call_t *)lchflags, AUE_LCHFLAGS, NULL, 0, 0 }, /* 391 = lchflags */
{ AS(uuidgen_args), (sy_call_t *)uuidgen, AUE_NULL, NULL, 0, 0 }, /* 392 = uuidgen */
- { AS(freebsd32_sendfile_args), (sy_call_t *)freebsd32_sendfile, AUE_NULL, NULL, 0, 0 }, /* 393 = freebsd32_sendfile */
+ { AS(freebsd32_sendfile_args), (sy_call_t *)freebsd32_sendfile, AUE_SENDFILE, NULL, 0, 0 }, /* 393 = freebsd32_sendfile */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 394 = mac_syscall */
{ AS(getfsstat_args), (sy_call_t *)getfsstat, AUE_GETFSSTAT, NULL, 0, 0 }, /* 395 = getfsstat */
{ AS(statfs_args), (sy_call_t *)statfs, AUE_STATFS, NULL, 0, 0 }, /* 396 = statfs */
{ AS(fstatfs_args), (sy_call_t *)fstatfs, AUE_FSTATFS, NULL, 0, 0 }, /* 397 = fstatfs */
- { AS(fhstatfs_args), (sy_call_t *)fhstatfs, AUE_NULL, NULL, 0, 0 }, /* 398 = fhstatfs */
+ { AS(fhstatfs_args), (sy_call_t *)fhstatfs, AUE_FHSTATFS, NULL, 0, 0 }, /* 398 = fhstatfs */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 399 = nosys */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 400 = ksem_close */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 401 = ksem_post */
@@ -476,7 +476,7 @@
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 441 = ksem_timedwait */
{ AS(thr_suspend_args), (sy_call_t *)thr_suspend, AUE_NULL, NULL, 0, 0 }, /* 442 = thr_suspend */
{ AS(thr_wake_args), (sy_call_t *)thr_wake, AUE_NULL, NULL, 0, 0 }, /* 443 = thr_wake */
- { AS(kldunloadf_args), (sy_call_t *)kldunloadf, AUE_NULL, NULL, 0, 0 }, /* 444 = kldunloadf */
+ { AS(kldunloadf_args), (sy_call_t *)kldunloadf, AUE_MODUNLOAD, NULL, 0, 0 }, /* 444 = kldunloadf */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 445 = audit */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 446 = auditon */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 447 = getauid */
@@ -501,4 +501,6 @@
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 466 = thr_setscheduler */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 467 = thr_getscheduler */
{ 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 468 = thr_setschedparam */
+ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 469 = __getpath_fromfd */
+ { 0, (sy_call_t *)nosys, AUE_NULL, NULL, 0, 0 }, /* 470 = __getpath_fromaddr */
};
==== //depot/projects/newisp/compat/freebsd32/syscalls.master#2 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.71 2006/08/16 22:32:50 peter Exp $
+ $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.73 2006/09/03 16:17:49 rwatson Exp $
; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94
; from: src/sys/kern/syscalls.master 1.107
;
@@ -238,8 +238,8 @@
126 AUE_SETREUID NOPROTO { int setreuid(int ruid, int euid); }
127 AUE_SETREGID NOPROTO { int setregid(int rgid, int egid); }
128 AUE_RENAME NOPROTO { int rename(char *from, char *to); }
-129 AUE_NULL OBSOL otruncate
-130 AUE_NULL OBSOL ftruncate
+129 AUE_TRUNCATE OBSOL otruncate
+130 AUE_FTRUNCATE OBSOL ftruncate
131 AUE_FLOCK NOPROTO { int flock(int fd, int how); }
132 AUE_MKFIFO NOPROTO { int mkfifo(char *path, int mode); }
133 AUE_SENDTO NOPROTO { int sendto(int s, caddr_t buf, \
@@ -256,17 +256,17 @@
140 AUE_ADJTIME STD { int freebsd32_adjtime( \
struct timeval32 *delta, \
struct timeval32 *olddelta); }
-141 AUE_NULL OBSOL ogetpeername
-142 AUE_NULL OBSOL ogethostid
-143 AUE_NULL OBSOL sethostid
-144 AUE_NULL OBSOL getrlimit
-145 AUE_NULL OBSOL setrlimit
-146 AUE_NULL OBSOL killpg
+141 AUE_GETPEERNAME OBSOL ogetpeername
+142 AUE_SYSCTL OBSOL ogethostid
+143 AUE_SYSCTL OBSOL sethostid
+144 AUE_GETRLIMIT OBSOL getrlimit
+145 AUE_SETRLIMIT OBSOL setrlimit
+146 AUE_KILLPG OBSOL killpg
147 AUE_SETSID NOPROTO { int setsid(void); }
148 AUE_QUOTACTL NOPROTO { int quotactl(char *path, int cmd, int uid, \
caddr_t arg); }
-149 AUE_NULL OBSOL oquota
-150 AUE_NULL OBSOL ogetsockname
+149 AUE_O_QUOTA OBSOL oquota
+150 AUE_GETSOCKNAME OBSOL ogetsockname
; Syscalls 151-180 inclusive are reserved for vendor-specific
; system calls. (This includes various calls added for compatibity
@@ -278,23 +278,23 @@
154 AUE_NULL UNIMPL nosys
; 155 is initialized by the NFS code, if present.
; XXX this is a problem!!!
-155 AUE_NFSSVC UNIMPL nfssvc
-156 AUE_NULL OBSOL ogetdirentries
+155 AUE_NFS_SVC UNIMPL nfssvc
+156 AUE_GETDIRENTRIES OBSOL ogetdirentries
157 AUE_STATFS COMPAT4 { int freebsd32_statfs(char *path, \
struct statfs32 *buf); }
158 AUE_FSTATFS COMPAT4 { int freebsd32_fstatfs(int fd, \
struct statfs32 *buf); }
159 AUE_NULL UNIMPL nosys
-160 AUE_NULL UNIMPL nosys
+160 AUE_LGETFH UNIMPL lgetfh
161 AUE_NFS_GETFH NOPROTO { int getfh(char *fname, \
struct fhandle *fhp); }
-162 AUE_O_GETDOMAINNAME NOPROTO { int getdomainname(char *domainname, \
+162 AUE_SYSCTL NOPROTO { int getdomainname(char *domainname, \
int len); }
-163 AUE_O_SETDOMAINNAME NOPROTO { int setdomainname(char *domainname, \
+163 AUE_SYSCTL NOPROTO { int setdomainname(char *domainname, \
int len); }
164 AUE_NULL NOPROTO { int uname(struct utsname *name); }
-165 AUE_NULL NOPROTO { int sysarch(int op, char *parms); }
-166 AUE_NULL NOPROTO { int rtprio(int function, pid_t pid, \
+165 AUE_SYSARCH NOPROTO { int sysarch(int op, char *parms); }
+166 AUE_RTPRIO NOPROTO { int rtprio(int function, pid_t pid, \
struct rtprio *rtp); }
167 AUE_NULL UNIMPL nosys
168 AUE_NULL UNIMPL nosys
@@ -314,7 +314,7 @@
u_int32_t offsetlo, u_int32_t offsethi); }
; XXX note - bigendian is different
175 AUE_NULL UNIMPL nosys
-176 AUE_ADJTIME NOPROTO { int ntp_adjtime(struct timex *tp); }
+176 AUE_NTP_ADJTIME NOPROTO { int ntp_adjtime(struct timex *tp); }
177 AUE_NULL UNIMPL sfork (BSD/OS 2.x)
178 AUE_NULL UNIMPL getdescriptor (BSD/OS 2.x)
179 AUE_NULL UNIMPL setdescriptor (BSD/OS 2.x)
@@ -542,7 +542,7 @@
323 AUE_NULL OBSOL thr_wakeup
324 AUE_MLOCKALL NOPROTO { int mlockall(int how); }
325 AUE_MUNLOCKALL NOPROTO { int munlockall(void); }
-326 AUE_NULL NOPROTO { int __getcwd(u_char *buf, u_int buflen); }
+326 AUE_GETCWD NOPROTO { int __getcwd(u_char *buf, u_int buflen); }
327 AUE_NULL NOPROTO { int sched_setparam (pid_t pid, \
const struct sched_param *param); }
@@ -567,7 +567,7 @@
off_t *sbytes, int flags); }
337 AUE_NULL NOPROTO { int kldsym(int fileid, int cmd, \
void *data); }
-338 AUE_NULL NOPROTO { int jail(struct jail *jail); }
+338 AUE_JAIL NOPROTO { int jail(struct jail *jail); }
339 AUE_NULL UNIMPL pioctl
340 AUE_SIGPROCMASK NOPROTO { int sigprocmask(int how, \
const sigset_t *set, sigset_t *oset); }
@@ -579,10 +579,10 @@
344 AUE_SIGRETURN COMPAT4 { int freebsd32_sigreturn( \
const struct freebsd4_freebsd32_ucontext *sigcntxp); }
; XXX implement
-345 AUE_NULL UNIMPL sigtimedwait
+345 AUE_SIGWAIT UNIMPL sigtimedwait
; XXX implement
346 AUE_NULL UNIMPL sigwaitinfo
-347 AUE_JAIL NOPROTO { int __acl_get_file(const char *path, \
+347 AUE_NULL NOPROTO { int __acl_get_file(const char *path, \
acl_type_t type, struct acl *aclp); }
348 AUE_NULL NOPROTO { int __acl_set_file(const char *path, \
acl_type_t type, struct acl *aclp); }
@@ -598,24 +598,26 @@
acl_type_t type, struct acl *aclp); }
354 AUE_NULL NOPROTO { int __acl_aclcheck_fd(int filedes, \
acl_type_t type, struct acl *aclp); }
-355 AUE_NULL NOPROTO { int extattrctl(const char *path, int cmd, \
+355 AUE_EXTATTRCTL NOPROTO { int extattrctl(const char *path, int cmd, \
const char *filename, int attrnamespace, \
const char *attrname); }
-356 AUE_NULL NOPROTO { int extattr_set_file(const char *path, \
- int attrnamespace, const char *attrname, \
- void *data, size_t nbytes); }
-357 AUE_NULL NOPROTO { ssize_t extattr_get_file(const char *path, \
- int attrnamespace, const char *attrname, \
- void *data, size_t nbytes); }
-358 AUE_NULL NOPROTO { int extattr_delete_file(const char *path, \
- int attrnamespace, \
+356 AUE_EXTATTR_SET_FILE NOPROTO { int extattr_set_file( \
+ const char *path, int attrnamespace, \
+ const char *attrname, void *data, \
+ size_t nbytes); }
+357 AUE_EXTATTR_GET_FILE NOPROTO { ssize_t extattr_get_file( \
+ const char *path, int attrnamespace, \
+ const char *attrname, void *data, \
+ size_t nbytes); }
+358 AUE_EXTATTR_DELETE_FILE NOPROTO { int extattr_delete_file( \
+ const char *path, int attrnamespace, \
const char *attrname); }
359 AUE_NULL UNIMPL aio_waitcomplete
-360 AUE_NULL NOPROTO { int getresuid(uid_t *ruid, uid_t *euid, \
+360 AUE_GETRESUID NOPROTO { int getresuid(uid_t *ruid, uid_t *euid, \
uid_t *suid); }
-361 AUE_NULL NOPROTO { int getresgid(gid_t *rgid, gid_t *egid, \
+361 AUE_GETRESGID NOPROTO { int getresgid(gid_t *rgid, gid_t *egid, \
gid_t *sgid); }
-362 AUE_NULL NOPROTO { int kqueue(void); }
+362 AUE_KQUEUE NOPROTO { int kqueue(void); }
363 AUE_NULL STD { int freebsd32_kevent(int fd, \
const struct kevent32 *changelist, \
int nchanges, \
@@ -628,20 +630,20 @@
368 AUE_NULL UNIMPL __cap_set_fd
369 AUE_NULL UNIMPL __cap_set_file
370 AUE_NULL UNIMPL lkmressys
-371 AUE_NULL NOPROTO { int extattr_set_fd(int fd, \
+371 AUE_EXTATTR_SET_FD NOPROTO { int extattr_set_fd(int fd, \
int attrnamespace, const char *attrname, \
void *data, size_t nbytes); }
-372 AUE_NULL NOPROTO { ssize_t extattr_get_fd(int fd, \
+372 AUE_EXTATTR_GET_FD NOPROTO { ssize_t extattr_get_fd(int fd, \
int attrnamespace, const char *attrname, \
void *data, size_t nbytes); }
-373 AUE_NULL NOPROTO { int extattr_delete_fd(int fd, \
+373 AUE_EXTATTR_DELETE_FD NOPROTO { int extattr_delete_fd(int fd, \
int attrnamespace, \
const char *attrname); }
374 AUE_NULL NOPROTO { int __setugid(int flag); }
375 AUE_NULL UNIMPL nfsclnt
-376 AUE_NULL NOPROTO { int eaccess(char *path, int flags); }
+376 AUE_EACCESS NOPROTO { int eaccess(char *path, int flags); }
377 AUE_NULL UNIMPL afs_syscall
-378 AUE_NULL NOPROTO { int nmount(struct iovec *iovp, \
+378 AUE_NMOUNT NOPROTO { int nmount(struct iovec *iovp, \
unsigned int iovcnt, int flags); }
379 AUE_NULL NOPROTO { int kse_exit(void); }
380 AUE_NULL NOPROTO { int kse_wakeup(struct kse_mailbox *mbx); }
@@ -661,7 +663,7 @@
391 AUE_LCHFLAGS NOPROTO { int lchflags(const char *path, int flags); }
392 AUE_NULL NOPROTO { int uuidgen(struct uuid *store, \
int count); }
-393 AUE_NULL STD { int freebsd32_sendfile(int fd, int s, \
+393 AUE_SENDFILE STD { int freebsd32_sendfile(int fd, int s, \
u_int32_t offsetlo, u_int32_t offsethi, \
size_t nbytes, struct sf_hdtr32 *hdtr, \
off_t *sbytes, int flags); }
@@ -671,7 +673,7 @@
396 AUE_STATFS NOPROTO { int statfs(char *path, \
struct statfs *buf); }
397 AUE_FSTATFS NOPROTO { int fstatfs(int fd, struct statfs *buf); }
-398 AUE_NULL NOPROTO { int fhstatfs(const struct fhandle *u_fhp, \
+398 AUE_FHSTATFS NOPROTO { int fhstatfs(const struct fhandle *u_fhp, \
struct statfs *buf); }
399 AUE_NULL UNIMPL nosys
; XXX implement these?
@@ -687,9 +689,9 @@
409 AUE_NULL UNIMPL __mac_get_pid
410 AUE_NULL UNIMPL __mac_get_link
411 AUE_NULL UNIMPL __mac_set_link
-412 AUE_NULL UNIMPL extattr_set_link
-413 AUE_NULL UNIMPL extattr_get_link
-414 AUE_NULL UNIMPL extattr_delete_link
+412 AUE_EXTATTR_SET_LINK UNIMPL extattr_set_link
+413 AUE_EXTATTR_GET_LINK UNIMPL extattr_get_link
+414 AUE_EXTATTR_DELETE_LINK UNIMPL extattr_delete_link
415 AUE_NULL UNIMPL __mac_execve
416 AUE_SIGACTION STD { int freebsd32_sigaction(int sig, \
struct sigaction32 *act, \
@@ -721,15 +723,15 @@
434 AUE_NULL NOPROTO { int _umtx_lock(struct umtx *umtx); }
435 AUE_NULL NOPROTO { int _umtx_unlock(struct umtx *umtx); }
436 AUE_NULL NOPROTO { int jail_attach(int jid); }
-437 AUE_NULL UNIMPL extattr_list_fd
-438 AUE_NULL UNIMPL extattr_list_file
-439 AUE_NULL UNIMPL extattr_list_link
+437 AUE_EXTATTR_LIST_FD UNIMPL extattr_list_fd
+438 AUE_EXTATTR_LIST_FILE UNIMPL extattr_list_file
+439 AUE_EXTATTR_LIST_LINK UNIMPL extattr_list_link
440 AUE_NULL UNIMPL kse_switchin
441 AUE_NULL UNIMPL ksem_timedwait
442 AUE_NULL NOPROTO { int thr_suspend( \
const struct timespec *timeout); }
443 AUE_NULL NOPROTO { int thr_wake(long id); }
-444 AUE_NULL NOPROTO { int kldunloadf(int fileid, int flags); }
+444 AUE_MODUNLOAD NOPROTO { int kldunloadf(int fileid, int flags); }
445 AUE_AUDIT UNIMPL audit
446 AUE_AUDITON UNIMPL auditon
447 AUE_GETAUID UNIMPL getauid
==== //depot/projects/newisp/compat/svr4/svr4_stat.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.22 2005/09/28 07:03:02 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_stat.c,v 1.23 2006/09/02 08:18:22 rwatson Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -470,14 +470,10 @@
break;
#if defined(WHY_DOES_AN_EMULATOR_WANT_TO_SET_HOSTNAMES)
case SVR4_SI_SET_HOSTNAME:
- if ((error = suser(td)) != 0)
- return error;
name = KERN_HOSTNAME;
return kern_sysctl(&name, 1, 0, 0, uap->buf, rlen, td);
case SVR4_SI_SET_SRPC_DOMAIN:
- if ((error = suser(td)) != 0)
- return error;
name = KERN_NISDOMAINNAME;
return kern_sysctl(&name, 1, 0, 0, uap->buf, rlen, td);
#else
==== //depot/projects/newisp/dev/acpica/acpi_thermal.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_thermal.c,v 1.62 2006/07/25 02:27:37 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_thermal.c,v 1.63 2006/09/03 15:10:04 ume Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -733,7 +733,6 @@
return (EPERM);
/* Check user-supplied value for sanity. */
- temp = (temp * 10) + TZ_ZEROC;
acpi_tz_sanity(sc, &temp, "user-supplied temp");
if (temp == -1)
return (EINVAL);
==== //depot/projects/newisp/dev/aic7xxx/ahc_eisa.c#2 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahc_eisa.c,v 1.35 2005/01/06 01:42:25 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahc_eisa.c,v 1.36 2006/09/03 00:27:40 jmg Exp $");
#include <dev/aic7xxx/aic7xxx_osm.h>
@@ -131,8 +131,8 @@
/* Allocate a dmatag for our SCB DMA maps */
/* XXX Should be a child of the PCI bus dma tag */
- error = aic_dma_tag_create(ahc, /*parent*/NULL, /*alignment*/1,
- /*boundary*/0,
+ error = aic_dma_tag_create(ahc, /*parent*/bus_get_dma_tag(dev),
+ /*alignment*/1, /*boundary*/0,
/*lowaddr*/BUS_SPACE_MAXADDR_32BIT,
/*highaddr*/BUS_SPACE_MAXADDR,
/*filter*/NULL, /*filterarg*/NULL,
==== //depot/projects/newisp/dev/aic7xxx/ahc_isa.c#2 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahc_isa.c,v 1.6 2005/01/06 01:42:25 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahc_isa.c,v 1.7 2006/09/03 00:27:40 jmg Exp $");
#include <dev/aic7xxx/aic7xxx_osm.h>
@@ -254,8 +254,8 @@
/* Allocate a dmatag for our SCB DMA maps */
/* XXX Should be a child of the VLB/ISA bus dma tag */
- error = aic_dma_tag_create(ahc, /*parent*/NULL, /*alignment*/1,
- /*boundary*/0,
+ error = aic_dma_tag_create(ahc, /*parent*/bus_get_dma_tag(dev),
+ /*alignment*/1, /*boundary*/0,
/*lowaddr*/BUS_SPACE_MAXADDR_32BIT,
/*highaddr*/BUS_SPACE_MAXADDR,
/*filter*/NULL, /*filterarg*/NULL,
==== //depot/projects/newisp/dev/aic7xxx/ahc_pci.c#2 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahc_pci.c,v 1.64 2005/03/05 19:24:22 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahc_pci.c,v 1.65 2006/09/03 00:27:40 jmg Exp $");
#include <dev/aic7xxx/aic7xxx_osm.h>
@@ -107,8 +107,8 @@
/* Allocate a dmatag for our SCB DMA maps */
/* XXX Should be a child of the PCI bus dma tag */
- error = aic_dma_tag_create(ahc, /*parent*/NULL, /*alignment*/1,
- /*boundary*/0,
+ error = aic_dma_tag_create(ahc, /*parent*/bus_get_dma_tag(dev),
+ /*alignment*/1, /*boundary*/0,
(ahc->flags & AHC_39BIT_ADDRESSING)
? 0x7FFFFFFFFFLL
: BUS_SPACE_MAXADDR_32BIT,
==== //depot/projects/newisp/dev/aic7xxx/ahd_pci.c#2 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahd_pci.c,v 1.19 2005/09/22 04:56:59 gibbs Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/aic7xxx/ahd_pci.c,v 1.20 2006/09/03 00:27:40 jmg Exp $");
#include <dev/aic7xxx/aic79xx_osm.h>
@@ -109,8 +109,8 @@
/* Allocate a dmatag for our SCB DMA maps */
/* XXX Should be a child of the PCI bus dma tag */
- error = aic_dma_tag_create(ahd, /*parent*/NULL, /*alignment*/1,
- /*boundary*/0,
+ error = aic_dma_tag_create(ahd, /*parent*/bus_get_dma_tag(dev),
+ /*alignment*/1, /*boundary*/0,
(ahd->flags & AHD_39BIT_ADDRESSING)
? 0x7FFFFFFFFF
: BUS_SPACE_MAXADDR_32BIT,
==== //depot/projects/newisp/dev/ata/ata-chipset.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.172 2006/08/30 11:50:22 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.173 2006/09/02 12:55:42 sos Exp $");
#include "opt_ata.h"
#include <sys/param.h>
@@ -4750,12 +4750,14 @@
{ ATA_VIA8233A, 0x00, VIA133, 0x00, ATA_UDMA6, "8233A" },
{ ATA_VIA8235, 0x00, VIA133, 0x00, ATA_UDMA6, "8235" },
{ ATA_VIA8237, 0x00, VIA133, 0x00, ATA_UDMA6, "8237" },
+ { ATA_VIA8237A, 0x00, VIA133, 0x00, ATA_UDMA6, "8237A" },
{ ATA_VIA8251, 0x00, VIA133, 0x00, ATA_UDMA6, "8251" },
{ 0, 0, 0, 0, 0, 0 }};
static struct ata_chip_id new_ids[] =
{{ ATA_VIA6410, 0x00, 0, 0x00, ATA_UDMA6, "6410" },
{ ATA_VIA6420, 0x00, 7, 0x00, ATA_SA150, "6420" },
{ ATA_VIA6421, 0x00, 6, VIABAR, ATA_SA150, "6421" },
+ { ATA_VIA8237A, 0x00, 0, 0x00, ATA_SA150, "8237A" },
{ ATA_VIA8251, 0x00, 0, VIAAHCI, ATA_SA300, "8251" },
{ 0, 0, 0, 0, 0, 0 }};
char buffer[64];
==== //depot/projects/newisp/dev/ata/ata-dma.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.141 2006/01/05 21:27:19 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-dma.c,v 1.142 2006/09/03 00:27:41 jmg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -96,7 +96,7 @@
struct ata_channel *ch = device_get_softc(dev);
struct ata_dc_cb_args ccba;
- if (bus_dma_tag_create(NULL, ch->dma->alignment, 0,
+ if (bus_dma_tag_create(bus_get_dma_tag(dev), ch->dma->alignment, 0,
BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR,
NULL, NULL, ch->dma->max_iosize,
ATA_DMA_ENTRIES, ch->dma->segsize,
==== //depot/projects/newisp/dev/ata/ata-pci.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.69 2006/08/14 19:39:33 sos Exp $
+ * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.70 2006/09/02 12:55:42 sos Exp $
*/
/* structure holding chipset config info */
@@ -337,6 +337,7 @@
#define ATA_VIA8233C 0x31091106
#define ATA_VIA8235 0x31771106
#define ATA_VIA8237 0x32271106
+#define ATA_VIA8237A 0x05911106
#define ATA_VIA8251 0x33491106
#define ATA_VIA8361 0x31121106
#define ATA_VIA8363 0x03051106
==== //depot/projects/newisp/dev/bge/if_bge.c#2 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.140 2006/08/24 14:41:16 oleg Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.143 2006/09/03 00:27:41 jmg Exp $");
/*
* Broadcom BCM570x family gigabit ethernet driver for FreeBSD.
@@ -1702,7 +1702,7 @@
/*
* Allocate the parent bus DMA tag appropriate for PCI.
*/
- error = bus_dma_tag_create(NULL, /* parent */
+ error = bus_dma_tag_create(bus_get_dma_tag(sc->bge_dev),/* parent */
PAGE_SIZE, 0, /* alignment, boundary */
BUS_SPACE_MAXADDR, /* lowaddr */
BUS_SPACE_MAXADDR, /* highaddr */
@@ -2326,6 +2326,12 @@
}
}
+ /*
+ * Write the magic number to the firmware mailbox at 0xb50
+ * so that the driver can synchronize with the firmware.
+ */
+ bge_writemem_ind(sc, BGE_SOFTWARE_GENCOMM, BGE_MAGIC_NUMBER);
+
/* Issue global reset */
bge_writereg_ind(sc, BGE_MISC_CFG, reset);
@@ -2362,11 +2368,6 @@
CSR_WRITE_4(sc, BGE_MARB_MODE, BGE_MARBMODE_ENABLE);
/*
- * Prevent PXE restart: write a magic number to the
- * general communications memory at 0xB50.
- */
- bge_writemem_ind(sc, BGE_SOFTWARE_GENCOMM, BGE_MAGIC_NUMBER);
- /*
* Poll the value location we just wrote until
* we see the 1's complement of the magic number.
* This indicates that the firmware initialization
==== //depot/projects/newisp/dev/bge/if_bgereg.h#2 (text+ko) ====
@@ -30,7 +30,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.52 2006/08/23 11:32:54 glebius Exp $
+ * $FreeBSD: src/sys/dev/bge/if_bgereg.h,v 1.54 2006/09/01 22:45:11 davidch Exp $
*/
/*
@@ -1768,10 +1768,11 @@
} while(0)
/*
- * This magic number is used to prevent PXE restart when we
- * issue a software reset. We write this magic number to the
- * firmware mailbox at 0xB50 in order to prevent the PXE boot
- * code from running.
+ * This magic number is written to the firmware mailbox at 0xb50
+ * before a software reset is issued. After the internal firmware
+ * has completed its initialization it will write the opposite of
+ * this value, ~BGE_MAGIC_NUMBER, to the same location, allowing the
+ * driver to synchronize with the firmware.
*/
#define BGE_MAGIC_NUMBER 0x4B657654
==== //depot/projects/newisp/dev/em/if_em.c#3 (text+ko) ====
@@ -31,7 +31,7 @@
***************************************************************************/
-/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.134 2006/08/31 18:49:41 jhb Exp $*/
+/*$FreeBSD: src/sys/dev/em/if_em.c,v 1.139 2006/09/03 00:27:41 jmg Exp $*/
#ifdef HAVE_KERNEL_OPTION_HEADERS
#include "opt_device_polling.h"
@@ -1321,14 +1321,17 @@
INIT_DEBUGOUT("em_media_status: begin");
+ EM_LOCK(adapter);
em_check_for_link(&adapter->hw);
em_update_link_status(adapter);
ifmr->ifm_status = IFM_AVALID;
ifmr->ifm_active = IFM_ETHER;
- if (!adapter->link_active)
+ if (!adapter->link_active) {
+ EM_UNLOCK(adapter);
return;
+ }
ifmr->ifm_status |= IFM_ACTIVE;
@@ -1355,6 +1358,7 @@
else
ifmr->ifm_active |= IFM_HDX;
}
+ EM_UNLOCK(adapter);
}
/*********************************************************************
@@ -1376,6 +1380,7 @@
if (IFM_TYPE(ifm->ifm_media) != IFM_ETHER)
return (EINVAL);
+ EM_LOCK(adapter);
switch (IFM_SUBTYPE(ifm->ifm_media)) {
case IFM_AUTO:
adapter->hw.autoneg = DO_AUTO_NEG;
@@ -1412,7 +1417,8 @@
*/
adapter->hw.phy_reset_disable = FALSE;
- em_init(adapter);
+ em_init_locked(adapter);
+ EM_UNLOCK(adapter);
return (0);
}
@@ -1961,7 +1967,7 @@
}
-/*********************************************************************
+/********************************************************************
*
* Determine hardware revision.
*
@@ -1972,22 +1978,16 @@
device_t dev = adapter->dev;
/* Make sure our PCI config space has the necessary stuff set */
+ pci_enable_busmaster(dev);
+ pci_enable_io(dev, SYS_RES_MEMORY);
adapter->hw.pci_cmd_word = pci_read_config(dev, PCIR_COMMAND, 2);
- if ((adapter->hw.pci_cmd_word & PCIM_CMD_BUSMASTEREN) == 0 &&
- (adapter->hw.pci_cmd_word & PCIM_CMD_MEMEN)) {
- device_printf(dev, "Memory Access and/or Bus Master bits "
- "were not set!\n");
- adapter->hw.pci_cmd_word |=
- (PCIM_CMD_BUSMASTEREN | PCIM_CMD_MEMEN);
- pci_write_config(dev, PCIR_COMMAND, adapter->hw.pci_cmd_word, 2);
- }
/* Save off the information about this board */
adapter->hw.vendor_id = pci_get_vendor(dev);
adapter->hw.device_id = pci_get_device(dev);
- adapter->hw.revision_id = pci_read_config(dev, PCIR_REVID, 1);
- adapter->hw.subsystem_vendor_id = pci_read_config(dev, PCIR_SUBVEND_0, 2);
- adapter->hw.subsystem_id = pci_read_config(dev, PCIR_SUBDEV_0, 2);
+ adapter->hw.revision_id = pci_get_revid(dev);
+ adapter->hw.subsystem_vendor_id = pci_get_subvendor(dev);
+ adapter->hw.subsystem_id = pci_get_subdevice(dev);
/* Identify the MAC */
if (em_set_mac_type(&adapter->hw))
@@ -2285,7 +2285,7 @@
em_media_status);
if ((adapter->hw.media_type == em_media_type_fiber) ||
(adapter->hw.media_type == em_media_type_internal_serdes)) {
- u_char fiber_type = IFM_1000_SX; // default type;
+ u_char fiber_type = IFM_1000_SX; /* default type; */
if (adapter->hw.mac_type == em_82545)
fiber_type = IFM_1000_LX;
@@ -2389,7 +2389,7 @@
{
int error;
- error = bus_dma_tag_create(NULL, /* parent */
+ error = bus_dma_tag_create(bus_get_dma_tag(adapter->dev), /* parent */
EM_DBA_ALIGN, 0, /* alignment, bounds */
BUS_SPACE_MAXADDR, /* lowaddr */
BUS_SPACE_MAXADDR, /* highaddr */
@@ -2493,7 +2493,7 @@
* Setup DMA descriptor areas.
*/
size = roundup2(adapter->hw.max_frame_size, MCLBYTES);
- if ((error = bus_dma_tag_create(NULL, /* parent */
+ if ((error = bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */
1, 0, /* alignment, bounds */
BUS_SPACE_MAXADDR, /* lowaddr */
BUS_SPACE_MAXADDR, /* highaddr */
@@ -2905,7 +2905,7 @@
bzero(adapter->rx_buffer_area, sizeof(struct em_buffer) * adapter->num_rx_desc);
- error = bus_dma_tag_create(NULL, /* parent */
+ error = bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */
1, 0, /* alignment, bounds */
BUS_SPACE_MAXADDR, /* lowaddr */
BUS_SPACE_MAXADDR, /* highaddr */
==== //depot/projects/newisp/dev/gem/if_gem.c#2 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/gem/if_gem.c,v 1.38 2006/06/02 23:14:39 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/gem/if_gem.c,v 1.39 2006/09/03 00:27:41 jmg Exp $");
/*
* Driver for Sun GEM ethernet controllers.
@@ -153,9 +153,10 @@
gem_reset(sc);
GEM_UNLOCK(sc);
- error = bus_dma_tag_create(NULL, 1, 0, BUS_SPACE_MAXADDR_32BIT,
- BUS_SPACE_MAXADDR, NULL, NULL, MCLBYTES, GEM_NSEGS,
- BUS_SPACE_MAXSIZE_32BIT, 0, NULL, NULL, &sc->sc_pdmatag);
+ error = bus_dma_tag_create(bus_get_dma_tag(sc->sc_dev), 1, 0,
+ BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL,
+ MCLBYTES, GEM_NSEGS, BUS_SPACE_MAXSIZE_32BIT, 0, NULL, NULL,
+ &sc->sc_pdmatag);
if (error)
goto fail_ifnet;
==== //depot/projects/newisp/dev/isp/isp_pci.c#9 (text+ko) ====
@@ -30,7 +30,7 @@
* FreeBSD Version.
*/
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list