From owner-p4-projects@FreeBSD.ORG  Fri Apr 21 22:13:10 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id B549116A407; Fri, 21 Apr 2006 22:13:10 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 8CF7516A405
	for <perforce@freebsd.org>; Fri, 21 Apr 2006 22:13:10 +0000 (UTC)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 3E39343D45
	for <perforce@freebsd.org>; Fri, 21 Apr 2006 22:13:10 +0000 (GMT)
	(envelope-from imp@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k3LMDAqk027363
	for <perforce@freebsd.org>; Fri, 21 Apr 2006 22:13:10 GMT
	(envelope-from imp@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k3LMDAgc027355
	for perforce@freebsd.org; Fri, 21 Apr 2006 22:13:10 GMT
	(envelope-from imp@freebsd.org)
Date: Fri, 21 Apr 2006 22:13:10 GMT
Message-Id: <200604212213.k3LMDAgc027355@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	imp@freebsd.org using -f
From: Warner Losh <imp@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 95837 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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, 21 Apr 2006 22:13:10 -0000

http://perforce.freebsd.org/chv.cgi?CH=95837

Change 95837 by imp@imp_hammer on 2006/04/21 22:12:16

	Fix interface.

Affected files ...

.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/spi_flash.c#3 edit
.. //depot/projects/arm/src/sys/boot/arm/at91/libat91/spi_flash.h#3 edit

Differences ...

==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/spi_flash.c#3 (text+ko) ====

@@ -117,7 +117,7 @@
  */
 static void
 ProgramBuffer(unsigned pageAddress, unsigned byteAddress,
-    unsigned src_addr, unsigned size)
+    char *src_addr, unsigned size)
 {
 
 	p_memset(tx_commandBuffer, 0, 8);
@@ -135,9 +135,9 @@
 	spi_command.tx_cmd_size = 4;
 
 	spi_command.tx_data_size = size;
-	spi_command.tx_data = (char*)src_addr;
+	spi_command.tx_data = src_addr;
 	spi_command.rx_data_size = size;
-	spi_command.rx_data = (char*)src_addr;
+	spi_command.rx_data = src_addr;
 
 	SendCommand(&spi_command);
 
@@ -156,7 +156,7 @@
  * .KB_C_FN_DEFINITION_END
  */
 void
-SPI_ReadFlash(unsigned flash_addr, unsigned dest_addr, unsigned size)
+SPI_ReadFlash(unsigned flash_addr, char *dest_addr, unsigned size)
 {
 	unsigned	pageAddress, byteAddress;
 
@@ -180,9 +180,9 @@
 	spi_command.tx_cmd_size = 8;
 
 	spi_command.tx_data_size = size;
-	spi_command.tx_data = (char*)dest_addr;
+	spi_command.tx_data = dest_addr;
 	spi_command.rx_data_size = size;
-	spi_command.rx_data = (char*)dest_addr;
+	spi_command.rx_data = dest_addr;
 
 	SendCommand(&spi_command);
 }
@@ -197,7 +197,7 @@
  * .KB_C_FN_DEFINITION_END
  */
 void
-SPI_WriteFlash(unsigned flash_addr, unsigned src_addr, unsigned size)
+SPI_WriteFlash(unsigned flash_addr, char *src_addr, unsigned size)
 {
 	unsigned	pageAddress, byteAddress, this_size;
 

==== //depot/projects/arm/src/sys/boot/arm/at91/libat91/spi_flash.h#3 (text+ko) ====

@@ -32,8 +32,8 @@
 	unsigned	rx_data_size;
 } spiCommand_t;
 
-void SPI_ReadFlash(unsigned flash_addr, unsigned dest_addr, unsigned size);
-void SPI_WriteFlash(unsigned flash_addr, unsigned dest_addr, unsigned size);
+void SPI_ReadFlash(unsigned flash_addr, char *dest_addr, unsigned size);
+void SPI_WriteFlash(unsigned flash_addr, char *dest_addr, unsigned size);
 void SPI_InitFlash(void);
 
 #define FLASH_PAGE_SIZE	1056