minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-16 07:27:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move coloured led API to status_led.h

Browse Source 
Improve indentation in drivers/at45.c
This commit is contained in:
Peter Pearse 2007-09-18 13:07:54 +01:00
parent afd477b227
commit bd86220f58
4 changed files with 114 additions and 134 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cpu/arm920t/start.S
View File

@ -27,7 +27,7 @@
#include <config.h> #include <config.h>
#include <version.h> #include <version.h>
#include <asm/coloured_led.h> #include <status_led.h>
/* /*
************************************************************************* *************************************************************************

58
drivers/at45.c Executable file → Normal file
View File

@ -48,9 +48,8 @@ AT91S_DataFlashStatus AT91F_DataFlashSendCommand(AT91PS_DataFlash pDataFlash,
/* process the address to obtain page address and byte address */ /* process the address to obtain page address and byte address */
adr = ((DataflashAddress / (pDataFlash->pDevice->pages_size)) << adr = ((DataflashAddress / (pDataFlash->pDevice->pages_size)) <<
pDataFlash->pDevice->page_offset) + (DataflashAddress % pDataFlash->pDevice->page_offset) +
(pDataFlash->pDevice-> (DataflashAddress % (pDataFlash->pDevice->pages_size));
pages_size));
/* fill the command buffer */ /* fill the command buffer */
pDataFlash->pDataFlashDesc->command[0] = OpCode; pDataFlash->pDataFlashDesc->command[0] = OpCode;
@ -149,7 +148,8 @@ AT91S_DataFlashStatus AT91F_DataFlashWaitReady(AT91PS_DataflashDesc
/* : <sizeToRead> = data buffer size */ /* : <sizeToRead> = data buffer size */
/* Return value : State of the dataflash */ /* Return value : State of the dataflash */
/*--------------------------------------------------------------------------*/ /*--------------------------------------------------------------------------*/
AT91S_DataFlashStatus AT91F_DataFlashContinuousRead(AT91PS_DataFlash pDataFlash, AT91S_DataFlashStatus AT91F_DataFlashContinuousRead(
AT91PS_DataFlash pDataFlash,
int src, int src,
unsigned char *dataBuffer, unsigned char *dataBuffer,
int sizeToRead) int sizeToRead)
@ -166,8 +166,8 @@ AT91S_DataFlashStatus AT91F_DataFlashContinuousRead(AT91PS_DataFlash pDataFlash,
pDataFlash->pDataFlashDesc->tx_data_pt = dataBuffer; pDataFlash->pDataFlashDesc->tx_data_pt = dataBuffer;
pDataFlash->pDataFlashDesc->tx_data_size = sizeToRead; pDataFlash->pDataFlashDesc->tx_data_size = sizeToRead;
status = AT91F_DataFlashSendCommand status = AT91F_DataFlashSendCommand(
(pDataFlash, DB_CONTINUOUS_ARRAY_READ, 8, src); pDataFlash, DB_CONTINUOUS_ARRAY_READ, 8, src);
/* Send the command to the dataflash */ /* Send the command to the dataflash */
return (status); return (status);
} }
@ -196,8 +196,8 @@ AT91S_DataFlashStatus AT91F_DataFlashPagePgmBuf(AT91PS_DataFlash pDataFlash,
/* Send the command to the dataflash */ /* Send the command to the dataflash */
if (pDataFlash->pDevice->pages_number >= 16384) if (pDataFlash->pDevice->pages_number >= 16384)
cmdsize = 5; cmdsize = 5;
return (AT91F_DataFlashSendCommand(pDataFlash, DB_PAGE_PGM_BUF1, return (AT91F_DataFlashSendCommand(
cmdsize, dest)); pDataFlash, DB_PAGE_PGM_BUF1, cmdsize, dest));
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -208,7 +208,8 @@ AT91S_DataFlashStatus AT91F_DataFlashPagePgmBuf(AT91PS_DataFlash pDataFlash,
/* : */ /* : */
/* Return value : State of the dataflash */ /* Return value : State of the dataflash */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
AT91S_DataFlashStatus AT91F_MainMemoryToBufferTransfert(AT91PS_DataFlash AT91S_DataFlashStatus AT91F_MainMemoryToBufferTransfert(
AT91PS_DataFlash
pDataFlash, pDataFlash,
unsigned char unsigned char
BufferCommand, BufferCommand,
@ -216,8 +217,8 @@ AT91S_DataFlashStatus AT91F_MainMemoryToBufferTransfert(AT91PS_DataFlash
{ {
int cmdsize; int cmdsize;
/* Test if the buffer command is legal */ /* Test if the buffer command is legal */
if ((BufferCommand != DB_PAGE_2_BUF1_TRF) if ((BufferCommand != DB_PAGE_2_BUF1_TRF)&&
&& (BufferCommand != DB_PAGE_2_BUF2_TRF)) (BufferCommand != DB_PAGE_2_BUF2_TRF))
return DATAFLASH_BAD_COMMAND; return DATAFLASH_BAD_COMMAND;
/* no data to transmit or receive */ /* no data to transmit or receive */
@ -225,9 +226,9 @@ AT91S_DataFlashStatus AT91F_MainMemoryToBufferTransfert(AT91PS_DataFlash
cmdsize = 4; cmdsize = 4;
if (pDataFlash->pDevice->pages_number >= 16384) if (pDataFlash->pDevice->pages_number >= 16384)
cmdsize = 5; cmdsize = 5;
return (AT91F_DataFlashSendCommand(pDataFlash, BufferCommand, cmdsize, return (AT91F_DataFlashSendCommand(
page * pDataFlash, BufferCommand, cmdsize,
pDataFlash->pDevice->pages_size)); page * pDataFlash->pDevice->pages_size));
} }
/*-------------------------------------------------------------------------- */ /*-------------------------------------------------------------------------- */
@ -240,7 +241,8 @@ AT91S_DataFlashStatus AT91F_MainMemoryToBufferTransfert(AT91PS_DataFlash
/* : <SizeToWrite> = data buffer size */ /* : <SizeToWrite> = data buffer size */
/* Return value : State of the dataflash */ /* Return value : State of the dataflash */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
AT91S_DataFlashStatus AT91F_DataFlashWriteBuffer(AT91PS_DataFlash pDataFlash, AT91S_DataFlashStatus AT91F_DataFlashWriteBuffer(
AT91PS_DataFlash pDataFlash,
unsigned char BufferCommand, unsigned char BufferCommand,
unsigned char *dataBuffer, unsigned char *dataBuffer,
unsigned int bufferAddress, unsigned int bufferAddress,
@ -248,8 +250,8 @@ AT91S_DataFlashStatus AT91F_DataFlashWriteBuffer(AT91PS_DataFlash pDataFlash,
{ {
int cmdsize; int cmdsize;
/* Test if the buffer command is legal */ /* Test if the buffer command is legal */
if ((BufferCommand != DB_BUF1_WRITE) if ((BufferCommand != DB_BUF1_WRITE) &&
&& (BufferCommand != DB_BUF2_WRITE)) (BufferCommand != DB_BUF2_WRITE))
return DATAFLASH_BAD_COMMAND; return DATAFLASH_BAD_COMMAND;
/* buffer address must be lower than page size */ /* buffer address must be lower than page size */
@ -305,7 +307,8 @@ AT91S_DataFlashStatus AT91F_DataFlashWriteBuffer(AT91PS_DataFlash pDataFlash,
/* : */ /* : */
/* Return value : State of the dataflash */ /* Return value : State of the dataflash */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
AT91S_DataFlashStatus AT91F_PageErase(AT91PS_DataFlash pDataFlash, AT91S_DataFlashStatus AT91F_PageErase(
AT91PS_DataFlash pDataFlash,
unsigned int page) unsigned int page)
{ {
int cmdsize; int cmdsize;
@ -316,9 +319,9 @@ AT91S_DataFlashStatus AT91F_PageErase(AT91PS_DataFlash pDataFlash,
cmdsize = 4; cmdsize = 4;
if (pDataFlash->pDevice->pages_number >= 16384) if (pDataFlash->pDevice->pages_number >= 16384)
cmdsize = 5; cmdsize = 5;
return (AT91F_DataFlashSendCommand(pDataFlash, DB_PAGE_ERASE, cmdsize, return (AT91F_DataFlashSendCommand(pDataFlash,
page * DB_PAGE_ERASE, cmdsize,
pDataFlash->pDevice->pages_size)); page * pDataFlash->pDevice->pages_size));
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -329,7 +332,8 @@ AT91S_DataFlashStatus AT91F_PageErase(AT91PS_DataFlash pDataFlash,
/* : */ /* : */
/* Return value : State of the dataflash */ /* Return value : State of the dataflash */
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
AT91S_DataFlashStatus AT91F_BlockErase(AT91PS_DataFlash pDataFlash, AT91S_DataFlashStatus AT91F_BlockErase(
AT91PS_DataFlash pDataFlash,
unsigned int block) unsigned int block)
{ {
int cmdsize; int cmdsize;
@ -371,8 +375,8 @@ AT91S_DataFlashStatus AT91F_WriteBufferToMain(AT91PS_DataFlash pDataFlash,
if (pDataFlash->pDevice->pages_number >= 16384) if (pDataFlash->pDevice->pages_number >= 16384)
cmdsize = 5; cmdsize = 5;
/* Send the command to the dataflash */ /* Send the command to the dataflash */
return (AT91F_DataFlashSendCommand(pDataFlash, BufferCommand, cmdsize, return (AT91F_DataFlashSendCommand(pDataFlash, BufferCommand,
dest)); cmdsize, dest));
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
@ -441,9 +445,9 @@ AT91S_DataFlashStatus AT91F_DataFlashWrite(AT91PS_DataFlash pDataFlash,
/* If destination does not fit a page start address */ /* If destination does not fit a page start address */
if ((dest % ((unsigned int)(pDataFlash->pDevice->pages_size))) != 0) { if ((dest % ((unsigned int)(pDataFlash->pDevice->pages_size))) != 0) {
length = pDataFlash->pDevice->pages_size - length =
(dest % ((unsigned int) pDataFlash->pDevice->pages_size -
(pDataFlash->pDevice->pages_size))); (dest % ((unsigned int)(pDataFlash->pDevice->pages_size)));
if (size < length) if (size < length)
length = size; length = size;

45
include/asm-arm/coloured_led.h
View File

@ -1,45 +0,0 @@
/*
* (C) Copyright 2006
* Atmel Nordic AB <www.atmel.com>
* Ulf Samuelsson <ulf@atmel.com>
*
* See file CREDITS for list of people who contributed to this
* project.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA
*/
#ifndef __LED_H
#define __LED_H
#ifndef __ASSEMBLY__
extern void coloured_LED_init (void);
extern void red_LED_on(void);
extern void red_LED_off(void);
extern void green_LED_on(void);
extern void green_LED_off(void);
extern void yellow_LED_on(void);
extern void yellow_LED_off(void);
#else
.extern LED_init
.extern red_LED_on
.extern red_LED_off
.extern yellow_LED_on
.extern yellow_LED_off
.extern green_LED_on
.extern green_LED_off
#endif
#endif

21
include/status_led.h
View File

@ -383,6 +383,27 @@ extern void __led_set (led_id_t mask, int state);
# include <asm/status_led.h> # include <asm/status_led.h>
#endif #endif
/*
* Coloured LEDs API
*/
#ifndef __ASSEMBLY__
extern void coloured_LED_init (void);
extern void red_LED_on(void);
extern void red_LED_off(void);
extern void green_LED_on(void);
extern void green_LED_off(void);
extern void yellow_LED_on(void);
extern void yellow_LED_off(void);
#else
.extern LED_init
.extern red_LED_on
.extern red_LED_off
.extern yellow_LED_on
.extern yellow_LED_off
.extern green_LED_on
.extern green_LED_off
#endif
#endif /* CONFIG_STATUS_LED */ #endif /* CONFIG_STATUS_LED */
#endif /* _STATUS_LED_H_ */ #endif /* _STATUS_LED_H_ */