From owner-freebsd-current  Sun Aug 30 11:05:57 1998
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Received: (from majordom@localhost)
          by hub.freebsd.org (8.8.8/8.8.8) id LAA15180
          for freebsd-current-outgoing; Sun, 30 Aug 1998 11:05:57 -0700 (PDT)
          (envelope-from owner-freebsd-current@FreeBSD.ORG)
Received: from frmug.org (frmug-gw.frmug.org [193.56.58.252])
          by hub.freebsd.org (8.8.8/8.8.8) with ESMTP id LAA15145
          for <freebsd-current@FreeBSD.ORG>; Sun, 30 Aug 1998 11:05:51 -0700 (PDT)
          (envelope-from roberto@keltia.freenix.fr)
Received: (from uucp@localhost)
	by frmug.org (8.9.1/frmug-2.3/nospam) with UUCP id UAA05094
	for freebsd-current@FreeBSD.ORG; Sun, 30 Aug 1998 20:04:49 +0200 (CEST)
	(envelope-from roberto@keltia.freenix.fr)
Received: by keltia.freenix.fr (VMailer, from userid 101)
	id C51E01504; Sun, 30 Aug 1998 19:59:25 +0200 (CEST)
Date: Sun, 30 Aug 1998 19:59:25 +0200
From: Ollivier Robert <roberto@keltia.freenix.fr>
To: "FreeBSD Current Users' list" <freebsd-current@FreeBSD.ORG>
Subject: CAM & current
Message-ID: <19980830195925.A14308@keltia.freenix.fr>
Mail-Followup-To: FreeBSD Current Users' list <freebsd-current@FreeBSD.ORG>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Mailer: Mutt 0.94.4i
X-Operating-System: FreeBSD 3.0-CURRENT ctm#4602 AMD-K6 MMX @ 200 MHz
Sender: owner-freebsd-current@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.ORG

While trying to merge CAM & current (with the help of CVS), I tumbled on
this conflict and I don't know how to solve it. Most of the conflicts are
for $Id$ differences but this one in sys/pci/ncr.c is tricky:

line 3925 of sys/pci/ncr.c:

<<<<<<< ncr.c
        /*----------------------------------------------------
        **
        **  Build the identify / tag / sdtr message
        **
        **----------------------------------------------------
        */
        idmsg = MSG_IDENTIFYFLAG | ccb->ccb_h.target_lun;
        if (tp->usrdisc)
            idmsg |= MSG_IDENTIFY_DISCFLAG;

        msgptr = cp->scsi_smsg;
        msglen = 0;
        msgptr[msglen++] = idmsg;

        if (cp->tag) {
                msgptr[msglen++] = ccb->csio.tag_action;
            msgptr[msglen++] = cp->tag;
=======
    if ((unsigned)xp->datalen > 128*1024*1024) {
        PRINT_ADDR(xp);
        printf ("trying to transfer %8lx bytes, mem addr = %p\n",
            (u_long) xp->datalen, (void *) xp->data);
        {
            int j;
            PRINT_ADDR(xp);
            printf ("command: %2x (", cmd->opcode);
            for (j = 0; j<11; j++)
                printf (" %2x", cmd->bytes[j]);
            printf (")\n");
>>>>>>> 1.123

As I have indeed some ncr driven cards (SC-875 & SC-200), I'm worried...

Thanks,
-- 
Ollivier ROBERT -=- FreeBSD: The Power to Serve! -=- roberto@keltia.freenix.fr
FreeBSD keltia.freenix.fr 3.0-CURRENT #62: Mon Jul 27 20:47:08 CEST 1998


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message