ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Deleted not used variable. 

Deleted else if and using GPIO offset address.
Added GPIO out enable set/clear functions.
pull/1265/head
hjjeon0608 2015-07-28 11:19:08 +09:00
parent 641ecd065a
commit 20888331af
4 changed files with 37 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libraries/mbed/targets/cmsis/TARGET_WIZNET/TARGET_W7500x/W7500x_gpio.c
View File

@ -176,7 +176,7 @@ uint8_t HAL_GPIO_ReadInputDataBit(GPIO_TypeDef* GPIOx, uint16_t GPIO_Pin)
return bitstatus; return bitstatus;
} }
uint8_t HAL_GPIO_ReadInputData(GPIO_TypeDef* GPIOx, uint16_t GPIO_Pin) uint16_t HAL_GPIO_ReadInputData(GPIO_TypeDef* GPIOx)
{ {
assert_param(IS_GPIO_ALL_PERIPH(GPIOx)); assert_param(IS_GPIO_ALL_PERIPH(GPIOx));
return ((uint16_t)GPIOx->DATA); return ((uint16_t)GPIOx->DATA);
@ -286,3 +286,13 @@ void HAL_PAD_AFConfig(PAD_Type Px, uint16_t GPIO_Pin, PAD_AF_TypeDef P_AF)
} }
} }
void GPIO_OutEnClr(GPIO_TypeDef* GPIOx, uint16_t GPIO_Pin)
{
GPIOx->OUTENCLR = GPIO_Pin;
}
void GPIO_OutEnSet(GPIO_TypeDef* GPIOx, uint16_t GPIO_Pin)
{
GPIOx->OUTENSET = GPIO_Pin;
}

5
libraries/mbed/targets/cmsis/TARGET_WIZNET/TARGET_W7500x/W7500x_gpio.h
View File

@ -117,7 +117,7 @@ void HAL_GPIO_DeInit(GPIO_TypeDef* GPIOx);
void HAL_GPIO_Init(GPIO_TypeDef* GPIOx, GPIO_InitTypeDef* GPIO_InitStruct); void HAL_GPIO_Init(GPIO_TypeDef* GPIOx, GPIO_InitTypeDef* GPIO_InitStruct);
void HAL_GPIO_StructInit(GPIO_InitTypeDef* GPIO_InitStruct); void HAL_GPIO_StructInit(GPIO_InitTypeDef* GPIO_InitStruct);
uint8_t HAL_GPIO_ReadInputDataBit(GPIO_TypeDef* GPIOx, uint16_t GPIO_Pin); uint8_t HAL_GPIO_ReadInputDataBit(GPIO_TypeDef* GPIOx, uint16_t GPIO_Pin);
uint8_t HAL_GPIO_ReadInputData(GPIO_TypeDef* GPIOx, uint16_t GPIO_Pin); uint16_t HAL_GPIO_ReadInputData(GPIO_TypeDef* GPIOx);
uint8_t HAL_GPIO_ReadOutputDataBit(GPIO_TypeDef* GPIOx, uint16_t GPIO_Pin); uint8_t HAL_GPIO_ReadOutputDataBit(GPIO_TypeDef* GPIOx, uint16_t GPIO_Pin);
uint16_t HAL_GPIO_ReadOutputData(GPIO_TypeDef* GPIOx); uint16_t HAL_GPIO_ReadOutputData(GPIO_TypeDef* GPIOx);
void HAL_GPIO_SetBits(GPIO_TypeDef* GPIOx, uint16_t GPIO_Pin); void HAL_GPIO_SetBits(GPIO_TypeDef* GPIOx, uint16_t GPIO_Pin);
@ -126,6 +126,9 @@ void HAL_GPIO_WriteBit(GPIO_TypeDef* GPIOx, uint16_t GPIO_Pin, BitAction BitVal)
void HAL_GPIO_Write(GPIO_TypeDef* GPIOx, uint16_t PortVal); void HAL_GPIO_Write(GPIO_TypeDef* GPIOx, uint16_t PortVal);
void HAL_PAD_AFConfig(PAD_Type Px, uint16_t Pnum, PAD_AF_TypeDef P_AF); void HAL_PAD_AFConfig(PAD_Type Px, uint16_t Pnum, PAD_AF_TypeDef P_AF);
void GPIO_OutEnClr(GPIO_TypeDef* GPIOx, uint16_t GPIO_Pin);
void GPIO_OutEnSet(GPIO_TypeDef* GPIOx, uint16_t GPIO_Pin);
#ifdef __cplusplus #ifdef __cplusplus
} }

155
libraries/mbed/targets/cmsis/TARGET_WIZNET/TARGET_W7500x/W7500x_i2c.c
View File

@ -50,61 +50,17 @@ uint32_t I2C_Init(I2C_ConfigStruct* conf)
GPIO_InitDef.GPIO_Pin = scl_pin_index; GPIO_InitDef.GPIO_Pin = scl_pin_index;
GPIO_InitDef.GPIO_Mode = GPIO_Mode_OUT; GPIO_InitDef.GPIO_Mode = GPIO_Mode_OUT;
if(scl_port_num == 0) HAL_GPIO_Init((GPIO_TypeDef*)(GPIOA_BASE + (scl_port_num << 24)), &GPIO_InitDef);
{ HAL_GPIO_SetBits((GPIO_TypeDef*)(GPIOA_BASE + (scl_port_num << 24)), scl_pin_index);
HAL_GPIO_Init(GPIOA, &GPIO_InitDef);
HAL_GPIO_SetBits(GPIOA, scl_pin_index);
}
else if(scl_port_num == 1)
{
HAL_GPIO_Init(GPIOB, &GPIO_InitDef);
HAL_GPIO_SetBits(GPIOB, scl_pin_index);
}
else if(scl_port_num == 2)
{
HAL_GPIO_Init(GPIOC, &GPIO_InitDef);
HAL_GPIO_SetBits(GPIOC, scl_pin_index);
}
else if(scl_port_num == 3)
{
HAL_GPIO_Init(GPIOD, &GPIO_InitDef);
HAL_GPIO_SetBits(GPIOD, scl_pin_index);
}
else
{
printf("SCL pin Port number error\r\n");
return 1;
}
//SDA setting //SDA setting
GPIO_InitDef.GPIO_Pin = sda_pin_index; GPIO_InitDef.GPIO_Pin = sda_pin_index;
GPIO_InitDef.GPIO_Mode = GPIO_Mode_IN; GPIO_InitDef.GPIO_Mode = GPIO_Mode_IN;
if(sda_port_num == 0)
{
HAL_GPIO_Init(GPIOA, &GPIO_InitDef);
HAL_GPIO_ResetBits(GPIOA, sda_pin_index);
}
else if(sda_port_num == 1)
{
HAL_GPIO_Init(GPIOB, &GPIO_InitDef);
HAL_GPIO_ResetBits(GPIOB, sda_pin_index);
}
else if(sda_port_num == 2)
{
HAL_GPIO_Init(GPIOC, &GPIO_InitDef);
HAL_GPIO_ResetBits(GPIOC, sda_pin_index);
}
else if(sda_port_num == 3)
{
HAL_GPIO_Init(GPIOD, &GPIO_InitDef);
HAL_GPIO_ResetBits(GPIOD, sda_pin_index);
}
else
{
printf("SDA pin Port number error\r\n");
return 1;
}
HAL_GPIO_Init((GPIO_TypeDef*)(GPIOA_BASE + (sda_port_num << 24)), &GPIO_InitDef);
HAL_GPIO_ResetBits((GPIO_TypeDef*)(GPIOA_BASE + (sda_port_num << 24)), sda_pin_index);
//Pin muxing
HAL_PAD_AFConfig(scl_port_num, scl_pin_index, PAD_AF1); HAL_PAD_AFConfig(scl_port_num, scl_pin_index, PAD_AF1);
HAL_PAD_AFConfig(sda_port_num, sda_pin_index, PAD_AF1); HAL_PAD_AFConfig(sda_port_num, sda_pin_index, PAD_AF1);
@ -116,34 +72,11 @@ void I2C_WriteBitSCL(I2C_ConfigStruct* conf, uint8_t data)
uint32_t scl_port_num = I2C_PORT(conf->scl); uint32_t scl_port_num = I2C_PORT(conf->scl);
uint32_t scl_pin_index = I2C_PIN_INDEX(conf->scl); uint32_t scl_pin_index = I2C_PIN_INDEX(conf->scl);
if(scl_port_num == 0) if(data == 1)
{ HAL_GPIO_SetBits((GPIO_TypeDef*)(GPIOA_BASE + (scl_port_num << 24)), scl_pin_index);
if(data == 1) else
HAL_GPIO_SetBits(GPIOA, scl_pin_index); HAL_GPIO_ResetBits((GPIO_TypeDef*)(GPIOA_BASE + (scl_port_num << 24)), scl_pin_index);
else
HAL_GPIO_ResetBits(GPIOA, scl_pin_index);
}
else if(scl_port_num == 1)
{
if(data == 1)
HAL_GPIO_SetBits(GPIOB, scl_pin_index);
else
HAL_GPIO_ResetBits(GPIOB, scl_pin_index);
}
else if(scl_port_num == 2)
{
if(data == 1)
HAL_GPIO_SetBits(GPIOC, scl_pin_index);
else
HAL_GPIO_ResetBits(GPIOC, scl_pin_index);
}
else if(scl_port_num == 3)
{
if(data == 1)
HAL_GPIO_SetBits(GPIOD, scl_pin_index);
else
HAL_GPIO_ResetBits(GPIOD, scl_pin_index);
}
} }
void I2C_WriteBitSDA(I2C_ConfigStruct* conf, uint8_t data) void I2C_WriteBitSDA(I2C_ConfigStruct* conf, uint8_t data)
@ -151,34 +84,11 @@ void I2C_WriteBitSDA(I2C_ConfigStruct* conf, uint8_t data)
uint32_t sda_port_num = I2C_PORT(conf->sda); uint32_t sda_port_num = I2C_PORT(conf->sda);
uint32_t sda_pin_index = I2C_PIN_INDEX(conf->sda); uint32_t sda_pin_index = I2C_PIN_INDEX(conf->sda);
if(sda_port_num == 0) if(data == 1)
{ GPIO_OutEnClr((GPIO_TypeDef*)(GPIOA_BASE + (sda_port_num << 24)), sda_pin_index);
if(data == 1) else
GPIOA->OUTENCLR = sda_pin_index; GPIO_OutEnSet((GPIO_TypeDef*)(GPIOA_BASE + (sda_port_num << 24)), sda_pin_index);
else
GPIOA->OUTENSET = sda_pin_index;
}
else if(sda_port_num == 1)
{
if(data == 1)
GPIOB->OUTENCLR = sda_pin_index;
else
GPIOB->OUTENSET = sda_pin_index;
}
else if(sda_port_num == 2)
{
if(data == 1)
GPIOC->OUTENCLR = sda_pin_index;
else
GPIOC->OUTENSET = sda_pin_index;
}
else if(sda_port_num == 3)
{
if(data == 1)
GPIOD->OUTENCLR = sda_pin_index;
else
GPIOD->OUTENSET = sda_pin_index;
}
} }
uint8_t I2C_ReadBitSDA(I2C_ConfigStruct* conf) uint8_t I2C_ReadBitSDA(I2C_ConfigStruct* conf)
@ -186,34 +96,11 @@ uint8_t I2C_ReadBitSDA(I2C_ConfigStruct* conf)
uint32_t sda_port_num = I2C_PORT(conf->sda); uint32_t sda_port_num = I2C_PORT(conf->sda);
uint32_t sda_pin_index = I2C_PIN_INDEX(conf->sda); uint32_t sda_pin_index = I2C_PIN_INDEX(conf->sda);
if(sda_port_num == 0) if(HAL_GPIO_ReadInputDataBit((GPIO_TypeDef*)(GPIOA_BASE + (sda_port_num << 24)), sda_pin_index))
{ return 1;
if(GPIOA->DATA & sda_pin_index) else
return 1; return 0;
else
return 0;
}
else if(sda_port_num == 1)
{
if(GPIOB->DATA & sda_pin_index)
return 1;
else
return 0;
}
else if(sda_port_num == 2)
{
if(GPIOC->DATA & sda_pin_index)
return 1;
else
return 0;
}
else if(sda_port_num == 3)
{
if(GPIOD->DATA & sda_pin_index)
return 1;
else
return 0;
}
return 0; return 0;
} }

4
libraries/mbed/targets/hal/TARGET_WIZNET/TARGET_W7500x/i2c_api.c
View File

@ -99,8 +99,7 @@ inline int i2c_stop(i2c_t *obj)
int i2c_read(i2c_t *obj, int address, char *data, int length, int stop) int i2c_read(i2c_t *obj, int address, char *data, int length, int stop)
{ {
I2C_ConfigStruct conf; I2C_ConfigStruct conf;
int i;
conf.sda = (I2C_PinName)obj->sda; conf.sda = (I2C_PinName)obj->sda;
conf.scl = (I2C_PinName)obj->scl; conf.scl = (I2C_PinName)obj->scl;
@ -123,7 +122,6 @@ int i2c_read(i2c_t *obj, int address, char *data, int length, int stop)
int i2c_write(i2c_t *obj, int address, const char *data, int length, int stop) int i2c_write(i2c_t *obj, int address, const char *data, int length, int stop)
{ {
I2C_ConfigStruct conf; I2C_ConfigStruct conf;
int i;
conf.sda = (I2C_PinName)obj->sda; conf.sda = (I2C_PinName)obj->sda;
conf.scl = (I2C_PinName)obj->scl; conf.scl = (I2C_PinName)obj->scl;