svn commit: r221495 - in projects/largeSMP: . bin/sh contrib/top
crypto/openssh etc/periodic/daily lib/libarchive lib/libcrypt
release release/amd64 release/i386 release/pc98
release/powerpc releas...
Attilio Rao
attilio at FreeBSD.org
Thu May 5 14:05:30 UTC 2011
Author: attilio
Date: Thu May 5 14:05:29 2011
New Revision: 221495
URL: http://svn.freebsd.org/changeset/base/221495
Log:
MFC
Added:
projects/largeSMP/release/pc98/mkisoimages.sh
- copied unchanged from r221493, head/release/pc98/mkisoimages.sh
projects/largeSMP/release/powerpc/generate-hfs.sh
- copied unchanged from r221493, head/release/powerpc/generate-hfs.sh
projects/largeSMP/release/powerpc/hfs-boot.bz2.uu
- copied unchanged from r221493, head/release/powerpc/hfs-boot.bz2.uu
projects/largeSMP/release/sun4v/mkisoimages.sh
- copied unchanged from r221493, head/release/sun4v/mkisoimages.sh
projects/largeSMP/tools/regression/bin/sh/errors/bad-parm-exp6.2
- copied unchanged from r221493, head/tools/regression/bin/sh/errors/bad-parm-exp6.2
projects/largeSMP/tools/regression/bin/sh/errors/bad-parm-exp6.2.stderr
- copied unchanged from r221493, head/tools/regression/bin/sh/errors/bad-parm-exp6.2.stderr
projects/largeSMP/tools/regression/bin/sh/expansion/set-u3.0
- copied unchanged from r221493, head/tools/regression/bin/sh/expansion/set-u3.0
Deleted:
projects/largeSMP/release/powerpc/hfs.map
Modified:
projects/largeSMP/Makefile.inc1
projects/largeSMP/bin/sh/arith_yacc.c
projects/largeSMP/bin/sh/parser.c
projects/largeSMP/crypto/openssh/ChangeLog
projects/largeSMP/crypto/openssh/defines.h
projects/largeSMP/etc/periodic/daily/220.backup-pkgdb
projects/largeSMP/lib/libarchive/Makefile
projects/largeSMP/lib/libarchive/archive_hash.h
projects/largeSMP/lib/libarchive/config_freebsd.h
projects/largeSMP/lib/libcrypt/crypt-sha256.c
projects/largeSMP/lib/libcrypt/crypt-sha512.c
projects/largeSMP/lib/libcrypt/crypt.c
projects/largeSMP/lib/libcrypt/crypt.h
projects/largeSMP/release/Makefile.sysinstall
projects/largeSMP/release/amd64/mkisoimages.sh
projects/largeSMP/release/i386/mkisoimages.sh
projects/largeSMP/release/powerpc/mkisoimages.sh
projects/largeSMP/share/man/man9/bus_adjust_resource.9
projects/largeSMP/share/man/man9/make_dev.9
projects/largeSMP/sys/dev/ath/ath_hal/ar5416/ar2133.c
projects/largeSMP/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c
projects/largeSMP/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
projects/largeSMP/sys/dev/ath/ath_hal/ar5416/ar5416reg.h
projects/largeSMP/sys/dev/bge/if_bge.c
projects/largeSMP/sys/dev/bge/if_bgereg.h
projects/largeSMP/sys/dev/cxgbe/offload.h
projects/largeSMP/sys/dev/cxgbe/t4_ioctl.h
projects/largeSMP/sys/dev/cxgbe/t4_main.c
projects/largeSMP/sys/dev/cxgbe/t4_sge.c
projects/largeSMP/sys/dev/mii/brgphy.c
projects/largeSMP/sys/fs/nfs/nfsproto.h
projects/largeSMP/sys/fs/nfsclient/nfs_clport.c
projects/largeSMP/sys/geom/cache/g_cache.c
projects/largeSMP/sys/geom/concat/g_concat.c
projects/largeSMP/sys/geom/eli/g_eli.c
projects/largeSMP/sys/geom/journal/g_journal.c
projects/largeSMP/sys/geom/mountver/g_mountver.c
projects/largeSMP/sys/geom/multipath/g_multipath.c
projects/largeSMP/sys/geom/sched/g_sched.c
projects/largeSMP/sys/geom/shsec/g_shsec.c
projects/largeSMP/sys/geom/stripe/g_stripe.c
projects/largeSMP/sys/mips/conf/PB92
projects/largeSMP/sys/mips/conf/PB92.hints
projects/largeSMP/sys/modules/cxgbe/if_cxgbe/Makefile
projects/largeSMP/sys/netinet/sctp.h
projects/largeSMP/sys/netinet/sctp_cc_functions.c
projects/largeSMP/sys/netinet/sctp_sysctl.h
projects/largeSMP/sys/netinet/sctp_usrreq.c
projects/largeSMP/sys/nfs/nfs_nfssvc.c
projects/largeSMP/sys/sys/stddef.h
projects/largeSMP/usr.bin/nfsstat/nfsstat.1
projects/largeSMP/usr.bin/nfsstat/nfsstat.c
projects/largeSMP/usr.sbin/bluetooth/bthidd/hid.c
projects/largeSMP/usr.sbin/makefs/cd9660/cd9660_eltorito.c
Directory Properties:
projects/largeSMP/ (props changed)
projects/largeSMP/cddl/contrib/opensolaris/ (props changed)
projects/largeSMP/contrib/bind9/ (props changed)
projects/largeSMP/contrib/binutils/ (props changed)
projects/largeSMP/contrib/bzip2/ (props changed)
projects/largeSMP/contrib/dialog/ (props changed)
projects/largeSMP/contrib/ee/ (props changed)
projects/largeSMP/contrib/expat/ (props changed)
projects/largeSMP/contrib/file/ (props changed)
projects/largeSMP/contrib/gcc/ (props changed)
projects/largeSMP/contrib/gdb/ (props changed)
projects/largeSMP/contrib/gdtoa/ (props changed)
projects/largeSMP/contrib/gnu-sort/ (props changed)
projects/largeSMP/contrib/groff/ (props changed)
projects/largeSMP/contrib/less/ (props changed)
projects/largeSMP/contrib/libpcap/ (props changed)
projects/largeSMP/contrib/libstdc++/ (props changed)
projects/largeSMP/contrib/llvm/ (props changed)
projects/largeSMP/contrib/llvm/tools/clang/ (props changed)
projects/largeSMP/contrib/ncurses/ (props changed)
projects/largeSMP/contrib/netcat/ (props changed)
projects/largeSMP/contrib/ntp/ (props changed)
projects/largeSMP/contrib/one-true-awk/ (props changed)
projects/largeSMP/contrib/openbsm/ (props changed)
projects/largeSMP/contrib/openpam/ (props changed)
projects/largeSMP/contrib/pf/ (props changed)
projects/largeSMP/contrib/sendmail/ (props changed)
projects/largeSMP/contrib/tcpdump/ (props changed)
projects/largeSMP/contrib/tcsh/ (props changed)
projects/largeSMP/contrib/top/ (props changed)
projects/largeSMP/contrib/top/install-sh (props changed)
projects/largeSMP/contrib/tzcode/stdtime/ (props changed)
projects/largeSMP/contrib/tzcode/zic/ (props changed)
projects/largeSMP/contrib/tzdata/ (props changed)
projects/largeSMP/contrib/wpa/ (props changed)
projects/largeSMP/contrib/xz/ (props changed)
projects/largeSMP/crypto/openssh/ (props changed)
projects/largeSMP/crypto/openssl/ (props changed)
projects/largeSMP/gnu/lib/ (props changed)
projects/largeSMP/gnu/usr.bin/binutils/ (props changed)
projects/largeSMP/gnu/usr.bin/cc/cc_tools/ (props changed)
projects/largeSMP/gnu/usr.bin/gdb/ (props changed)
projects/largeSMP/lib/libc/ (props changed)
projects/largeSMP/lib/libc/stdtime/ (props changed)
projects/largeSMP/lib/libutil/ (props changed)
projects/largeSMP/lib/libz/ (props changed)
projects/largeSMP/sbin/ (props changed)
projects/largeSMP/sbin/ipfw/ (props changed)
projects/largeSMP/share/mk/bsd.arch.inc.mk (props changed)
projects/largeSMP/share/zoneinfo/ (props changed)
projects/largeSMP/sys/ (props changed)
projects/largeSMP/sys/amd64/include/xen/ (props changed)
projects/largeSMP/sys/boot/ (props changed)
projects/largeSMP/sys/boot/i386/efi/ (props changed)
projects/largeSMP/sys/boot/ia64/efi/ (props changed)
projects/largeSMP/sys/boot/ia64/ski/ (props changed)
projects/largeSMP/sys/boot/powerpc/boot1.chrp/ (props changed)
projects/largeSMP/sys/boot/powerpc/ofw/ (props changed)
projects/largeSMP/sys/cddl/contrib/opensolaris/ (props changed)
projects/largeSMP/sys/conf/ (props changed)
projects/largeSMP/sys/contrib/dev/acpica/ (props changed)
projects/largeSMP/sys/contrib/octeon-sdk/ (props changed)
projects/largeSMP/sys/contrib/pf/ (props changed)
projects/largeSMP/sys/contrib/x86emu/ (props changed)
projects/largeSMP/usr.bin/calendar/ (props changed)
projects/largeSMP/usr.bin/csup/ (props changed)
projects/largeSMP/usr.bin/procstat/ (props changed)
projects/largeSMP/usr.sbin/ndiscvt/ (props changed)
projects/largeSMP/usr.sbin/zic/ (props changed)
Modified: projects/largeSMP/Makefile.inc1
==============================================================================
--- projects/largeSMP/Makefile.inc1 Thu May 5 13:55:43 2011 (r221494)
+++ projects/largeSMP/Makefile.inc1 Thu May 5 14:05:29 2011 (r221495)
@@ -868,7 +868,7 @@ reinstallkernel reinstallkernel.debug: i
false
.endif
@echo "--------------------------------------------------------------"
- @echo ">>> Installing kernel ${KERNCONF}"
+ @echo ">>> Installing kernel ${INSTALLKERNEL}"
@echo "--------------------------------------------------------------"
cd ${KRNLOBJDIR}/${INSTALLKERNEL}; \
${CROSSENV} PATH=${TMPPATH} \
Modified: projects/largeSMP/bin/sh/arith_yacc.c
==============================================================================
--- projects/largeSMP/bin/sh/arith_yacc.c Thu May 5 13:55:43 2011 (r221494)
+++ projects/largeSMP/bin/sh/arith_yacc.c Thu May 5 14:05:29 2011 (r221495)
@@ -97,6 +97,8 @@ static arith_t arith_lookupvarint(char *
arith_t result;
str = lookupvar(varname);
+ if (uflag && str == NULL)
+ yyerror("variable not set");
if (str == NULL || *str == '\0')
str = "0";
errno = 0;
Modified: projects/largeSMP/bin/sh/parser.c
==============================================================================
--- projects/largeSMP/bin/sh/parser.c Thu May 5 13:55:43 2011 (r221494)
+++ projects/largeSMP/bin/sh/parser.c Thu May 5 14:05:29 2011 (r221495)
@@ -1569,6 +1569,8 @@ varname:
}
}
} else if (subtype != VSERROR) {
+ if (subtype == VSLENGTH && c != '}')
+ subtype = VSERROR;
pungetc();
}
STPUTC('=', out);
Modified: projects/largeSMP/crypto/openssh/ChangeLog
==============================================================================
--- projects/largeSMP/crypto/openssh/ChangeLog Thu May 5 13:55:43 2011 (r221494)
+++ projects/largeSMP/crypto/openssh/ChangeLog Thu May 5 14:05:29 2011 (r221495)
@@ -1,6 +1,7 @@
20110403
- (djm) [README contrib/caldera/openssh.spec contrib/redhat/openssh.spec]
[contrib/suse/openssh.spec] Prepare for 5.8p2 release.
+ - (djm) [version.h] crank version
- Release 5.8p2
20110329
Modified: projects/largeSMP/crypto/openssh/defines.h
==============================================================================
--- projects/largeSMP/crypto/openssh/defines.h Thu May 5 13:55:43 2011 (r221494)
+++ projects/largeSMP/crypto/openssh/defines.h Thu May 5 14:05:29 2011 (r221495)
@@ -25,7 +25,7 @@
#ifndef _DEFINES_H
#define _DEFINES_H
-/* $Id: defines.h,v 1.164 2011/01/17 10:15:31 dtucker Exp $ */
+/* $Id: defines.h,v 1.165 2011/05/05 01:19:15 djm Exp $ */
/* Constants */
@@ -45,6 +45,7 @@ enum
/*
* Definitions for IP type of service (ip_tos)
*/
+#include <netinet/in_systm.h>
#include <netinet/ip.h>
#ifndef IPTOS_LOWDELAY
# define IPTOS_LOWDELAY 0x10
@@ -57,7 +58,6 @@ enum
/*
* Definitions for DiffServ Codepoints as per RFC2474
*/
-#include <netinet/in_systm.h>
#ifndef IPTOS_DSCP_AF11
# define IPTOS_DSCP_AF11 0x28
# define IPTOS_DSCP_AF12 0x30
Modified: projects/largeSMP/etc/periodic/daily/220.backup-pkgdb
==============================================================================
--- projects/largeSMP/etc/periodic/daily/220.backup-pkgdb Thu May 5 13:55:43 2011 (r221494)
+++ projects/largeSMP/etc/periodic/daily/220.backup-pkgdb Thu May 5 14:05:29 2011 (r221495)
@@ -18,7 +18,8 @@ case "$daily_backup_pkgdb_enable" in
bak="${daily_backup_pkgdb_dir:-/var/backups}"
bak_file="${bak}/pkgdb.bak.tbz"
- pkg_dbdir=`make -f/usr/share/mk/bsd.port.mk -V PKG_DBDIR 2>/dev/null`
+ pkg_dbdir=`make -f/usr/share/mk/bsd.port.mk -V PKG_DBDIR 2>/dev/null` ||
+ pkg_dbdir=/var/db/pkg
if [ ! -d "$bak" ]
then
@@ -33,7 +34,7 @@ case "$daily_backup_pkgdb_enable" in
new_bak_file=`mktemp ${bak_file}-XXXXX`
- if tar -cjf "${new_bak_file}" "$pkg_dbdir"; then
+ if tar -cjHf "${new_bak_file}" "$pkg_dbdir" 2>/dev/null; then
chmod 644 "${new_bak_file}"
if [ -e "${bak_file}.2" -a -e "${bak_file}" ]; then
Modified: projects/largeSMP/lib/libarchive/Makefile
==============================================================================
--- projects/largeSMP/lib/libarchive/Makefile Thu May 5 13:55:43 2011 (r221494)
+++ projects/largeSMP/lib/libarchive/Makefile Thu May 5 14:05:29 2011 (r221495)
@@ -2,8 +2,8 @@
.include <bsd.own.mk>
LIB= archive
-DPADD= ${LIBZ} ${LIBMD}
-LDADD= -lz -lmd
+DPADD= ${LIBZ}
+LDADD= -lz
DPADD+= ${LIBBZ2}
LDADD+= -lbz2
@@ -24,6 +24,9 @@ CFLAGS+= -I${.OBJDIR}
CFLAGS+= -DWITH_OPENSSL
DPADD+= ${LIBCRYPTO}
LDADD+= -lcrypto
+.else
+DPADD+= ${LIBMD}
+LDADD+= -lmd
.endif
# Headers to be installed in /usr/include
Modified: projects/largeSMP/lib/libarchive/archive_hash.h
==============================================================================
--- projects/largeSMP/lib/libarchive/archive_hash.h Thu May 5 13:55:43 2011 (r221494)
+++ projects/largeSMP/lib/libarchive/archive_hash.h Thu May 5 14:05:29 2011 (r221495)
@@ -41,11 +41,11 @@
* - OpenBSD 4.4 and earlier have SHA2 in libc with _ after algorithm name
*
* DragonFly and FreeBSD (XXX not used yet):
- * - MD5 and SHA1 in libmd: without _ after algorithm name
- * - SHA256: with _ after algorithm name
+ * - MD5 in libmd: without _ after algorithm name
+ * - SHA{1,256,512} in libmd: with _ after algorithm name (conflicts w/OpenSSL!)
*
* OpenSSL:
- * - MD5, SHA1 and SHA2 in libcrypto: with _ after algorithm name
+ * - MD5, SHA1, SHA2, SHA{256,384,512} in libcrypto: with _ after algorithm name
*/
#if defined(HAVE_MD5_H) && defined(HAVE_MD5INIT)
Modified: projects/largeSMP/lib/libarchive/config_freebsd.h
==============================================================================
--- projects/largeSMP/lib/libarchive/config_freebsd.h Thu May 5 13:55:43 2011 (r221494)
+++ projects/largeSMP/lib/libarchive/config_freebsd.h Thu May 5 14:05:29 2011 (r221495)
@@ -47,8 +47,24 @@
#define HAVE_OPENSSL_MD5_H 1
#define HAVE_OPENSSL_RIPEMD_H 1
#define HAVE_OPENSSL_SHA_H 1
+#define HAVE_OPENSSL_SHA256_INIT 1
+#define HAVE_OPENSSL_SHA384_INIT 1
+#define HAVE_OPENSSL_SHA512_INIT 1
+#define HAVE_SHA256 1
#define HAVE_SHA384 1
#define HAVE_SHA512 1
+#else
+#define HAVE_MD5_H 1
+#define HAVE_MD5INIT 1
+#define HAVE_SHA_H 1
+#define HAVE_SHA1 1
+#define HAVE_SHA1_INIT 1
+#define HAVE_SHA256 1
+#define HAVE_SHA256_H 1
+#define HAVE_SHA256_INIT 1
+#define HAVE_SHA512 1
+#define HAVE_SHA512_H 1
+#define HAVE_SHA512_INIT 1
#endif
#define HAVE_BSDXML_H 1
@@ -88,7 +104,6 @@
#define HAVE_LUTIMES 1
#define HAVE_MALLOC 1
#define HAVE_MD5 1
-#define HAVE_MD5_H 1
#define HAVE_MEMMOVE 1
#define HAVE_MKDIR 1
#define HAVE_MKFIFO 1
@@ -101,10 +116,6 @@
#define HAVE_RMD160 1
#define HAVE_SELECT 1
#define HAVE_SETENV 1
-#define HAVE_SHA_H 1
-#define HAVE_SHA1 1
-#define HAVE_SHA256 1
-#define HAVE_SHA256_H 1
#define HAVE_SIGNAL_H 1
#define HAVE_STDINT_H 1
#define HAVE_STDLIB_H 1
Modified: projects/largeSMP/lib/libcrypt/crypt-sha256.c
==============================================================================
--- projects/largeSMP/lib/libcrypt/crypt-sha256.c Thu May 5 13:55:43 2011 (r221494)
+++ projects/largeSMP/lib/libcrypt/crypt-sha256.c Thu May 5 14:05:29 2011 (r221495)
@@ -60,7 +60,7 @@ static const char sha256_rounds_prefix[]
#define ROUNDS_MAX 999999999
static char *
-sha256_crypt_r(const char *key, const char *salt, char *buffer, int buflen)
+crypt_sha256_r(const char *key, const char *salt, char *buffer, int buflen)
{
u_long srounds;
int n;
@@ -268,12 +268,12 @@ sha256_crypt_r(const char *key, const ch
/* This entry point is equivalent to crypt(3). */
char *
-sha256_crypt(const char *key, const char *salt)
+crypt_sha256(const char *key, const char *salt)
{
/* We don't want to have an arbitrary limit in the size of the
* password. We can compute an upper bound for the size of the
* result in advance and so we can prepare the buffer we pass to
- * `sha256_crypt_r'. */
+ * `crypt_sha256_r'. */
static char *buffer;
static int buflen;
int needed;
@@ -293,7 +293,7 @@ sha256_crypt(const char *key, const char
buflen = needed;
}
- return sha256_crypt_r(key, salt, buffer, buflen);
+ return crypt_sha256_r(key, salt, buffer, buflen);
}
#ifdef TEST
@@ -459,7 +459,7 @@ main(void)
}
for (cnt = 0; cnt < ntests2; ++cnt) {
- char *cp = sha256_crypt(tests2[cnt].input, tests2[cnt].salt);
+ char *cp = crypt_sha256(tests2[cnt].input, tests2[cnt].salt);
if (strcmp(cp, tests2[cnt].expected) != 0) {
printf("test %d: expected \"%s\", got \"%s\"\n",
Modified: projects/largeSMP/lib/libcrypt/crypt-sha512.c
==============================================================================
--- projects/largeSMP/lib/libcrypt/crypt-sha512.c Thu May 5 13:55:43 2011 (r221494)
+++ projects/largeSMP/lib/libcrypt/crypt-sha512.c Thu May 5 14:05:29 2011 (r221495)
@@ -60,7 +60,7 @@ static const char sha512_rounds_prefix[]
#define ROUNDS_MAX 999999999
static char *
-sha512_crypt_r(const char *key, const char *salt, char *buffer, int buflen)
+crypt_sha512_r(const char *key, const char *salt, char *buffer, int buflen)
{
u_long srounds;
int n;
@@ -280,12 +280,12 @@ sha512_crypt_r(const char *key, const ch
/* This entry point is equivalent to crypt(3). */
char *
-sha512_crypt(const char *key, const char *salt)
+crypt_sha512(const char *key, const char *salt)
{
/* We don't want to have an arbitrary limit in the size of the
* password. We can compute an upper bound for the size of the
* result in advance and so we can prepare the buffer we pass to
- * `sha512_crypt_r'. */
+ * `crypt_sha512_r'. */
static char *buffer;
static int buflen;
int needed;
@@ -305,7 +305,7 @@ sha512_crypt(const char *key, const char
buflen = needed;
}
- return sha512_crypt_r(key, salt, buffer, buflen);
+ return crypt_sha512_r(key, salt, buffer, buflen);
}
#ifdef TEST
@@ -482,7 +482,7 @@ main(void)
}
for (cnt = 0; cnt < ntests2; ++cnt) {
- char *cp = sha512_crypt(tests2[cnt].input, tests2[cnt].salt);
+ char *cp = crypt_sha512(tests2[cnt].input, tests2[cnt].salt);
if (strcmp(cp, tests2[cnt].expected) != 0) {
printf("test %d: expected \"%s\", got \"%s\"\n",
Modified: projects/largeSMP/lib/libcrypt/crypt.c
==============================================================================
--- projects/largeSMP/lib/libcrypt/crypt.c Thu May 5 13:55:43 2011 (r221494)
+++ projects/largeSMP/lib/libcrypt/crypt.c Thu May 5 14:05:29 2011 (r221495)
@@ -64,12 +64,12 @@ static const struct {
},
{
"sha256",
- sha256_crypt,
+ crypt_sha256,
"$5$"
},
{
"sha512",
- sha512_crypt,
+ crypt_sha512,
"$6$"
},
{
Modified: projects/largeSMP/lib/libcrypt/crypt.h
==============================================================================
--- projects/largeSMP/lib/libcrypt/crypt.h Thu May 5 13:55:43 2011 (r221494)
+++ projects/largeSMP/lib/libcrypt/crypt.h Thu May 5 14:05:29 2011 (r221495)
@@ -36,8 +36,8 @@ char *crypt_des(const char *pw, const ch
char *crypt_md5(const char *pw, const char *salt);
char *crypt_nthash(const char *pw, const char *salt);
char *crypt_blowfish(const char *pw, const char *salt);
-char *sha256_crypt (const char *pw, const char *salt);
-char *sha512_crypt (const char *pw, const char *salt);
+char *crypt_sha256 (const char *pw, const char *salt);
+char *crypt_sha512 (const char *pw, const char *salt);
extern void _crypt_to64(char *s, u_long v, int n);
extern void b64_from_24bit(uint8_t B2, uint8_t B1, uint8_t B0, int n, int *buflen, char **cp);
Modified: projects/largeSMP/release/Makefile.sysinstall
==============================================================================
--- projects/largeSMP/release/Makefile.sysinstall Thu May 5 13:55:43 2011 (r221494)
+++ projects/largeSMP/release/Makefile.sysinstall Thu May 5 14:05:29 2011 (r221495)
@@ -1136,35 +1136,35 @@ CD_DVD1_PKGS= ${CD_PACKAGE_TREE}/dvd1
.endif
iso.1:
-.if exists(${.CURDIR}/${TARGET_CPUARCH}/mkisoimages.sh)
+.if exists(${.CURDIR}/${TARGET}/mkisoimages.sh)
@echo "Creating ISO images..."
.if defined(CD_BOOT)
- @sh ${.CURDIR}/${TARGET_CPUARCH}/mkisoimages.sh ${BOOTABLE} \
+ @sh ${.CURDIR}/${TARGET}/mkisoimages.sh ${BOOTABLE} \
FreeBSD_bootonly \
${CD}/FreeBSD-${BUILDNAME}-${TARGET}-bootonly.iso ${CD_BOOT}
.endif
- @sh ${.CURDIR}/${TARGET_CPUARCH}/mkisoimages.sh ${BOOTABLE} \
+ @sh ${.CURDIR}/${TARGET}/mkisoimages.sh ${BOOTABLE} \
FreeBSD_Install \
${CD}/FreeBSD-${BUILDNAME}-${TARGET}-disc1.iso ${CD_DISC1} \
${CD_DISC1_PKGS}
- @sh ${.CURDIR}/${TARGET_CPUARCH}/mkisoimages.sh \
+ @sh ${.CURDIR}/${TARGET}/mkisoimages.sh \
FreeBSD_Packages \
${CD}/FreeBSD-${BUILDNAME}-${TARGET}-disc2.iso ${CD_DISC2} \
${CD_DISC2_PKGS}
.if defined(MAKE_DVD)
- @sh ${.CURDIR}/${TARGET_CPUARCH}/mkisoimages.sh ${BOOTABLE} \
+ @sh ${.CURDIR}/${TARGET}/mkisoimages.sh ${BOOTABLE} \
FreeBSD_Install \
${CD}/FreeBSD-${BUILDNAME}-${TARGET}-dvd1.iso ${CD_DVD1} \
${CD_DVD1_PKGS}
.endif
.if !defined(NODOC)
- @sh ${.CURDIR}/${TARGET_CPUARCH}/mkisoimages.sh \
+ @sh ${.CURDIR}/${TARGET}/mkisoimages.sh \
FreeBSD_Documentation \
${CD}/FreeBSD-${BUILDNAME}-${TARGET}-disc3.iso ${CD_DOCS} \
${CD_DOCS_PKGS}
.endif
.if defined(SEPARATE_LIVEFS)
- @sh ${.CURDIR}/${TARGET_CPUARCH}/mkisoimages.sh ${BOOTABLE} \
+ @sh ${.CURDIR}/${TARGET}/mkisoimages.sh ${BOOTABLE} \
FreeBSD_LiveFS \
${CD}/FreeBSD-${BUILDNAME}-${TARGET}-livefs.iso ${CD_LIVEFS}
.endif
@@ -1173,7 +1173,7 @@ iso.1:
@(cd ${CD} && sha256 *.iso > FreeBSD-${BUILDNAME}-${TARGET}-iso.CHECKSUM.SHA256)
touch ${.TARGET}
.else
- @echo "Do not know how to create an ISO for ${TARGET_CPUARCH}."
+ @echo "Do not know how to create an ISO for ${TARGET}."
.endif
#
Modified: projects/largeSMP/release/amd64/mkisoimages.sh
==============================================================================
--- projects/largeSMP/release/amd64/mkisoimages.sh Thu May 5 13:55:43 2011 (r221494)
+++ projects/largeSMP/release/amd64/mkisoimages.sh Thu May 5 14:05:29 2011 (r221495)
@@ -26,7 +26,7 @@
publisher="The FreeBSD Project. http://www.freebsd.org/"
if [ "x$1" = "x-b" ]; then
# This is highly x86-centric and will be used directly below.
- bootable="-b boot/cdboot -no-emul-boot"
+ bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot"
shift
else
bootable=""
@@ -37,24 +37,9 @@ if [ $# -lt 3 ]; then
exit 1
fi
-type mkisofs 2>&1 | grep " is " >/dev/null
-if [ $? -ne 0 ]; then
- echo The cdrtools port is not installed. Trying to get it now.
- if [ -f /usr/ports/sysutils/cdrtools/Makefile ]; then
- cd /usr/ports/sysutils/cdrtools && make install BATCH=yes && make clean
- else
- if ! pkg_add -r cdrtools; then
- echo "Could not get it via pkg_add - please go install this"
- echo "from the ports collection and run this script again."
- exit 2
- fi
- fi
-fi
-
LABEL=$1; shift
NAME=$1; shift
-echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab
-mkisofs $bootable -r -J -V $LABEL -publisher "$publisher" -o $NAME $*
+echo "/dev/iso9660/`echo $LABEL | tr '[:lower:]' '[:upper:]'` / cd9660 ro 0 0" > $1/etc/fstab
+makefs -t cd9660 $bootable -o rockridge -o label=$LABEL $NAME $*
rm $1/etc/fstab
-
Modified: projects/largeSMP/release/i386/mkisoimages.sh
==============================================================================
--- projects/largeSMP/release/i386/mkisoimages.sh Thu May 5 13:55:43 2011 (r221494)
+++ projects/largeSMP/release/i386/mkisoimages.sh Thu May 5 14:05:29 2011 (r221495)
@@ -24,40 +24,22 @@
# into base-bits-dir as part of making the image.
publisher="The FreeBSD Project. http://www.freebsd.org/"
-
if [ "x$1" = "x-b" ]; then
- bootable="-b boot/cdboot -no-emul-boot"
- shift
-elif [ "x$1" = "x-G" ]; then
- bootable="-G /R/cdrom/bootonly/boot/cdboot"
+ # This is highly x86-centric and will be used directly below.
+ bootable="-o bootimage=i386;$4/boot/cdboot -o no-emul-boot"
shift
else
bootable=""
fi
if [ $# -lt 3 ]; then
- echo Usage: $0 '[-bG] image-label image-name base-bits-dir [extra-bits-dir]'
+ echo Usage: $0 '[-b] image-label image-name base-bits-dir [extra-bits-dir]'
exit 1
fi
-type mkisofs 2>&1 | grep " is " >/dev/null
-if [ $? -ne 0 ]; then
- echo The cdrtools port is not installed. Trying to get it now.
- if [ -f /usr/ports/sysutils/cdrtools/Makefile ]; then
- cd /usr/ports/sysutils/cdrtools && make install BATCH=yes && make clean
- else
- if ! pkg_add -r cdrtools; then
- echo "Could not get it via pkg_add - please go install this"
- echo "from the ports collection and run this script again."
- exit 2
- fi
- fi
-fi
-
LABEL=$1; shift
NAME=$1; shift
-echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab
-mkisofs $bootable -r -J -V $LABEL -publisher "$publisher" -o $NAME $*
+echo "/dev/iso9660/`echo $LABEL | tr '[:lower:]' '[:upper:]'` / cd9660 ro 0 0" > $1/etc/fstab
+makefs -t cd9660 $bootable -o rockridge -o label=$LABEL $NAME $*
rm $1/etc/fstab
-
Copied: projects/largeSMP/release/pc98/mkisoimages.sh (from r221493, head/release/pc98/mkisoimages.sh)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/largeSMP/release/pc98/mkisoimages.sh Thu May 5 14:05:29 2011 (r221495, copy of r221493, head/release/pc98/mkisoimages.sh)
@@ -0,0 +1,45 @@
+#!/bin/sh
+#
+# Module: mkisoimages.sh
+# Author: Jordan K Hubbard
+# Date: 22 June 2001
+#
+# $FreeBSD$
+#
+# This script is used by release/Makefile to build the (optional) ISO images
+# for a FreeBSD release. It is considered architecture dependent since each
+# platform has a slightly unique way of making bootable CDs. This script
+# is also allowed to generate any number of images since that is more of
+# publishing decision than anything else.
+#
+# Usage:
+#
+# mkisoimages.sh [-b] image-label image-name base-bits-dir [extra-bits-dir]
+#
+# Where -b is passed if the ISO image should be made "bootable" by
+# whatever standards this architecture supports (may be unsupported),
+# image-label is the ISO image label, image-name is the filename of the
+# resulting ISO image, base-bits-dir contains the image contents and
+# extra-bits-dir, if provided, contains additional files to be merged
+# into base-bits-dir as part of making the image.
+
+publisher="The FreeBSD Project. http://www.freebsd.org/"
+if [ "x$1" = "x-b" ]; then
+ # This is highly x86-centric and will be used directly below.
+ bootable="-o generic-bootimage=$4/boot/cdboot"
+ shift
+else
+ bootable=""
+fi
+
+if [ $# -lt 3 ]; then
+ echo Usage: $0 '[-b] image-label image-name base-bits-dir [extra-bits-dir]'
+ exit 1
+fi
+
+LABEL=$1; shift
+NAME=$1; shift
+
+echo "/dev/iso9660/`echo $LABEL | tr '[:lower:]' '[:upper:]'` / cd9660 ro 0 0" > $1/etc/fstab
+makefs -t cd9660 $bootable -o rockridge -o label=$LABEL $NAME $*
+rm $1/etc/fstab
Copied: projects/largeSMP/release/powerpc/generate-hfs.sh (from r221493, head/release/powerpc/generate-hfs.sh)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/largeSMP/release/powerpc/generate-hfs.sh Thu May 5 14:05:29 2011 (r221495, copy of r221493, head/release/powerpc/generate-hfs.sh)
@@ -0,0 +1,64 @@
+#!/bin/sh
+
+# This script generates the dummy HFS filesystem used for the PowerPC boot
+# blocks. It uses hfsutils (emulators/hfsutils) to generate a template
+# filesystem with the relevant interesting files. These are then found by
+# grep, and the offsets written to a Makefile snippet.
+#
+# Because of licensing concerns, and because it is overkill, we do not
+# distribute hfsutils as a build tool. If you need to regenerate the HFS
+# template (e.g. because the boot block or the CHRP script have grown),
+# you must install it from ports.
+
+# $FreeBSD$
+
+HFS_SIZE=400 #Size in 2048-byte blocks of the produced image
+LOADER_SIZE=300k
+
+# Generate 800K HFS image
+OUTPUT_FILE=hfs-boot
+
+dd if=/dev/zero of=$OUTPUT_FILE bs=2048 count=$HFS_SIZE
+hformat -l "FreeBSD Install" $OUTPUT_FILE
+hmount $OUTPUT_FILE
+
+# Create and bless a directory for the boot loader
+hmkdir ppc
+hattrib -b ppc
+hcd ppc
+
+# Make the CHRP boot script, which gets loader from the ISO9660 partition
+cat > bootinfo.txt << EOF
+<CHRP-BOOT>
+<DESCRIPTION>FreeBSD/powerpc bootloader</DESCRIPTION>
+<OS-NAME>FreeBSD</OS-NAME>
+<VERSION> $FreeBSD: head/sys/boot/powerpc/boot1.chrp/bootinfo.txt 184490 2008-10
+-31 00:52:31Z nwhitehorn $ </VERSION>
+
+<COMPATIBLE>
+MacRISC MacRISC3 MacRISC4
+</COMPATIBLE>
+<BOOT-SCRIPT>
+" screen" output
+boot &device;:,\ppc\loader &device;:0
+</BOOT-SCRIPT>
+</CHRP-BOOT>
+EOF
+echo 'Loader START' | dd of=loader.tmp cbs=$LOADER_SIZE count=1 conv=block
+
+hcopy bootinfo.txt :bootinfo.txt
+hcopy loader.tmp :loader
+hattrib -c chrp -t tbxi bootinfo.txt
+humount
+
+rm bootinfo.txt
+rm loader.tmp
+
+bzip2 $OUTPUT_FILE
+echo 'HFS boot filesystem created by generate-hfs.sh' > $OUTPUT_FILE.bz2.uu
+echo 'DO NOT EDIT' >> $OUTPUT_FILE.bz2.uu
+echo '$FreeBSD$' >> $OUTPUT_FILE.bz2.uu
+
+uuencode $OUTPUT_FILE.bz2 $OUTPUT_FILE.bz2 >> $OUTPUT_FILE.bz2.uu
+rm $OUTPUT_FILE.bz2
+
Copied: projects/largeSMP/release/powerpc/hfs-boot.bz2.uu (from r221493, head/release/powerpc/hfs-boot.bz2.uu)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/largeSMP/release/powerpc/hfs-boot.bz2.uu Thu May 5 14:05:29 2011 (r221495, copy of r221493, head/release/powerpc/hfs-boot.bz2.uu)
@@ -0,0 +1,23 @@
+HFS boot filesystem created by generate-hfs.sh
+DO NOT EDIT
+$FreeBSD$
+begin 644 hfs-boot.bz2
+M0EIH.3%!62936=#$Y.(``"___?_O_G)7!_Y]OW??5#]U_^!`0`, at 1`!!``!@
+M(0!`3,`"L"4.2U"2(H9%/:*>TFDVU3RGZID'J&C3U, at T-&@`/1!H>IZC1D#(
+M`D24TTRFC1D]*;$@!IZ at Q!IH-````#0&33":?J@<:&AH:`:`Q`T!D``&F@`:
+M`9````PDI1J>0Q,H/1J&@```!D-`````T-``#SZHHR(+Y*Y9J*Z:4KK=T]W@
+M4RV\LG/;0XDPC7^`9DO3/3&*].462T,NO#AA9C,O\0!)^Q@@S6";2`!);<W\
+MM\)T,GR:I$-V("3$9$B"&8,,*RS at L++(8KPP)-C!L0(22AH:=29JC18OSD at O
+M&&`F8 at M#$H:5#;%`Q)(22DF(/IB46IH0H?):$7!BU_SU=DL`+E*J,;0?%AW6
+M#\-_#^NL++6(CI"!)*#8N/S2"7!C_QAB8[(ZW3G$\`G81HL8.H^M8?#(Z"JL
+M;J^PI=+>?8(B6BR1(-7Q*8?>>HPQSBQE>M$A9K6FFW<:#6[D931J%U.F8*`0
+MD(,M80A(0;]K'X'SI]G(C)Y).AK_/0)D(2$$]JB$]]F').M4RF8O%[IHK[0O
+MMQ?'>O[U8EM;>U<P%^7)&#;>",KY^*%FO9C05_435?.4*F[6AIL%&9C<9W&&
+M[ZMP(TG!'*4Z>@6TM)0BS.D._O,WR9OJ728V48I;DD=8QGBE7J-&L^?=0JEF
+MV2`B/)/D\)83IS at 32(;!P,152U()0VGQH>2F$UC:M!D5`F#1W$\:KKDR[TQB
+MN;N<J=4-1'[HLG,!L^IJG53+[IORM_L7JB/:/<+:634`XD.R'",=M$A;C4E.
+M$RRHL2;B)D:_ZJVK$Z*40?H'TATSF5$$%L@<LB4`\2$P90.50PWE:'REG6\D
+ML%>5B1;P!7:AG#1BP2%-Q$7I6QE,Y?NHIK_LR+HA]22HW0.8(^G4/X`Z@!Z6
+8#PQ(0))/`A(0.'VUG_\7<D4X4)#0Q.3B
+`
+end
Modified: projects/largeSMP/release/powerpc/mkisoimages.sh
==============================================================================
--- projects/largeSMP/release/powerpc/mkisoimages.sh Thu May 5 13:55:43 2011 (r221494)
+++ projects/largeSMP/release/powerpc/mkisoimages.sh Thu May 5 14:05:29 2011 (r221495)
@@ -23,9 +23,16 @@
# extra-bits-dir, if provided, contains additional files to be merged
# into base-bits-dir as part of making the image.
+publisher="The FreeBSD Project. http://www.freebsd.org/"
if [ "x$1" = "x-b" ]; then
- cp /usr/src/release/powerpc/boot.tbxi ${4}/boot
- bootable="-hfs -hfs-bless ${4}/boot -map /usr/src/release/powerpc/hfs.map -hide-hfs ${4}/usr/share/man"
+ uudecode -o /tmp/hfs-boot-block.bz2 `dirname $0`/hfs-boot.bz2.uu
+ bzip2 -d /tmp/hfs-boot-block.bz2
+ OFFSET=$(hd /tmp/hfs-boot-block | grep 'Loader START' | cut -f 1 -d ' ')
+ OFFSET=0x$(echo 0x$OFFSET | awk '{printf("%x\n",$1/512);}')
+ echo dd if=$4/boot/loader of=/tmp/hfs-boot-block seek=$OFFSET conv=notrunc
+ dd if=$4/boot/loader of=/tmp/hfs-boot-block seek=$OFFSET conv=notrunc
+
+ bootable="-o bootimage=macppc;/tmp/hfs-boot-block -o no-emul-boot"
shift
else
bootable=""
@@ -33,28 +40,13 @@ fi
if [ $# -lt 3 ]; then
echo Usage: $0 '[-b] image-label image-name base-bits-dir [extra-bits-dir]'
- rm -f ${IMG}
exit 1
fi
-type mkisofs 2>&1 | grep " is " >/dev/null
-if [ $? -ne 0 ]; then
- echo The cdrtools port is not installed. Trying to get it now.
- if [ -f /usr/ports/sysutils/cdrtools/Makefile ]; then
- cd /usr/ports/sysutils/cdrtools && make install BATCH=yes && make clean
- else
- if ! pkg_add -r cdrtools; then
- echo "Could not get it via pkg_add - please go install this"
- echo "from the ports collection and run this script again."
- exit 2
- fi
- fi
-fi
-
LABEL=$1; shift
NAME=$1; shift
-echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab
-mkisofs $bootable -l -r -part -no-desktop -V $LABEL -o $NAME $*
+echo "/dev/iso9660/`echo $LABEL | tr '[:lower:]' '[:upper:]'` / cd9660 ro 0 0" > $1/etc/fstab
+makefs -t cd9660 $bootable -o rockridge -o label=$LABEL $NAME $*
rm $1/etc/fstab
-
+rm /tmp/hfs-boot-block
Copied: projects/largeSMP/release/sun4v/mkisoimages.sh (from r221493, head/release/sun4v/mkisoimages.sh)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ projects/largeSMP/release/sun4v/mkisoimages.sh Thu May 5 14:05:29 2011 (r221495, copy of r221493, head/release/sun4v/mkisoimages.sh)
@@ -0,0 +1,72 @@
+#!/bin/sh
+#
+# Module: mkisoimages.sh
+# Author: Jordan K Hubbard
+# Date: 22 June 2001
+#
+# $FreeBSD$
+#
+# This script is used by release/Makefile to build the (optional) ISO images
+# for a FreeBSD release. It is considered architecture dependent since each
+# platform has a slightly unique way of making bootable CDs. This script
+# is also allowed to generate any number of images since that is more of
+# publishing decision than anything else.
+#
+# Usage:
+#
+# mkisoimages.sh [-b] image-label image-name base-bits-dir [extra-bits-dir]
+#
+# Where -b is passed if the ISO image should be made "bootable" by
+# whatever standards this architecture supports (may be unsupported),
+# image-label is the ISO image label, image-name is the filename of the
+# resulting ISO image, base-bits-dir contains the image contents and
+# extra-bits-dir, if provided, contains additional files to be merged
+# into base-bits-dir as part of making the image.
+
+publisher="The FreeBSD Project. http://www.freebsd.org/"
+IMG=/tmp/bootfs
+MNT=/mnt
+
+if [ "x$1" = "x-b" ]; then
+ dd if=/dev/zero of=${IMG} bs=512 count=1024
+ MD=`mdconfig -a -t vnode -f ${IMG}`
+ sunlabel -w -B -b $4/boot/boot1 ${MD} auto
+ newfs -O1 -o space -m 0 /dev/${MD}
+ mount /dev/${MD} ${MNT}
+ mkdir ${MNT}/boot
+ cp $4/boot/loader ${MNT}/boot
+ umount ${MNT}
+ mdconfig -d -u ${MD#md}
+ bootable="-B ,,,,${IMG}"
+ shift
+else
+ bootable=""
+fi
+
+if [ $# -lt 3 ]; then
+ echo Usage: $0 '[-b] image-label image-name base-bits-dir [extra-bits-dir]'
+ rm -f ${IMG}
+ exit 1
+fi
+
+type mkisofs 2>&1 | grep " is " >/dev/null
+if [ $? -ne 0 ]; then
+ echo The cdrtools port is not installed. Trying to get it now.
+ if [ -f /usr/ports/sysutils/cdrtools/Makefile ]; then
+ cd /usr/ports/sysutils/cdrtools && make install BATCH=yes && make clean
+ else
+ if ! pkg_add -r cdrtools; then
+ echo "Could not get it via pkg_add - please go install this"
+ echo "from the ports collection and run this script again."
+ exit 2
+ fi
+ fi
+fi
+
+LABEL=$1; shift
+NAME=$1; shift
+
+echo "/dev/iso9660/$LABEL / cd9660 ro 0 0" > $1/etc/fstab
+mkisofs $bootable -r -J -V $LABEL -publisher "$publisher" -o $NAME $*
+rm $1/etc/fstab
+rm -f ${IMG}
Modified: projects/largeSMP/share/man/man9/bus_adjust_resource.9
==============================================================================
--- projects/largeSMP/share/man/man9/bus_adjust_resource.9 Thu May 5 13:55:43 2011 (r221494)
+++ projects/largeSMP/share/man/man9/bus_adjust_resource.9 Thu May 5 14:05:29 2011 (r221495)
@@ -93,7 +93,7 @@ Grow an existing memory resource by 4096
error = bus_adjust_resource(dev, SYS_RES_MEMORY, res,
rman_get_start(res), rman_get_end(res) + 0x1000);
-.Ed
+.Ed
.Sh SEE ALSO
.Xr bus_alloc_resource 9 ,
.Xr bus_release_resource 9 ,
Modified: projects/largeSMP/share/man/man9/make_dev.9
==============================================================================
--- projects/largeSMP/share/man/man9/make_dev.9 Thu May 5 13:55:43 2011 (r221494)
+++ projects/largeSMP/share/man/man9/make_dev.9 Thu May 5 14:05:29 2011 (r221495)
@@ -24,7 +24,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd May 03, 2011
+.Dd May 3, 2011
.Dt MAKE_DEV 9
.Os
.Sh NAME
@@ -84,15 +84,15 @@ The device will be owned by
.Va uid ,
with the group ownership as
.Va gid .
-The name is the expansion of
-.Va fmt
+The name is the expansion of
+.Va fmt
and following arguments as
.Xr printf 9
would print it.
The name determines its path under
.Pa /dev
-or other
-.Xr devfs 5
+or other
+.Xr devfs 5
mount point and may contain slash
.Ql /
characters to denote subdirectories.
@@ -152,9 +152,9 @@ created device will be never destroyed
return an error if the device name is invalid or already exists
.El
.Pp
-Only
+Only
.Dv MAKEDEV_NOWAIT ,
-.Dv MAKEDEV_WAITOK
+.Dv MAKEDEV_WAITOK
and
.Dv MAKEDEV_CHECKNAME
values are accepted for the
@@ -307,7 +307,8 @@ The
.Fn d_close
driver method cannot call
.Fn destroy_dev
-directly. Doing so causes deadlock when
+directly.
+Doing so causes deadlock when
.Fn destroy_dev
waits for all threads to leave the driver methods.
Also, because
@@ -321,7 +322,8 @@ The device driver may call the
.Fn destroy_dev_drain
function to wait until all devices that have supplied
.Fa csw
-as cdevsw, are destroyed. This is useful when driver knows that
+as cdevsw, are destroyed.
+This is useful when driver knows that
.Fn destroy_dev_sched
is called for all instantiated devices, but need to postpone module
unload until
@@ -370,9 +372,9 @@ flag was specified and the provided devi
.Pp
.Sh SEE ALSO
.Xr devctl 4 ,
+.Xr devfs 5 ,
.Xr destroy_dev_drain 9 ,
-.Xr dev_clone 9 ,
-.Xr devfs 5
+.Xr dev_clone 9
.Sh HISTORY
The
.Fn make_dev
Modified: projects/largeSMP/sys/dev/ath/ath_hal/ar5416/ar2133.c
==============================================================================
--- projects/largeSMP/sys/dev/ath/ath_hal/ar5416/ar2133.c Thu May 5 13:55:43 2011 (r221494)
+++ projects/largeSMP/sys/dev/ath/ath_hal/ar5416/ar2133.c Thu May 5 14:05:29 2011 (r221495)
@@ -165,7 +165,7 @@ ar2133SetChannel(struct ath_hal *ah, con
}
} else if ((freq % 20) == 0 && freq >= 5120) {
channelSel = ath_hal_reverseBits(((freq - 4800) / 20 << 2), 8);
- if (AR_SREV_SOWL_10_OR_LATER(ah))
+ if (AR_SREV_HOWL(ah) || AR_SREV_SOWL_10_OR_LATER(ah))
aModeRefSel = ath_hal_reverseBits(3, 2);
else
aModeRefSel = ath_hal_reverseBits(1, 2);
Modified: projects/largeSMP/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c
==============================================================================
--- projects/largeSMP/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c Thu May 5 13:55:43 2011 (r221494)
+++ projects/largeSMP/sys/dev/ath/ath_hal/ar5416/ar5416_cal.c Thu May 5 14:05:29 2011 (r221495)
@@ -620,9 +620,9 @@ ar5416LoadNF(struct ath_hal *ah, const s
HALDEBUG(ah, HAL_DEBUG_NFCAL, "CCA: ");
for (i = 0; i < AR5416_NUM_NF_READINGS; i ++) {
- /* Don't write to EXT radio CCA registers */
+ /* Don't write to EXT radio CCA registers unless in HT/40 mode */
/* XXX this check should really be cleaner! */
- if (i >= 3 && !IEEE80211_IS_CHAN_HT40(chan))
+ if (i > 2 && !IEEE80211_IS_CHAN_HT40(chan))
continue;
if (chainmask & (1 << i)) {
@@ -670,6 +670,12 @@ ar5416LoadNF(struct ath_hal *ah, const s
* of next noise floor calibration the baseband does.
*/
for (i = 0; i < AR5416_NUM_NF_READINGS; i ++)
+
+ /* Don't write to EXT radio CCA registers unless in HT/40 mode */
+ /* XXX this check should really be cleaner! */
+ if (i > 2 && !IEEE80211_IS_CHAN_HT40(chan))
+ continue;
+
if (chainmask & (1 << i)) {
val = OS_REG_READ(ah, ar5416_cca_regs[i]);
val &= 0xFFFFFE00;
@@ -701,10 +707,12 @@ ar5416InitNfHistBuff(struct ar5212NfCalH
* Update the noise floor buffer as a ring buffer
*/
static void
-ar5416UpdateNFHistBuff(struct ar5212NfCalHist *h, int16_t *nfarray)
+ar5416UpdateNFHistBuff(struct ath_hal *ah, struct ar5212NfCalHist *h,
+ int16_t *nfarray)
{
int i;
+ /* XXX TODO: don't record nfarray[] entries for inactive chains */
for (i = 0; i < AR5416_NUM_NF_READINGS; i ++) {
h[i].nfCalBuffer[h[i].currIndex] = nfarray[i];
@@ -814,7 +822,7 @@ ar5416GetNf(struct ath_hal *ah, struct i
}
ichan->privFlags |= CHANNEL_MIMO_NF_VALID;
- ar5416UpdateNFHistBuff(AH5416(ah)->ah_cal.nfCalHist, nfarray);
+ ar5416UpdateNFHistBuff(ah, AH5416(ah)->ah_cal.nfCalHist, nfarray);
ichan->rawNoiseFloor = nf;
}
return nf;
Modified: projects/largeSMP/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c
==============================================================================
--- projects/largeSMP/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c Thu May 5 13:55:43 2011 (r221494)
+++ projects/largeSMP/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c Thu May 5 14:05:29 2011 (r221495)
@@ -251,7 +251,12 @@ ar5416Reset(struct ath_hal *ah, HAL_OPMO
OS_REG_WRITE(ah, AR_BSSMSKU, LE_READ_2(ahp->ah_bssidmask + 4));
/* Restore previous led state */
- OS_REG_WRITE(ah, AR_MAC_LED, OS_REG_READ(ah, AR_MAC_LED) | saveLedState);
+ if (AR_SREV_HOWL(ah))
+ OS_REG_WRITE(ah, AR_MAC_LED,
+ AR_MAC_LED_ASSOC_ACTIVE | AR_CFG_SCLK_32KHZ);
+ else
+ OS_REG_WRITE(ah, AR_MAC_LED, OS_REG_READ(ah, AR_MAC_LED) |
+ saveLedState);
/* Restore previous antenna */
OS_REG_WRITE(ah, AR_DEF_ANTENNA, saveDefAntenna);
@@ -332,6 +337,19 @@ ar5416Reset(struct ath_hal *ah, HAL_OPMO
if (bChannelChange && !IEEE80211_IS_CHAN_DFS(chan))
chan->ic_state &= ~IEEE80211_CHANSTATE_CWINT;
+ if (AR_SREV_HOWL(ah)) {
+ /*
+ * Enable the MBSSID block-ack fix for HOWL.
+ * This feature is only supported on Howl 1.4, but it is safe to
+ * set bit 22 of STA_ID1 on other Howl revisions (1.1, 1.2, 1.3),
+ * since bit 22 is unused in those Howl revisions.
+ */
+ unsigned int reg;
+ reg = (OS_REG_READ(ah, AR_STA_ID1) | (1<<22));
+ OS_REG_WRITE(ah,AR_STA_ID1, reg);
+ ath_hal_printf(ah, "MBSSID Set bit 22 of AR_STA_ID 0x%x\n", reg);
+ }
+
HALDEBUG(ah, HAL_DEBUG_RESET, "%s: done\n", __func__);
OS_MARK(ah, AH_MARK_RESET_DONE, 0);
@@ -1205,7 +1223,11 @@ ar5416SetReset(struct ath_hal *ah, int t
#endif /* AH_SUPPORT_AR9130 */
OS_REG_WRITE(ah, AR_RTC_RC, rst_flags);
- OS_DELAY(50);
+
+ if (AR_SREV_HOWL(ah))
+ OS_DELAY(10000);
+ else
+ OS_DELAY(100);
/*
* Clear resets and force wakeup
Modified: projects/largeSMP/sys/dev/ath/ath_hal/ar5416/ar5416reg.h
==============================================================================
--- projects/largeSMP/sys/dev/ath/ath_hal/ar5416/ar5416reg.h Thu May 5 13:55:43 2011 (r221494)
+++ projects/largeSMP/sys/dev/ath/ath_hal/ar5416/ar5416reg.h Thu May 5 14:05:29 2011 (r221495)
@@ -199,6 +199,12 @@
#define AR_RXCFG_DMASZ_512B 7
/* MAC Led registers */
+#define AR_CFG_SCLK_RATE_IND 0x00000003 /* sleep clock indication */
+#define AR_CFG_SCLK_RATE_IND_S 0
+#define AR_CFG_SCLK_32MHZ 0x00000000 /* Sleep clock rate */
+#define AR_CFG_SCLK_4MHZ 0x00000001 /* Sleep clock rate */
+#define AR_CFG_SCLK_1MHZ 0x00000002 /* Sleep clock rate */
+#define AR_CFG_SCLK_32KHZ 0x00000003 /* Sleep clock rate */
#define AR_MAC_LED_BLINK_SLOW 0x00000008 /* LED slowest blink rate mode */
#define AR_MAC_LED_BLINK_THRESH_SEL 0x00000070 /* LED blink threshold select */
#define AR_MAC_LED_MODE 0x00000380 /* LED mode select */
@@ -619,56 +625,83 @@
#define AR_XSREV_REVISION_KITE_11 1 /* Kite 1.1 */
#define AR_XSREV_REVISION_KITE_12 2 /* Kite 1.2 */
+/* Owl (AR5416) */
#define AR_SREV_OWL(_ah) \
((AH_PRIVATE((_ah))->ah_macVersion == AR_XSREV_VERSION_OWL_PCI) || \
(AH_PRIVATE((_ah))->ah_macVersion == AR_XSREV_VERSION_OWL_PCIE))
#define AR_SREV_OWL_20_OR_LATER(_ah) \
- ((AR_SREV_OWL(_ah) && AH_PRIVATE((_ah))->ah_macRev >= AR_XSREV_REVISION_OWL_20) || \
- AH_PRIVATE((_ah))->ah_macVersion >= AR_XSREV_VERSION_HOWL)
+ ((AR_SREV_OWL(_ah) && \
+ AH_PRIVATE((_ah))->ah_macRev >= AR_XSREV_REVISION_OWL_20) || \
+ AH_PRIVATE((_ah))->ah_macVersion >= AR_XSREV_VERSION_HOWL)
+
#define AR_SREV_OWL_22_OR_LATER(_ah) \
- ((AR_SREV_OWL(_ah) && AH_PRIVATE((_ah))->ah_macRev >= AR_XSREV_REVISION_OWL_22) || \
- AH_PRIVATE((_ah))->ah_macVersion >= AR_XSREV_VERSION_HOWL)
+ ((AR_SREV_OWL(_ah) && \
+ AH_PRIVATE((_ah))->ah_macRev >= AR_XSREV_REVISION_OWL_22) || \
+ AH_PRIVATE((_ah))->ah_macVersion >= AR_XSREV_VERSION_HOWL)
+
+/* Howl (AR9130) */
#define AR_SREV_HOWL(_ah) \
(AH_PRIVATE((_ah))->ah_macVersion == AR_XSREV_VERSION_HOWL)
+
#define AR_SREV_9100(_ah) AR_SREV_HOWL(_ah)
+/* Sowl (AR9160) */
+
#define AR_SREV_SOWL(_ah) \
(AH_PRIVATE((_ah))->ah_macVersion == AR_XSREV_VERSION_SOWL)
+
#define AR_SREV_SOWL_10_OR_LATER(_ah) \
(AH_PRIVATE((_ah))->ah_macVersion >= AR_XSREV_VERSION_SOWL)
+
#define AR_SREV_SOWL_11(_ah) \
(AR_SREV_SOWL(_ah) && \
AH_PRIVATE((_ah))->ah_macRev == AR_XSREV_REVISION_SOWL_11)
+/* Merlin (AR9280) */
+
#define AR_SREV_MERLIN(_ah) \
(AH_PRIVATE((_ah))->ah_macVersion == AR_XSREV_VERSION_MERLIN)
+
#define AR_SREV_MERLIN_10_OR_LATER(_ah) \
(AH_PRIVATE((_ah))->ah_macVersion >= AR_XSREV_VERSION_MERLIN)
+
#define AR_SREV_MERLIN_20(_ah) \
(AR_SREV_MERLIN(_ah) && \
AH_PRIVATE((_ah))->ah_macRev == AR_XSREV_REVISION_MERLIN_20)
+
#define AR_SREV_MERLIN_20_OR_LATER(_ah) \
- (AR_SREV_MERLIN_20(_ah) || \
- AH_PRIVATE((_ah))->ah_macVersion >= AR_XSREV_VERSION_MERLIN)
+ ((AH_PRIVATE((_ah))->ah_macVersion > AR_XSREV_VERSION_MERLIN) || \
+ (AR_SREV_MERLIN((_ah)) && \
+ AH_PRIVATE((_ah))->ah_macRev >= AR_XSREV_REVISION_MERLIN_20))
+
+/* Kite (AR9285) */
#define AR_SREV_KITE(_ah) \
(AH_PRIVATE((_ah))->ah_macVersion == AR_XSREV_VERSION_KITE)
+
#define AR_SREV_KITE_10_OR_LATER(_ah) \
(AH_PRIVATE((_ah))->ah_macVersion >= AR_XSREV_VERSION_KITE)
+
#define AR_SREV_KITE_11(_ah) \
(AR_SREV_KITE(ah) && \
AH_PRIVATE((_ah))->ah_macRev == AR_XSREV_REVISION_KITE_11)
+
#define AR_SREV_KITE_11_OR_LATER(_ah) \
- (AR_SREV_KITE_11(_ah) || \
- AH_PRIVATE((_ah))->ah_macRev >= AR_XSREV_REVISION_KITE_11)
+ ((AH_PRIVATE((_ah))->ah_macVersion > AR_XSREV_VERSION_KITE) || \
+ (AR_SREV_KITE((_ah)) && \
+ AH_PRIVATE((_ah))->ah_macRev >= AR_XSREV_REVISION_KITE_11))
+
#define AR_SREV_KITE_12(_ah) \
(AR_SREV_KITE(ah) && \
AH_PRIVATE((_ah))->ah_macRev == AR_XSREV_REVISION_KITE_12)
+
#define AR_SREV_KITE_12_OR_LATER(_ah) \
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-src-projects
mailing list