PERFORCE change 32110 for review
Peter Wemm
peter at FreeBSD.org
Fri May 30 12:05:27 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=32110
Change 32110 by peter at peter_daintree on 2003/05/30 12:05:17
IFC @32109
Affected files ...
.. //depot/projects/hammer/lib/libc/db/btree/bt_put.c#3 integrate
.. //depot/projects/hammer/lib/libc/gen/dlfcn.c#4 integrate
.. //depot/projects/hammer/lib/libpthread/thread/thr_sig.c#10 integrate
.. //depot/projects/hammer/libexec/rtld-elf/libmap.c#6 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#24 integrate
.. //depot/projects/hammer/sys/amd64/include/acpica_machdep.h#1 branch
.. //depot/projects/hammer/sys/boot/forth/beastie.4th#1 branch
.. //depot/projects/hammer/sys/boot/forth/frames.4th#1 branch
.. //depot/projects/hammer/sys/boot/forth/screen.4th#1 branch
.. //depot/projects/hammer/sys/boot/i386/loader/Makefile#4 integrate
.. //depot/projects/hammer/sys/dev/aac/aac_pci.c#5 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.c#8 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.h#7 integrate
.. //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.reg#8 integrate
.. //depot/projects/hammer/sys/nfsclient/nfs_lock.c#8 integrate
.. //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#13 integrate
Differences ...
==== //depot/projects/hammer/lib/libc/db/btree/bt_put.c#3 (text+ko) ====
@@ -38,7 +38,7 @@
static char sccsid[] = "@(#)bt_put.c 8.8 (Berkeley) 7/26/94";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_put.c,v 1.3 2003/02/16 17:29:09 nectar Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/db/btree/bt_put.c,v 1.4 2003/05/30 11:05:08 tmm Exp $");
#include <sys/types.h>
@@ -78,7 +78,7 @@
PAGE *h;
indx_t index, nxtindex;
pgno_t pg;
- u_int32_t nbytes;
+ u_int32_t nbytes, tmp;
int dflags, exact, status;
char *dest, db[NOVFLSIZE], kb[NOVFLSIZE];
@@ -131,8 +131,9 @@
tkey.data = kb;
tkey.size = NOVFLSIZE;
memmove(kb, &pg, sizeof(pgno_t));
+ tmp = key->size;
memmove(kb + sizeof(pgno_t),
- &key->size, sizeof(u_int32_t));
+ &tmp, sizeof(u_int32_t));
dflags |= P_BIGKEY;
key = &tkey;
}
@@ -142,8 +143,9 @@
tdata.data = db;
tdata.size = NOVFLSIZE;
memmove(db, &pg, sizeof(pgno_t));
+ tmp = data->size;
memmove(db + sizeof(pgno_t),
- &data->size, sizeof(u_int32_t));
+ &tmp, sizeof(u_int32_t));
dflags |= P_BIGDATA;
data = &tdata;
}
==== //depot/projects/hammer/lib/libc/gen/dlfcn.c#4 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/dlfcn.c,v 1.10 2003/02/13 17:47:44 kan Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/dlfcn.c,v 1.11 2003/05/30 00:58:37 kan Exp $");
/*
* Linkage to services provided by the dynamic linker.
@@ -111,3 +111,10 @@
_rtld_error(sorry);
return NULL;
}
+
+#pragma weak _rtld_thread_init
+void
+_rtld_thread_init(void * li)
+{
+ _rtld_error(sorry);
+}
==== //depot/projects/hammer/lib/libpthread/thread/thr_sig.c#10 (text+ko) ====
@@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libpthread/thread/thr_sig.c,v 1.52 2003/05/29 17:10:45 deischen Exp $
+ * $FreeBSD: src/lib/libpthread/thread/thr_sig.c,v 1.53 2003/05/30 14:50:16 davidxu Exp $
*/
#include <sys/param.h>
#include <sys/types.h>
@@ -893,7 +893,8 @@
thr_sigframe_save(struct pthread *thread, struct pthread_sigframe *psf)
{
/* This has to initialize all members of the sigframe. */
- psf->psf_flags = thread->flags & THR_FLAGS_PRIVATE;
+ psf->psf_flags =
+ thread->flags & (THR_FLAGS_PRIVATE|THR_FLAGS_IN_TDLIST);
psf->psf_interrupted = thread->interrupted;
psf->psf_signo = thread->signo;
psf->psf_state = thread->state;
==== //depot/projects/hammer/libexec/rtld-elf/libmap.c#6 (text+ko) ====
@@ -1,5 +1,5 @@
/*
- * $FreeBSD: src/libexec/rtld-elf/libmap.c,v 1.5 2003/05/29 22:58:22 kan Exp $
+ * $FreeBSD: src/libexec/rtld-elf/libmap.c,v 1.6 2003/05/30 00:49:16 mdodd Exp $
*/
#include <stdio.h>
@@ -31,7 +31,7 @@
TAILQ_ENTRY(lmp) lmp_link;
};
-static void lm_add (char *, char *, char *);
+static void lm_add (const char *, const char *, const char *);
static void lm_free (struct lm_list *);
static char * lml_find (struct lm_list *, const char *);
static struct lm_list * lmp_find (const char *);
@@ -45,7 +45,7 @@
{
FILE *fp;
char *cp;
- char *f, *t, *p;
+ char *f, *t, *p, *c;
char prog[MAXPATHLEN];
char line[MAXPATHLEN + 2];
@@ -56,7 +56,7 @@
p = NULL;
while ((cp = fgets(line, MAXPATHLEN + 1, fp)) != NULL) {
- t = f = NULL;
+ t = f = c = NULL;
/* Skip over leading space */
while (isspace(*cp)) cp++;
@@ -75,7 +75,7 @@
if (iseol(*cp) || *cp == ']')
continue;
- p = cp++;
+ c = cp++;
/* Skip to end of word */
while (!isspace(*cp) && !iseol(*cp) && *cp != ']')
cp++;
@@ -93,10 +93,10 @@
* There should be nothing except whitespace or comment
from this point to the end of the line.
*/
- while(isspace(*cp++));
+ while(isspace(*cp)) *cp++;
if (!iseol(*cp)) continue;
- strcpy(prog, p);
+ strcpy(prog, c);
p = prog;
continue;
}
@@ -122,7 +122,7 @@
if (!iseol(*cp)) continue;
*cp = '\0';
- lm_add(p, xstrdup(f), xstrdup(t));
+ lm_add(p, f, t);
}
fclose(fp);
return;
@@ -159,7 +159,7 @@
}
static void
-lm_add (char *p, char *f, char *t)
+lm_add (const char *p, const char *f, const char *t)
{
struct lm_list *lml;
struct lm *lm;
@@ -171,8 +171,8 @@
lml = lmp_init(xstrdup(p));
lm = xmalloc(sizeof(struct lm));
- lm->f = f;
- lm->t = t;
+ lm->f = xstrdup(f);
+ lm->t = xstrdup(t);
TAILQ_INSERT_HEAD(lml, lm, lm_link);
}
@@ -189,7 +189,7 @@
* Add a global mapping if we have
* a successful constrained match.
*/
- lm_add(NULL, xstrdup(f), xstrdup(t));
+ lm_add(NULL, f, t);
return (t);
}
}
==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml#24 (text+ko) ====
@@ -31,7 +31,7 @@
<sect1 id="support">
<sect1info>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.156 2003/05/28 21:01:22 hrs Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/common/dev.sgml,v 1.157 2003/05/30 11:24:00 nyan Exp $</pubdate>
</sect1info>
<title>Supported Devices</title>
@@ -250,6 +250,58 @@
</itemizedlist>
</para>
+ <para arch="pc98">NEC PC-9801-55, 92 and their compatible C-Bus SCSI interfaces (ct driver)
+ <itemizedlist>
+ <listitem>
+ <para>NEC PC-9801-55, 92 and their compatibles</para>
+ <para>ICM IF-2660</para>
+ <para>Midori-Denshi MDC-554NA</para>
+ <para>Logitec LHA-N151</para>
+ <note>
+ <para><literal>flags 0x00000</literal> is necessary in
+ kernel configuration for DMA transfer mode.</para>
+ </note>
+ </listitem>
+ <listitem>
+ <para>I-O DATA SC-98II</para>
+ <note>
+ <para><literal>flags 0x10000</literal> is necessary in
+ kernel configuration for DMA transfer mode.</para>
+ </note>
+ </listitem>
+ <listitem>
+ <para>TEXA HA-55BS2 and later</para>
+ <para>Midori-Denshi MDC-926Rs</para>
+ <note>
+ <para><literal>flags 0x20000</literal> is necessary in
+ kernel configuration for Bus-master transfer mode.</para>
+ </note>
+ </listitem>
+ <listitem>
+ <para>ELECOM Bus-master SCSI interfaces</para>
+ <note>
+ <para><literal>flags 0x30000</literal> is necessary in
+ kernel configuration for Bus-master transfer mode.</para>
+ </note>
+ </listitem>
+ <listitem>
+ <para>All SMIT transfer type SCSI interfaces</para>
+ <note>
+ <para><literal>flags 0x40000</literal> is necessary in
+ kernel configuration for SMIT transfer mode.</para>
+ </note>
+ </listitem>
+ <listitem>
+ <para>Logitec LHA-20x series</para>
+ <para>ICM IF-2766, IF-2766ET, IF-2767 and IF-2769</para>
+ <note>
+ <para><literal>flags 0x50000</literal> is necessary in
+ kernel configuration for Bus-master transfer mode.</para>
+ </note>
+ </listitem>
+ </itemizedlist>
+ </para>
+
<para arch="pc98">NEC PC-9801-55, 92 and their compatible C-Bus SCSI interfaces (bs driver)
<itemizedlist>
<listitem>
==== //depot/projects/hammer/sys/boot/i386/loader/Makefile#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.63 2003/01/18 23:09:56 obrien Exp $
+# $FreeBSD: src/sys/boot/i386/loader/Makefile,v 1.64 2003/05/30 09:29:24 scottl Exp $
PROG= loader
STRIP=
@@ -102,6 +102,7 @@
.PATH: ${.CURDIR}/../../forth
FILES= ${PROG}.help loader.4th support.4th loader.conf
+FILES+= screen.4th frames.4th beastie.4th
FILESDIR_loader.conf= /boot/defaults
.if !exists(${DESTDIR}/boot/loader.rc)
==== //depot/projects/hammer/sys/dev/aac/aac_pci.c#5 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.33 2003/03/26 17:50:11 scottl Exp $
+ * $FreeBSD: src/sys/dev/aac/aac_pci.c,v 1.34 2003/05/30 09:22:19 scottl Exp $
*/
/*
@@ -126,6 +126,8 @@
AAC_FLAGS_256FIBS, "Dell PERC 320/DC"},
{0x9005, 0x0285, 0x9005, 0x0286, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB |
AAC_FLAGS_256FIBS, "Adaptec SCSI RAID 2120S"},
+ {0x9005, 0x0285, 0x9005, 0x0290, AAC_HWIF_I960RX, AAC_FLAGS_NO4GB,
+ "Adaptec SCSI RAID 2410SA"},
{0, 0, 0, 0, 0, 0, 0}
};
==== //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.c#8 (text+ko) ====
@@ -37,9 +37,9 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*
- * $Id: //depot/aic7xxx/aic7xxx/aic79xx.c#193 $
+ * $Id: aic79xx.c,v 1.16 2003/05/26 21:43:29 gibbs Exp $
*
- * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.c,v 1.16 2003/05/26 21:43:29 gibbs Exp $
+ * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.c,v 1.17 2003/05/30 02:15:15 scottl Exp $
*/
#ifdef __linux__
@@ -6174,7 +6174,7 @@
ahd_outb(ahd, LUNLEN,
sizeof(ahd->next_queued_hscb->pkt_long_lun) - 1);
} else {
- ahd_outb(ahd, LUNLEN, sizeof(ahd->next_queued_hscb->lun) - 1);
+ ahd_outb(ahd, LUNLEN, LUNLEN_SINGLE_LEVEL_LUN);
}
ahd_outb(ahd, CDBLIMIT, SCB_CDB_LEN_PTR - 1);
ahd_outb(ahd, MAXCMD, 0xFF);
==== //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.h#7 (text+ko) ====
@@ -37,9 +37,9 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*
- * $Id: //depot/aic7xxx/aic7xxx/aic79xx.h#90 $
+ * $Id: aic79xx.h,v 1.11 2003/05/26 21:10:58 gibbs Exp $
*
- * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.h,v 1.11 2003/05/26 21:10:58 gibbs Exp $
+ * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.h,v 1.12 2003/05/30 02:14:22 scottl Exp $
*/
#ifndef _AIC79XX_H_
@@ -494,21 +494,21 @@
* transfer.
*/
#define SG_PTR_MASK 0xFFFFFFF8
-/*16*/ uint64_t dataptr;
-/*24*/ uint32_t datacnt; /* Byte 3 is spare. */
-/*28*/ uint32_t sgptr;
-/*32*/ uint32_t hscb_busaddr;
-/*36*/ uint32_t next_hscb_busaddr;
-/*40*/ uint8_t control; /* See SCB_CONTROL in aic79xx.reg for details */
-/*41*/ uint8_t scsiid; /*
+/*16*/ uint16_t tag; /* Reused by Sequencer. */
+/*18*/ uint8_t control; /* See SCB_CONTROL in aic79xx.reg for details */
+/*19*/ uint8_t scsiid; /*
* Selection out Id
* Our Id (bits 0-3) Their ID (bits 4-7)
*/
-/*42*/ uint8_t lun;
-/*43*/ uint8_t task_attribute;
-/*44*/ uint8_t cdb_len;
-/*45*/ uint8_t task_management;
-/*46*/ uint16_t tag; /* Reused by Sequencer. */
+/*20*/ uint8_t lun;
+/*21*/ uint8_t task_attribute;
+/*22*/ uint8_t cdb_len;
+/*23*/ uint8_t task_management;
+/*24*/ uint64_t dataptr;
+/*32*/ uint32_t datacnt; /* Byte 3 is spare. */
+/*36*/ uint32_t sgptr;
+/*40*/ uint32_t hscb_busaddr;
+/*44*/ uint32_t next_hscb_busaddr;
/********** Long lun field only downloaded for full 8 byte lun support ********/
/*48*/ uint8_t pkt_long_lun[8];
/******* Fields below are not Downloaded (Sequencer may use for scratch) ******/
==== //depot/projects/hammer/sys/dev/aic7xxx/aic79xx.reg#8 (text+ko) ====
@@ -37,9 +37,9 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGES.
*
- * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.reg,v 1.13 2003/05/26 21:26:51 gibbs Exp $
+ * $FreeBSD: src/sys/dev/aic7xxx/aic79xx.reg,v 1.14 2003/05/30 02:14:22 scottl Exp $
*/
-VERSION = "$Id: //depot/aic7xxx/aic7xxx/aic79xx.reg#69 $"
+VERSION = "$Id: aic79xx.reg,v 1.13 2003/05/26 21:26:51 gibbs Exp $"
/*
* This file is processed by the aic7xxx_asm utility for use in assembling
@@ -1377,7 +1377,10 @@
address 0x030
access_mode RW
modes M_CFG
+ mask ILUNLEN 0x0F
+ mask TLUNLEN 0xF0
}
+const LUNLEN_SINGLE_LEVEL_LUN 0xF
/*
* CDB Limit
@@ -3797,34 +3800,10 @@
size 4
alias SCB_NEXT_COMPLETE
}
- SCB_DATAPTR {
- size 8
- }
- SCB_DATACNT {
- /*
- * The last byte is really the high address bits for
- * the data address.
- */
- size 4
- field SG_LAST_SEG 0x80 /* In the fourth byte */
- field SG_HIGH_ADDR_BITS 0x7F /* In the fourth byte */
- }
- SCB_SGPTR {
- size 4
- field SG_STATUS_VALID 0x04 /* In the first byte */
- field SG_FULL_RESID 0x02 /* In the first byte */
- field SG_LIST_NULL 0x01 /* In the first byte */
- }
- SCB_BUSADDR {
- size 4
- }
- SCB_NEXT {
- alias SCB_NEXT_SCB_BUSADDR
+ SCB_TAG {
+ alias SCB_FIFO_USE_COUNT
size 2
}
- SCB_NEXT2 {
- size 2
- }
SCB_CONTROL {
size 1
field TARGET_SCB 0x80
@@ -3859,8 +3838,32 @@
SCB_TASK_MANAGEMENT {
size 1
}
- SCB_TAG {
- alias SCB_FIFO_USE_COUNT
+ SCB_DATAPTR {
+ size 8
+ }
+ SCB_DATACNT {
+ /*
+ * The last byte is really the high address bits for
+ * the data address.
+ */
+ size 4
+ field SG_LAST_SEG 0x80 /* In the fourth byte */
+ field SG_HIGH_ADDR_BITS 0x7F /* In the fourth byte */
+ }
+ SCB_SGPTR {
+ size 4
+ field SG_STATUS_VALID 0x04 /* In the first byte */
+ field SG_FULL_RESID 0x02 /* In the first byte */
+ field SG_LIST_NULL 0x01 /* In the first byte */
+ }
+ SCB_BUSADDR {
+ size 4
+ }
+ SCB_NEXT {
+ alias SCB_NEXT_SCB_BUSADDR
+ size 2
+ }
+ SCB_NEXT2 {
size 2
}
SCB_SPARE {
==== //depot/projects/hammer/sys/nfsclient/nfs_lock.c#8 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_lock.c,v 1.35 2003/05/01 16:59:23 des Exp $");
+__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_lock.c,v 1.36 2003/05/30 17:15:56 rwatson Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -191,7 +191,7 @@
* on a local network). XXX Probably should use a back-off
* scheme.
*/
- error = tsleep(p->p_nlminfo, PCATCH | PUSER, "lockd", 20*hz);
+ error = tsleep(p->p_nlminfo, PUSER, "lockd", 20*hz);
if (error != 0) {
if (error == EWOULDBLOCK) {
/*
==== //depot/projects/hammer/sys/security/mac_mls/mac_mls.c#13 (text+ko) ====
@@ -31,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/security/mac_mls/mac_mls.c,v 1.46 2003/05/29 22:51:52 rwatson Exp $
+ * $FreeBSD: src/sys/security/mac_mls/mac_mls.c,v 1.47 2003/05/30 17:02:36 rwatson Exp $
*/
/*
@@ -672,14 +672,12 @@
static int
mac_mls_parse(struct mac_mls *mac_mls, char *string)
{
- char *range, *rangeend, *rangehigh, *rangelow, *single;
+ char *rangehigh, *rangelow, *single;
int error;
single = strsep(&string, "(");
- if (string == NULL) {
- string = single;
+ if (*single == '\0')
single = NULL;
- }
if (string != NULL) {
rangelow = strsep(&string, "-");
@@ -690,6 +688,9 @@
return (EINVAL);
if (*string != '\0')
return (EINVAL);
+ } else {
+ rangelow = NULL;
+ rangehigh = NULL;
}
KASSERT((rangelow != NULL && rangehigh != NULL) ||
More information about the p4-projects
mailing list