mirror of
https://xff.cz/git/u-boot/
synced 2025-09-01 08:42:12 +02:00
spi: mpc8xxx: Rename camel-case variables
There are three variables that have camel-case names, which is not the preferred naming style. Give those variables more compliant names instead. Signed-off-by: Mario Six <mario.six@gdsys.cc> Acked-by: Jagan Teki <jagan@amarulasolutions.com>
This commit is contained in:
@@ -77,9 +77,9 @@ int spi_xfer(struct spi_slave *slave, uint bitlen, const void *dout, void *din,
|
|||||||
{
|
{
|
||||||
volatile spi8xxx_t *spi = &((immap_t *) (CONFIG_SYS_IMMR))->spi;
|
volatile spi8xxx_t *spi = &((immap_t *) (CONFIG_SYS_IMMR))->spi;
|
||||||
uint tmpdout, tmpdin, event;
|
uint tmpdout, tmpdin, event;
|
||||||
int numBlks = DIV_ROUND_UP(bitlen, 32);
|
int num_blks = DIV_ROUND_UP(bitlen, 32);
|
||||||
int tm, isRead = 0;
|
int tm, is_read = 0;
|
||||||
uchar charSize = 32;
|
uchar char_size = 32;
|
||||||
|
|
||||||
debug("spi_xfer: slave %u:%u dout %08X din %08X bitlen %u\n",
|
debug("spi_xfer: slave %u:%u dout %08X din %08X bitlen %u\n",
|
||||||
slave->bus, slave->cs, *(uint *) dout, *(uint *) din, bitlen);
|
slave->bus, slave->cs, *(uint *) dout, *(uint *) din, bitlen);
|
||||||
@@ -91,12 +91,12 @@ int spi_xfer(struct spi_slave *slave, uint bitlen, const void *dout, void *din,
|
|||||||
spi->event = 0xffffffff;
|
spi->event = 0xffffffff;
|
||||||
|
|
||||||
/* Handle data in 32-bit chunks */
|
/* Handle data in 32-bit chunks */
|
||||||
while (numBlks--) {
|
while (num_blks--) {
|
||||||
tmpdout = 0;
|
tmpdout = 0;
|
||||||
charSize = (bitlen >= 32 ? 32 : bitlen);
|
char_size = (bitlen >= 32 ? 32 : bitlen);
|
||||||
|
|
||||||
/* Shift data so it's msb-justified */
|
/* Shift data so it's msb-justified */
|
||||||
tmpdout = *(u32 *) dout >> (32 - charSize);
|
tmpdout = *(u32 *) dout >> (32 - char_size);
|
||||||
|
|
||||||
/* The LEN field of the SPMODE register is set as follows:
|
/* The LEN field of the SPMODE register is set as follows:
|
||||||
*
|
*
|
||||||
@@ -134,15 +134,15 @@ int spi_xfer(struct spi_slave *slave, uint bitlen, const void *dout, void *din,
|
|||||||
* or time out (1 second = 1000 ms)
|
* or time out (1 second = 1000 ms)
|
||||||
* The NE event must be read and cleared first
|
* The NE event must be read and cleared first
|
||||||
*/
|
*/
|
||||||
for (tm = 0, isRead = 0; tm < SPI_TIMEOUT; ++tm) {
|
for (tm = 0, is_read = 0; tm < SPI_TIMEOUT; ++tm) {
|
||||||
event = spi->event;
|
event = spi->event;
|
||||||
if (event & SPI_EV_NE) {
|
if (event & SPI_EV_NE) {
|
||||||
tmpdin = spi->rx;
|
tmpdin = spi->rx;
|
||||||
spi->event |= SPI_EV_NE;
|
spi->event |= SPI_EV_NE;
|
||||||
isRead = 1;
|
is_read = 1;
|
||||||
|
|
||||||
*(u32 *) din = (tmpdin << (32 - charSize));
|
*(u32 *) din = (tmpdin << (32 - char_size));
|
||||||
if (charSize == 32) {
|
if (char_size == 32) {
|
||||||
/* Advance output buffer by 32 bits */
|
/* Advance output buffer by 32 bits */
|
||||||
din += 4;
|
din += 4;
|
||||||
}
|
}
|
||||||
@@ -153,7 +153,7 @@ int spi_xfer(struct spi_slave *slave, uint bitlen, const void *dout, void *din,
|
|||||||
* in the future put an arbitrary delay after writing
|
* in the future put an arbitrary delay after writing
|
||||||
* the device. Arbitrary delays suck, though...
|
* the device. Arbitrary delays suck, though...
|
||||||
*/
|
*/
|
||||||
if (isRead && (event & SPI_EV_NF))
|
if (is_read && (event & SPI_EV_NF))
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (tm >= SPI_TIMEOUT)
|
if (tm >= SPI_TIMEOUT)
|
||||||
|
Reference in New Issue
Block a user