Permalink
Browse files

Sync with head.

  • Loading branch information...
simonb
simonb committed Jul 31, 2008
1 parent fd5e256 commit 7e88897d9f1a3bf0a15733532644e5250d47c4e8
Showing with 1,735 additions and 3,734 deletions.
  1. +62 −1 distrib/sets/lists/comp/mi
  2. +17 −1 distrib/sets/lists/comp/shl.mi
  3. +6 −6 sys/Makefile
  4. +20 −20 sys/arch/ia64/stand/ia64/ski/acpi_stub.c
  5. +3 −0 sys/arch/ibmnws/include/mach_machdep.h
  6. +4 −4 sys/arch/macppc/dev/kauai.c
  7. +4 −2 sys/arch/sgimips/dev/crmfb.c
  8. +4 −4 sys/compat/linux/common/linux_signal.c
  9. +58 −53 sys/dev/pci/if_iwn.c
  10. +3 −2 sys/dev/pci/pcidevs
  11. +4 −3 sys/dev/pci/pcidevs.h
  12. +8 −4 sys/dev/pci/pcidevs_data.h
  13. +4 −4 sys/dev/pcmcia/xirc.c
  14. +6 −7 sys/dev/usb/ubt.c
  15. +3 −4 sys/dev/usb/uhub.c
  16. +87 −70 sys/dev/usb/usb_subr.c
  17. +2 −1 sys/dev/usb/usbdivar.h
  18. +5 −3 sys/dist/acpica/acnetbsd.h
  19. +1 −1 sys/external/bsd/drm/dist/bsd-core/drm_irq.c
  20. +183 −2 sys/fs/tmpfs/tmpfs.h
  21. +1 −170 sys/fs/tmpfs/tmpfs_args.h
  22. +3 −2 sys/fs/tmpfs/tmpfs_vfsops.c
  23. +10 −10 sys/fs/udf/udf.h
  24. +81 −37 sys/fs/udf/udf_allocation.c
  25. +16 −5 sys/fs/udf/udf_readwrite.c
  26. +24 −8 sys/fs/udf/udf_strat_direct.c
  27. +27 −12 sys/fs/udf/udf_strat_rmw.c
  28. +26 −16 sys/fs/udf/udf_strat_sequential.c
  29. +167 −18 sys/fs/udf/udf_subr.c
  30. +6 −3 sys/fs/udf/udf_subr.h
  31. +19 −7 sys/fs/udf/udf_vfsops.c
  32. +3 −3 sys/kern/kern_rwlock.c
  33. +6 −2 sys/kern/subr_autoconf.c
  34. +4 −4 sys/kern/tty.c
  35. +6 −6 sys/net80211/_ieee80211.h
  36. +5 −5 sys/net80211/ieee80211.h
  37. +2 −2 sys/net80211/ieee80211_ioctl.h
  38. +3 −3 sys/net80211/ieee80211_proto.h
  39. +2 −2 sys/net80211/ieee80211_radiotap.h
  40. +3 −2 sys/netinet/tcp_input.c
  41. +11 −17 sys/rump/Makefile.rump
  42. +16 −12 sys/rump/README.dirs
  43. +2 −2 sys/rump/TODO
  44. +2 −2 sys/rump/fs/Makefile
  45. +3 −23 sys/rump/fs/Makefile.rumpfs
  46. +0 −8 sys/rump/fs/bin/Makefile
  47. +0 −18 sys/rump/fs/bin/Makefile.inc
  48. +0 −9 sys/rump/fs/bin/cd9660fs/Makefile
  49. +0 −61 sys/rump/fs/bin/cd9660fs/cd9660fs.c
  50. +0 −9 sys/rump/fs/bin/efs/Makefile
  51. +0 −87 sys/rump/fs/bin/efs/efs.c
  52. +0 −11 sys/rump/fs/bin/ext2fs/Makefile
  53. +0 −87 sys/rump/fs/bin/ext2fs/ext2fs.c
  54. +0 −11 sys/rump/fs/bin/ffs/Makefile
  55. +0 −106 sys/rump/fs/bin/ffs/ffs.c
  56. +0 −15 sys/rump/fs/bin/fsconsole/Makefile
  57. +0 −147 sys/rump/fs/bin/fsconsole/fsconsole.c
  58. +0 −9 sys/rump/fs/bin/hfs/Makefile
  59. +0 −87 sys/rump/fs/bin/hfs/hfs.c
  60. +0 −11 sys/rump/fs/bin/lfs/Makefile
  61. +0 −87 sys/rump/fs/bin/lfs/lfs.c
  62. +0 −9 sys/rump/fs/bin/msdosfs/Makefile
  63. +0 −89 sys/rump/fs/bin/msdosfs/msdosfs.c
  64. +0 −9 sys/rump/fs/bin/ntfs/Makefile
  65. +0 −88 sys/rump/fs/bin/ntfs/ntfs.c
  66. +0 −11 sys/rump/fs/bin/syspuffs/Makefile
  67. +0 −131 sys/rump/fs/bin/syspuffs/syspuffs.c
  68. +0 −9 sys/rump/fs/bin/tmpfs/Makefile
  69. +0 −88 sys/rump/fs/bin/tmpfs/tmpfs.c
  70. +0 −12 sys/rump/fs/bin/udf/Makefile
  71. +0 −88 sys/rump/fs/bin/udf/udf.c
  72. +3 −17 sys/rump/fs/lib/Makefile.inc
  73. +3 −5 sys/rump/fs/lib/libcd9660fs/Makefile
  74. +4 −0 sys/rump/fs/lib/libcd9660fs/shlib_version
  75. +3 −5 sys/rump/fs/lib/libefs/Makefile
  76. +4 −0 sys/rump/fs/lib/libefs/shlib_version
  77. +3 −5 sys/rump/fs/lib/libext2fs/Makefile
  78. +4 −0 sys/rump/fs/lib/libext2fs/shlib_version
  79. +3 −5 sys/rump/fs/lib/libffs/Makefile
  80. +4 −0 sys/rump/fs/lib/libffs/shlib_version
  81. +3 −5 sys/rump/fs/lib/libhfs/Makefile
  82. +4 −0 sys/rump/fs/lib/libhfs/shlib_version
  83. +3 −5 sys/rump/fs/lib/liblfs/Makefile
  84. +4 −0 sys/rump/fs/lib/liblfs/shlib_version
  85. +3 −5 sys/rump/fs/lib/libmsdosfs/Makefile
  86. +4 −0 sys/rump/fs/lib/libmsdosfs/shlib_version
  87. +3 −5 sys/rump/fs/lib/libnfs/Makefile
  88. +4 −0 sys/rump/fs/lib/libnfs/shlib_version
  89. +3 −5 sys/rump/fs/lib/libntfs/Makefile
  90. +4 −0 sys/rump/fs/lib/libntfs/shlib_version
  91. +0 −16 sys/rump/fs/lib/libp2k/Makefile
  92. +0 −763 sys/rump/fs/lib/libp2k/p2k.c
  93. +4 −9 sys/rump/fs/lib/libsyspuffs/Makefile
  94. +4 −4 sys/rump/fs/lib/libsyspuffs/puffs_rumpglue.c
  95. +4 −0 sys/rump/fs/lib/libsyspuffs/shlib_version
  96. +3 −5 sys/rump/fs/lib/libtmpfs/Makefile
  97. +4 −0 sys/rump/fs/lib/libtmpfs/shlib_version
  98. +3 −5 sys/rump/fs/lib/libudf/Makefile
  99. +4 −0 sys/rump/fs/lib/libudf/shlib_version
  100. +3 −5 sys/rump/fs/lib/libufs/Makefile
  101. +4 −0 sys/rump/fs/lib/libufs/shlib_version
  102. +0 −15 sys/rump/fs/lib/libukfs/Makefile
  103. +0 −554 sys/rump/fs/lib/libukfs/ukfs.c
  104. +0 −98 sys/rump/fs/lib/libukfs/ukfs.h
  105. +11 −0 sys/rump/fs/rumptest/Makefile
  106. +10 −0 sys/rump/fs/rumptest/rumptest.c
  107. +11 −14 sys/rump/{fs/lib/libp2k/p2k.h → include/machine/vmparam.h}
  108. +3 −93 sys/rump/librump/rumpkern/Makefile
  109. +107 −0 sys/rump/librump/rumpkern/Makefile.rumpkern
  110. +3 −3 sys/rump/librump/rumpkern/atomic.c
  111. +2 −3 sys/rump/librump/rumpkern/auth.c
  112. +3 −2 sys/rump/librump/rumpkern/emul.c
  113. +1 −2 sys/rump/librump/rumpkern/genfs_io.c
  114. +1 −4 sys/rump/librump/rumpkern/intr.c
  115. +3 −3 sys/rump/librump/rumpkern/locks.c
  116. +3 −2 sys/rump/librump/rumpkern/ltsleep.c
  117. +2 −2 sys/rump/librump/rumpkern/pool.c
  118. +121 −0 sys/rump/librump/rumpkern/rump.3
  119. +3 −2 sys/rump/librump/rumpkern/rump.c
  120. +8 −3 sys/rump/librump/rumpkern/rump.h
  121. +2 −2 sys/rump/librump/rumpkern/rump_private.h
  122. +3 −2 sys/rump/librump/rumpkern/specfs.c
  123. +3 −2 sys/rump/librump/rumpkern/vfs.c
  124. +5 −4 sys/rump/librump/rumpkern/vm.c
  125. +8 −5 sys/rump/librump/rumpuser/Makefile
  126. +50 −0 sys/rump/librump/rumpuser/rumpuser.3
  127. +4 −4 sys/rump/librump/rumpuser/rumpuser.c
  128. +3 −3 sys/sys/mount.h
  129. +2 −2 sys/sys/param.h
  130. +100 −65 sys/ufs/ffs/ffs_snapshot.c
  131. +226 −108 sys/uvm/uvm_map.c
  132. +6 −6 sys/uvm/uvm_map.h
View
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1157.2.6 2008/07/28 14:30:37 simonb Exp $
+# $NetBSD: mi,v 1.1157.2.7 2008/07/31 04:47:25 simonb Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1825,6 +1825,13 @@
./usr/include/rpcsvc/ypclnt.h comp-c-include
./usr/include/rpcsvc/yppasswd.h comp-c-include
./usr/include/rpcsvc/yppasswd.x comp-c-include
+./usr/include/rump/p2k.h comp-c-include puffs
+./usr/include/rump/rump.h comp-c-include
+./usr/include/rump/rump_syscalls.h comp-c-include
+./usr/include/rump/rumpdefs.h comp-c-include
+./usr/include/rump/rumpuser.h comp-c-include
+./usr/include/rump/rumpvnode_if.h comp-c-include
+./usr/include/rump/ukfs.h comp-c-include
./usr/include/sa.h comp-obsolete obsolete
./usr/include/sched.h comp-c-include
./usr/include/sdp.h comp-c-include
@@ -2315,6 +2322,8 @@
./usr/lib/libobjc_p.a comp-objc-proflib profile
./usr/lib/libossaudio.a comp-c-lib
./usr/lib/libossaudio_p.a comp-c-proflib profile
+./usr/lib/libp2k.a comp-c-lib puffs
+./usr/lib/libp2k_p.a comp-c-proflib puffs,profile
./usr/lib/libpam.a comp-c-lib pam
./usr/lib/libpcap.a comp-c-lib
./usr/lib/libpcap_p.a comp-c-proflib profile
@@ -2343,6 +2352,34 @@
./usr/lib/librpcsvc_p.a comp-c-proflib profile
./usr/lib/librt.a comp-c-lib
./usr/lib/librt_p.a comp-c-proflib profile
+./usr/lib/librump.a comp-c-lib
+./usr/lib/librump_p.a comp-c-proflib profile
+./usr/lib/librumpfs_cd9660fs.a comp-c-lib
+./usr/lib/librumpfs_cd9660fs_p.a comp-c-proflib profile
+./usr/lib/librumpfs_efs.a comp-c-lib
+./usr/lib/librumpfs_efs_p.a comp-c-proflib profile
+./usr/lib/librumpfs_ext2fs.a comp-c-lib
+./usr/lib/librumpfs_ext2fs_p.a comp-c-proflib profile
+./usr/lib/librumpfs_ffs.a comp-c-lib
+./usr/lib/librumpfs_ffs_p.a comp-c-proflib profile
+./usr/lib/librumpfs_hfs.a comp-c-lib
+./usr/lib/librumpfs_hfs_p.a comp-c-proflib profile
+./usr/lib/librumpfs_lfs.a comp-c-lib
+./usr/lib/librumpfs_lfs_p.a comp-c-proflib profile
+./usr/lib/librumpfs_msdosfs.a comp-c-lib
+./usr/lib/librumpfs_msdosfs_p.a comp-c-proflib profile
+./usr/lib/librumpfs_ntfs.a comp-c-lib
+./usr/lib/librumpfs_ntfs_p.a comp-c-proflib profile
+./usr/lib/librumpfs_syspuffs.a comp-c-lib
+./usr/lib/librumpfs_syspuffs_p.a comp-c-proflib profile
+./usr/lib/librumpfs_tmpfs.a comp-c-lib
+./usr/lib/librumpfs_tmpfs_p.a comp-c-proflib profile
+./usr/lib/librumpfs_udf.a comp-c-lib
+./usr/lib/librumpfs_udf_p.a comp-c-proflib profile
+./usr/lib/librumpfs_ufs.a comp-c-lib
+./usr/lib/librumpfs_ufs_p.a comp-c-proflib profile
+./usr/lib/librumpuser.a comp-c-lib
+./usr/lib/librumpuser_p.a comp-c-proflib profile
./usr/lib/libsdp.a comp-c-lib
./usr/lib/libsdp_p.a comp-c-proflib profile
./usr/lib/libskey.a comp-c-lib skey
@@ -2369,6 +2406,8 @@
./usr/lib/libtermcap_p.a comp-c-proflib profile
./usr/lib/libtermlib.a comp-c-lib
./usr/lib/libtermlib_p.a comp-c-proflib profile
+./usr/lib/libukfs.a comp-c-lib
+./usr/lib/libukfs_p.a comp-c-proflib profile
./usr/lib/libusb.a comp-obsolete obsolete
./usr/lib/libusb_p.a comp-obsolete obsolete
./usr/lib/libusb_pic.a comp-obsolete obsolete
@@ -3182,6 +3221,17 @@
./usr/libdata/debug/usr/sbin/rpc.statd.debug comp-nfsserver-debug debug
./usr/libdata/debug/usr/sbin/rpc.yppasswdd.debug comp-nis-debug yp,debug
./usr/libdata/debug/usr/sbin/rpcbind.debug comp-rpcbind-debug debug
+./usr/libdata/debug/usr/sbin/rump_cd9660.debug comp-sysutil-debug debug,puffs
+./usr/libdata/debug/usr/sbin/rump_efs.debug comp-sysutil-debug debug,puffs
+./usr/libdata/debug/usr/sbin/rump_ext2fs.debug comp-sysutil-debug debug,puffs
+./usr/libdata/debug/usr/sbin/rump_ffs.debug comp-sysutil-debug debug,puffs
+./usr/libdata/debug/usr/sbin/rump_hfs.debug comp-sysutil-debug debug,puffs
+./usr/libdata/debug/usr/sbin/rump_lfs.debug comp-sysutil-debug debug,puffs
+./usr/libdata/debug/usr/sbin/rump_msdos.debug comp-sysutil-debug debug,puffs
+./usr/libdata/debug/usr/sbin/rump_ntfs.debug comp-sysutil-debug debug,puffs
+./usr/libdata/debug/usr/sbin/rump_syspuffs.debug comp-sysutil-debug debug,puffs
+./usr/libdata/debug/usr/sbin/rump_tmpfs.debug comp-sysutil-debug debug,puffs
+./usr/libdata/debug/usr/sbin/rump_udf.debug comp-sysutil-debug debug,puffs
./usr/libdata/debug/usr/sbin/rtadvd.debug comp-router-debug use_inet6,debug
./usr/libdata/debug/usr/sbin/rtquery.debug comp-netutil-debug debug
./usr/libdata/debug/usr/sbin/rtsold.debug comp-netutil-debug inet6,debug
@@ -3280,6 +3330,7 @@
./usr/libdata/lint/llib-lmilter.ln comp-obsolete obsolete
./usr/libdata/lint/llib-lntp.ln comp-obsolete obsolete
./usr/libdata/lint/llib-lossaudio.ln comp-c-lintlib lint
+./usr/libdata/lint/llib-lp2k.ln comp-c-lintlib lint,puffs
./usr/libdata/lint/llib-lpam.ln comp-c-lintlib lint,pam
./usr/libdata/lint/llib-lpcap.ln comp-c-lintlib lint
./usr/libdata/lint/llib-lpci.ln comp-c-lintlib lint
@@ -3294,6 +3345,7 @@
./usr/libdata/lint/llib-lrmt.ln comp-c-lintlib lint
./usr/libdata/lint/llib-lrpcsvc.ln comp-c-lintlib lint
./usr/libdata/lint/llib-lrt.ln comp-c-lintlib lint
+./usr/libdata/lint/llib-lrumpuser.ln comp-c-lintlib lint
./usr/libdata/lint/llib-lsdp.ln comp-c-lintlib lint
./usr/libdata/lint/llib-lskey.ln comp-c-lintlib lint,skey
./usr/libdata/lint/llib-lsm.ln comp-obsolete obsolete
@@ -3303,6 +3355,7 @@
./usr/libdata/lint/llib-lstdc.ln comp-c-lintlib lint
./usr/libdata/lint/llib-ltelnet.ln comp-obsolete obsolete
./usr/libdata/lint/llib-ltermcap.ln comp-c-lintlib lint
+./usr/libdata/lint/llib-lukfs.ln comp-c-lintlib lint
./usr/libdata/lint/llib-lusb.ln comp-obsolete obsolete
./usr/libdata/lint/llib-lusbhid.ln comp-c-lintlib lint
./usr/libdata/lint/llib-lutil.ln comp-c-lintlib lint
@@ -6535,6 +6588,7 @@
./usr/share/man/cat3/ossaudio.0 comp-c-catman .cat
./usr/share/man/cat3/overlay.0 comp-c-catman .cat
./usr/share/man/cat3/overwrite.0 comp-c-catman .cat
+./usr/share/man/cat3/p2k.0 comp-c-catman .cat,puffs
./usr/share/man/cat3/pair_content.0 comp-c-catman .cat
./usr/share/man/cat3/pam.0 comp-c-catman .cat,pam
./usr/share/man/cat3/pam_acct_mgmt.0 comp-c-catman .cat,pam
@@ -6971,6 +7025,8 @@
./usr/share/man/cat3/rresvport.0 comp-c-catman .cat
./usr/share/man/cat3/rresvport_af.0 comp-c-catman .cat
./usr/share/man/cat3/rsa.0 comp-obsolete obsolete
+./usr/share/man/cat3/rump.0 comp-c-catman .cat
+./usr/share/man/cat3/rumpuser.0 comp-c-catman .cat
./usr/share/man/cat3/ruserok.0 comp-c-catman .cat
./usr/share/man/cat3/savetty.0 comp-c-catman .cat
./usr/share/man/cat3/scalb.0 comp-c-catman .cat
@@ -7378,6 +7434,7 @@
./usr/share/man/cat3/tzsetwall.0 comp-c-catman .cat
./usr/share/man/cat3/ualarm.0 comp-c-catman .cat
./usr/share/man/cat3/uid_from_user.0 comp-c-catman .cat
+./usr/share/man/cat3/ukfs.0 comp-c-catman .cat
./usr/share/man/cat3/ulimit.0 comp-c-catman .cat
./usr/share/man/cat3/uname.0 comp-c-catman .cat
./usr/share/man/cat3/unctrl.0 comp-c-catman .cat
@@ -11895,6 +11952,7 @@
./usr/share/man/man3/ossaudio.3 comp-c-man .man
./usr/share/man/man3/overlay.3 comp-c-man .man
./usr/share/man/man3/overwrite.3 comp-c-man .man
+./usr/share/man/man3/p2k.3 comp-c-man .man,puffs
./usr/share/man/man3/pair_content.3 comp-c-man .man
./usr/share/man/man3/pam.3 comp-c-man .man,pam
./usr/share/man/man3/pam_acct_mgmt.3 comp-c-man .man,pam
@@ -12331,6 +12389,8 @@
./usr/share/man/man3/rresvport.3 comp-c-man .man
./usr/share/man/man3/rresvport_af.3 comp-c-man .man
./usr/share/man/man3/rsa.3 comp-obsolete obsolete
+./usr/share/man/man3/rump.3 comp-c-man .man
+./usr/share/man/man3/rumpuser.3 comp-c-man .man
./usr/share/man/man3/ruserok.3 comp-c-man .man
./usr/share/man/man3/savetty.3 comp-c-man .man
./usr/share/man/man3/scalb.3 comp-c-man .man
@@ -12902,6 +12962,7 @@
./usr/share/man/man3/wunderend.3 comp-c-man .man
./usr/share/man/man3/wunderscore.3 comp-c-man .man
./usr/share/man/man3/wvline.3 comp-c-man .man
+./usr/share/man/man3/ukfs.3 comp-c-man .man
./usr/share/man/man3/xdr.3 comp-c-man .man
./usr/share/man/man3/xdr_accepted_reply.3 comp-c-man .man
./usr/share/man/man3/xdr_array.3 comp-c-man .man
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.64 2008/05/22 14:24:42 lukem Exp $
+# $NetBSD: shl.mi,v 1.64.2.1 2008/07/31 04:47:25 simonb Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -61,6 +61,7 @@
./usr/lib/libopcodes.so.2 comp-c-shlib bfd
./usr/lib/libopcodes.so.2.0 comp-c-shlib bfd
./usr/lib/libossaudio_pic.a comp-c-piclib
+./usr/lib/libp2k_pic.a comp-c-piclib puffs
./usr/lib/libpam_pic.a comp-c-piclib pam
./usr/lib/libpcap_pic.a comp-c-piclib
./usr/lib/libpci_pic.a comp-c-piclib
@@ -75,6 +76,20 @@
./usr/lib/libroken_pic.a comp-c-piclib kerberos
./usr/lib/librpcsvc_pic.a comp-c-piclib
./usr/lib/librt_pic.a comp-c-piclib
+./usr/lib/librump_pic.a comp-c-piclib
+./usr/lib/librumpfs_cd9660fs_pic.a comp-c-piclib
+./usr/lib/librumpfs_efs_pic.a comp-c-piclib
+./usr/lib/librumpfs_ext2fs_pic.a comp-c-piclib
+./usr/lib/librumpfs_ffs_pic.a comp-c-piclib
+./usr/lib/librumpfs_hfs_pic.a comp-c-piclib
+./usr/lib/librumpfs_lfs_pic.a comp-c-piclib
+./usr/lib/librumpfs_msdosfs_pic.a comp-c-piclib
+./usr/lib/librumpfs_ntfs_pic.a comp-c-piclib
+./usr/lib/librumpfs_syspuffs_pic.a comp-c-piclib
+./usr/lib/librumpfs_tmpfs_pic.a comp-c-piclib
+./usr/lib/librumpfs_udf_pic.a comp-c-piclib
+./usr/lib/librumpfs_ufs_pic.a comp-c-piclib
+./usr/lib/librumpuser_pic.a comp-c-piclib
./usr/lib/libsdp_pic.a comp-c-piclib
./usr/lib/libskey_pic.a comp-c-piclib skey
./usr/lib/libsl_pic.a comp-c-piclib kerberos
@@ -85,6 +100,7 @@
./usr/lib/libstdc++_pic.a comp-cxx-piclib
./usr/lib/libtermcap_pic.a comp-c-piclib
./usr/lib/libtermlib_pic.a comp-c-piclib
+./usr/lib/libukfs_pic.a comp-c-piclib
./usr/lib/libusbhid_pic.a comp-c-piclib
./usr/lib/libutil_pic.a comp-c-piclib
./usr/lib/libwrap_pic.a comp-c-piclib
View
@@ -1,15 +1,11 @@
-# $NetBSD: Makefile,v 1.66 2008/05/02 23:12:01 ad Exp $
+# $NetBSD: Makefile,v 1.66.4.1 2008/07/31 04:51:01 simonb Exp $
SUBDIR= altq arch compat dev fs miscfs \
net net80211 netatalk netbt netipsec netinet netinet6 \
netisdn netiso netkey netnatm netsmb \
nfs opencrypto sys ufs uvm
-.if (${MACHINE} != "vax" \
- && ${MACHINE} != "evbppc")
-SUBDIR+= rump
-.endif
-
+# interrupt implementation depends on the kernel within the port
.if (${MACHINE} != "evbppc")
SUBDIR+=lkm modules
.endif
@@ -18,4 +14,8 @@ SUBDIR+=lkm modules
includes-lkm:
@true
+.if make(obj)
+SUBDIR+= rump
+.endif
+
.include <bsd.kinc.mk>
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_stub.c,v 1.3 2006/08/30 11:12:04 cherry Exp $ */
+/* $NetBSD: acpi_stub.c,v 1.3.66.1 2008/07/31 04:51:01 simonb Exp $ */
/*-
* Copyright (c) 2003 Marcel Moolenaar
@@ -32,20 +32,18 @@
#include <sys/cdefs.h>
/* __FBSDID("$FreeBSD: src/sys/boot/ia64/libski/acpi_stub.c,v 1.3 2003/12/09 08:35:17 marcel Exp $"); */
-#define _KERNEL /* XXX: Fix dist/acpica/acnetbsd.h for _STANDALONE */
#include <sys/types.h>
#include <sys/lock.h>
#include <dist/acpica/acpi.h>
-#undef _KERNEL
#define APIC_IO_SAPIC 6
#define APIC_LOCAL_SAPIC 7
-#pragma pack(1)
+#pragma pack(1) /* XXX: Standardify me */
typedef struct /* LOCAL SAPIC */
{
- APIC_HEADER Header;
+ ACPI_SUBTABLE_HEADER Header;
UINT8 ProcessorId; /* ACPI processor id */
UINT8 LocalSapicId; /* Processor local SAPIC id */
UINT8 LocalSapicEid; /* Processor local SAPIC eid */
@@ -56,27 +54,27 @@ typedef struct /* LOCAL SAPIC */
typedef struct /* IO SAPIC */
{
- APIC_HEADER Header;
- UINT8 IoSapicId; /* I/O SAPIC ID */
- UINT8 Reserved; /* reserved - must be zero */
- UINT32 Vector; /* interrupt base */
- UINT64 IoSapicAddress; /* SAPIC's physical address */
+ ACPI_SUBTABLE_HEADER Header;
+ UINT8 IoSapicId; /* I/O SAPIC ID */
+ UINT8 Reserved; /* reserved - must be zero */
+ UINT32 Vector; /* interrupt base */
+ UINT64 IoSapicAddress; /* SAPIC's physical address */
} IO_SAPIC;
/*
*/
struct {
- MULTIPLE_APIC_TABLE Header;
- MADT_LOCAL_SAPIC cpu0;
- MADT_LOCAL_SAPIC cpu1;
- MADT_LOCAL_SAPIC cpu2;
- MADT_LOCAL_SAPIC cpu3;
- MADT_IO_SAPIC sapic;
+ ACPI_TABLE_MADT Header;
+ ACPI_MADT_LOCAL_SAPIC cpu0;
+ ACPI_MADT_LOCAL_SAPIC cpu1;
+ ACPI_MADT_LOCAL_SAPIC cpu2;
+ ACPI_MADT_LOCAL_SAPIC cpu3;
+ ACPI_MADT_IO_SAPIC sapic;
} apic = {
/* Header. */
{
- APIC_SIG, /* Signature. */
+ ACPI_SIG_MADT, /* Signature. */
sizeof(apic), /* Length of table. */
0, /* ACPI minor revision. */
0, /* XXX checksum. */
@@ -143,7 +141,7 @@ struct {
UINT64 apic_tbl;
} xsdt = {
{
- XSDT_SIG, /* Signature. */
+ ACPI_SIG_XSDT, /* Signature. */
sizeof(xsdt), /* Length of table. */
0, /* ACPI minor revision. */
0, /* XXX checksum. */
@@ -156,8 +154,8 @@ struct {
0UL /* XXX APIC table address. */
};
-RSDP_DESCRIPTOR acpi_root = {
- RSDP_SIG,
+ACPI_TABLE_RSDP acpi_root = {
+ ACPI_SIG_RSDP,
0, /* XXX checksum. */
"FBSD",
2, /* ACPI Rev 2.0. */
@@ -167,6 +165,8 @@ RSDP_DESCRIPTOR acpi_root = {
0, /* XXX Extended checksum. */
};
+#pragma pack() /* Reset Packing */
+
static void
cksum(void *addr, int sz, UINT8 *sum)
{
@@ -0,0 +1,3 @@
+/* $NetBSD: mach_machdep.h,v 1.1.2.2 2008/07/31 04:51:01 simonb Exp $ */
+
+#include <powerpc/mach_machdep.h>
@@ -1,4 +1,4 @@
-/* $NetBSD: kauai.c,v 1.24.2.1 2008/07/03 18:37:54 simonb Exp $ */
+/* $NetBSD: kauai.c,v 1.24.2.2 2008/07/31 04:51:01 simonb Exp $ */
/*-
* Copyright (c) 2003 Tsubai Masanari. All rights reserved.
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kauai.c,v 1.24.2.1 2008/07/03 18:37:54 simonb Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kauai.c,v 1.24.2.2 2008/07/31 04:51:01 simonb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -55,8 +55,8 @@ __KERNEL_RCSID(0, "$NetBSD: kauai.c,v 1.24.2.1 2008/07/03 18:37:54 simonb Exp $"
#define WDC_AUXREG_OFFSET 0x16
#define WDC_AUXREG_NPORTS 1
-#define PIO_CONFIG_REG (0x200 >> 4) /* PIO and DMA access timing */
-#define DMA_CONFIG_REG (0x210 >> 4) /* UDMA access timing */
+#define PIO_CONFIG_REG 0x200 /* PIO and DMA access timing */
+#define DMA_CONFIG_REG 0x210 /* UDMA access timing */
struct kauai_softc {
struct wdc_softc sc_wdcdev;
@@ -1,4 +1,4 @@
-/* $NetBSD: crmfb.c,v 1.25 2008/05/08 02:10:59 jmcneill Exp $ */
+/* $NetBSD: crmfb.c,v 1.25.2.1 2008/07/31 04:51:01 simonb Exp $ */
/*-
* Copyright (c) 2007 Jared D. McNeill <jmcneill@invisible.ca>
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: crmfb.c,v 1.25 2008/05/08 02:10:59 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: crmfb.c,v 1.25.2.1 2008/07/31 04:51:01 simonb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -304,6 +304,8 @@ crmfb_attach(struct device *parent, struct device *self, void *opaque)
for (i = 0; i < (sc->sc_tiles_x * sc->sc_tiles_y); i++) {
p[i] = ((uint32_t)v >> 16) + i;
}
+ bus_dmamap_sync(sc->sc_dmat, sc->sc_dmai.map, 0, sc->sc_dmai.size,
+ BUS_DMASYNC_PREWRITE);
sc->sc_scratch = (char *)KERNADDR(sc->sc_dma) + (0xf0000 * sc->sc_tiles_x);
sc->sc_linear = (paddr_t)DMAADDR(sc->sc_dma) + 0x100000 * sc->sc_tiles_x;
Oops, something went wrong.

0 comments on commit 7e88897

Please sign in to comment.