From owner-p4-projects@FreeBSD.ORG  Fri Feb 15 20:05:17 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id E2245C74; Fri, 15 Feb 2013 20:05:16 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id A62B2C72
 for <perforce@freebsd.org>; Fri, 15 Feb 2013 20:05:16 +0000 (UTC)
 (envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 8CBDE1B0
 for <perforce@freebsd.org>; Fri, 15 Feb 2013 20:05:16 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.6/8.14.6) with ESMTP id r1FK5Gus063582
 for <perforce@freebsd.org>; Fri, 15 Feb 2013 20:05:16 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.6/8.14.6/Submit) id r1FK5GOh063579
 for perforce@freebsd.org; Fri, 15 Feb 2013 20:05:16 GMT
 (envelope-from brooks@freebsd.org)
Date: Fri, 15 Feb 2013 20:05:16 GMT
Message-Id: <201302152005.r1FK5GOh063579@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Subject: PERFORCE change 222076 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 15 Feb 2013 20:05:17 -0000

http://p4web.freebsd.org/@@222076?ac=10

Change 222076 by brooks@brooks_zenith on 2013/02/15 20:04:49

	Actually try to open /dev/cfi0 for read when /dev/isf0 isn't
	there.  Prefer /dev/cfi0 in error output since it is the future.

Affected files ...

.. //depot/projects/ctsrd/beribsd/src/ctsrd/atsectl/atsectl.c#4 edit

Differences ...

==== //depot/projects/ctsrd/beribsd/src/ctsrd/atsectl/atsectl.c#4 (text+ko) ====

@@ -100,11 +100,11 @@
 
 	fd = open(DEV_ISF0_PATH, O_RDONLY, 0);
 	if (fd == -1)
-		fd = open(DEV_ISF0_PATH, O_RDONLY, 0);
+		fd = open(DEV_CFI0_PATH, O_RDONLY, 0);
 	else
 		fdev = ISF;
 	if (fd == -1)
-		errx(1, "Failed to open " DEV_ISF0_PATH);
+		errx(1, "Failed to open " DEV_CFI0_PATH);
 	else
 		fdev = CFI;
 
@@ -148,7 +148,7 @@
 	if (fd == -1)
 		fd = open(DEV_CFI0_PATH, O_WRONLY, 0);
 	if (fd == -1)
-		errx(1, "Failed to open " DEV_ISF0_PATH);
+		errx(1, "Failed to open " DEV_CFI0_PATH);
 
 	if (write(fd, block, sizeof(block)) != ISF_ERASE_BLOCK)
 		errx(1, "Short write on %s", fdevs[fdev]);