sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arch/z80/src/ez80/ez80_i2c.c: Cosmetic changes from code review. Also makes I2C and SPI configurable options.

Browse Source
This commit is contained in:
Gregory Nutt 2019-06-04 06:49:45 -06:00
parent 6fbfd00396
commit 4a7f0166cf
3 changed files with 141 additions and 118 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/z80/src/ez80/Kconfig
View File

@ -22,6 +22,14 @@ config EZ80_UART2
select UART2_SERIALDRIVER
default n
config EZ80_I2C
bool "I2C"
default n
config EZ80_SPI
bool "SPI"
default n
config EZ80_EMAC
bool "Ethernet MAC"
default n

10
arch/z80/src/ez80/Make.defs
View File

@ -53,10 +53,14 @@ endif
CHIP_SSRCS =
CHIP_CSRCS = ez80_clock.c ez80_initialstate.c ez80_irq.c ez80_copystate.c
CHIP_CSRCS += ez80_schedulesigaction.c ez80_sigdeliver.c ez80_lowuart.c
CHIP_CSRCS += ez80_serial.c ez80_spi.c ez80_i2c.c ez80_registerdump.c
CHIP_CSRCS += ez80_serial.c ez80_registerdump.c
ifneq ($(CONFIG_SCHED_TICKLESS),y)
CHIP_CSRCS += ez80_timerisr.c
ifneq ($(CONFIG_EZ80_I2C),y)
CHIP_CSRCS += ez80_i2c.c
endif
ifneq ($(CONFIG_EZ80_SPI),y)
CHIP_CSRCS += ez80_spi.c
endif
ifeq ($(CONFIG_ARCH_CHIP_EZ80F91),y)

71
arch/z80/src/ez80/ez80_i2c.c
View File

@ -208,8 +208,8 @@ static uint16_t ez80_i2c_getccr(uint32_t fscl)
* fscl = sysclock / 10 / (M + 1) / 2**N
* = fsamp / 10 / (M + 1)
*
* The fsmp must be >= 10 * fscl. The best solution is the smallest value of
* N so that the sampling rate is the highest subject to:
* The fsmp must be >= 10 * fscl. The best solution is the smallest value
* of N so that the sampling rate is the highest subject to:
*
* The minimum value of the fsamp is given by:
*/
@ -291,9 +291,10 @@ static uint16_t ez80_i2c_getccr(uint32_t fscl)
* Name: ez80_i2c_waitiflg
*
* Description:
* In polled mode, we have to spin until the IFLG bit in the xxx register
* goes to 1, signalling that the last send or receive is complete. This
* could be used to generate an interrupt for a non-polled driver.
* In polled mode, we have to spin until the IFLG bit in the I2C_CTL
* register goes to 1, signaling that the last send or receive is
* complete. This could be used to generate an interrupt for a non-
* polled driver.
*
* Input Parameters:
* priv - Device-specific state data
@ -410,7 +411,7 @@ static int ez80_i2c_sendaddr(struct ez80_i2cdev_s *priv, uint8_t readbit)
{
/* This error should never occur */
_err("ERROR: Bad START status: %02x\n", sr);
i2cerr("ERROR: Bad START status: %02x\n", sr);
ez80_i2c_clriflg();
return -EIO;
}
@ -432,7 +433,7 @@ static int ez80_i2c_sendaddr(struct ez80_i2cdev_s *priv, uint8_t readbit)
sr = ez80_i2c_waitiflg();
if (sr != I2C_SR_MADDRWRACK && sr != I2C_SR_MADDRWR)
{
_err("ERROR: Bad ADDR8 status: %02x\n", sr);
i2cerr("ERROR: Bad ADDR8 status: %02x\n", sr);
goto failure;
}
}
@ -451,7 +452,7 @@ static int ez80_i2c_sendaddr(struct ez80_i2cdev_s *priv, uint8_t readbit)
sr = ez80_i2c_waitiflg();
if (sr != I2C_SR_MADDRWRACK && sr != I2C_SR_MADDRWR)
{
_err("ERROR: Bad ADDR10H status: %02x\n", sr);
i2cerr("ERROR: Bad ADDR10H status: %02x\n", sr);
goto failure;
}
@ -465,7 +466,7 @@ static int ez80_i2c_sendaddr(struct ez80_i2cdev_s *priv, uint8_t readbit)
sr = ez80_i2c_waitiflg();
if (sr != I2C_SR_MADDR2WRACK && sr != I2C_SR_MADDR2WR)
{
_err("ERROR: Bad ADDR10L status: %02x\n", sr);
i2cerr("ERROR: Bad ADDR10L status: %02x\n", sr);
goto failure;
}
}
@ -480,17 +481,18 @@ failure:
{
case I2C_SR_ARBLOST1: /* Arbitration lost in address or data byte */
case I2C_SR_ARBLOST2: /* Arbitration lost in address as master, slave
* address and Write bit received, ACK transmitted */
* address and Write bit received, ACK
* transmitted */
case I2C_SR_ARBLOST3: /* Arbitration lost in address as master, General
* Call address received, ACK transmitted */
case I2C_SR_ARBLOST4: /* Arbitration lost in address as master, slave
* address and Read bit received, ACK transmitted */
_err("ERROR: Arbitration lost: %02x\n", sr);
i2cerr("ERROR: Arbitration lost: %02x\n", sr);
ez80_i2c_clriflg();
return -EAGAIN;
default:
_err("ERROR: Unexpected status: %02x\n", sr);
i2cerr("ERROR: Unexpected status: %02x\n", sr);
ez80_i2c_clriflg();
return -EIO;
}
@ -511,7 +513,8 @@ failure:
*
* Input Parameters:
* dev - Device-specific state data
* buffer - A pointer to a buffer of data to receive the data from the device
* buffer - A pointer to a buffer of data to receive the data from the
* device
* buflen - The requested number of bytes to be read
* flags - Determines is a START and/or STOP indication is needed.
*
@ -599,7 +602,9 @@ static int ez80_i2c_read_transfer(FAR struct ez80_i2cdev_s *priv,
if (regval == I2C_SR_MDATARDACK)
{
/* Since we just ACKed the incoming byte, it must NOT be the last */
/* Since we just ACKed the incoming byte, it must NOT be the
* last
*/
DEBUGASSERT(count > 1);
@ -622,7 +627,8 @@ static int ez80_i2c_read_transfer(FAR struct ez80_i2cdev_s *priv,
/* When all bytes are received and the NACK has been sent,
* then the microcontroller must write 1 to the STP bit in
* the I2C_CTL register. The I2C then transmits a STOP
* condition, clears the STP bit and returns to an idle state.
* condition, clears the STP bit and returns to an idle
* state.
*/
ez80_i2c_stop();
@ -640,7 +646,7 @@ static int ez80_i2c_read_transfer(FAR struct ez80_i2cdev_s *priv,
* this will cause the whole transfer to start over
*/
_err("ERROR: Arbitration lost: %02x\n", regval);
i2cerr("ERROR: Arbitration lost: %02x\n", regval);
ez80_i2c_clriflg();
break;
}
@ -649,9 +655,9 @@ static int ez80_i2c_read_transfer(FAR struct ez80_i2cdev_s *priv,
else
{
_err("ERROR: Unexpected status: %02x\n", regval);
i2cerr("ERROR: Unexpected status: %02x\n", regval);
ez80_i2c_clriflg();
return-EIO;
return -EIO;
}
}
}
@ -670,7 +676,8 @@ static int ez80_i2c_read_transfer(FAR struct ez80_i2cdev_s *priv,
*
* Input Parameters:
* dev - Device-specific state data
* buffer - A pointer to the read-only buffer of data to be written to device
* buffer - A pointer to the read-only buffer of data to be written to
* device
* buflen - The number of bytes to send from the buffer
* flags - Determines is a START and/or STOP indication is needed.
*
@ -725,8 +732,8 @@ static int ez80_i2c_write_transfer(FAR struct ez80_i2cdev_s *priv,
ptr = buffer;
for (count = buflen; count; count--)
{
/* Load the I2C_DR with next data byte and clear the IFLG. Clearing
* the IFLAG will cause the data to be transferred.
/* Load the I2C_DR with next data byte and clear the IFLG.
* Clearing the IFLAG will cause the data to be transferred.
*/
outp(EZ80_I2C_DR, *ptr++);
@ -737,7 +744,7 @@ static int ez80_i2c_write_transfer(FAR struct ez80_i2cdev_s *priv,
sr = ez80_i2c_waitiflg();
if (sr != I2C_SR_MDATAWRACK && sr != I2C_SR_MDATAWR)
{
_err("ERROR: Bad DATA status: %02x\n", sr);
i2cerr("ERROR: Bad DATA status: %02x\n", sr);
ez80_i2c_clriflg();
if (sr == I2C_SR_ARBLOST1)
{
@ -879,7 +886,8 @@ static int ez80_i2c_transfer(FAR struct i2c_master_s *dev,
next = &msgs[i + 1];
if ((msg->flags & I2C_M_NOSTART) != 0 &&
(msg->flags & (I2C_M_READ | I2C_M_TEN)) == (next->flags & (I2C_M_READ | I2C_M_TEN)) &&
(msg->flags & (I2C_M_READ | I2C_M_TEN)) ==
(next->flags & (I2C_M_READ | I2C_M_TEN)) &&
msg->addr == next->addr)
{
nostop = true;
@ -891,11 +899,13 @@ static int ez80_i2c_transfer(FAR struct i2c_master_s *dev,
flags |= (nostop) ? EZ80_NOSTOP : 0;
if ((msg->flags & I2C_M_READ) != 0)
{
ret = ez80_i2c_read_transfer(priv, msg->buffer, msg->length, flags);
ret = ez80_i2c_read_transfer(priv, msg->buffer, msg->length,
flags);
}
else
{
ret = ez80_i2c_write_transfer(priv, msg->buffer, msg->length, flags);
ret = ez80_i2c_write_transfer(priv, msg->buffer, msg->length,
flags);
}
/* Check for I2C transfer errors */
@ -930,10 +940,10 @@ static int ez80_i2c_transfer(FAR struct i2c_master_s *dev,
* different frequency and slave address.
*
* Input Parameters:
* Port number (for hardware that has mutiple I2C interfaces)
* Port number (for hardware that has multiple I2C interfaces)
*
* Returned Value:
* Valid I2C device structre reference on succcess; a NULL on failure
* Valid I2C device structure reference on success; a NULL on failure
*
****************************************************************************/
@ -947,7 +957,7 @@ FAR struct i2c_master_s *ez80_i2cbus_initialize(int port)
{
/* Set up some initial BRG value */
ccr = ez80_i2c_getccr(100*1000);
ccr = ez80_i2c_getccr(100 * 1000);
ez80_i2c_setccr(ccr);
/* No GPIO setup is required -- I2C pints, SCL/SDA are not multiplexed */
@ -965,8 +975,9 @@ FAR struct i2c_master_s *ez80_i2cbus_initialize(int port)
/* Now, allocate an I2C instance for this caller */
i2c = (FAR struct ez80_i2cdev_s *)kmm_zalloc(sizeof(FAR struct ez80_i2cdev_s));
if (i2c)
i2c = (FAR struct ez80_i2cdev_s *)
kmm_zalloc(sizeof(FAR struct ez80_i2cdev_s));
if (i2c != NULL)
{
/* Initialize the allocated instance */