libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

modify return value and delete device name calloc

This commit is contained in:
tyustli 2019-06-12 15:31:14 +08:00
parent 89b90592ee
commit 10ac5f7a34
1 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
components/drivers/touch/touch.c
View File

@ -16,7 +16,7 @@
#include <rtdbg.h> #include <rtdbg.h>
/* touch interrupt handler function */ /* touch interrupt handler function */
void rt_touch_cb(rt_touch_t touch) static void rt_touch_cb(rt_touch_t touch)
{ {
if (touch->parent.rx_indicate == RT_NULL) if (touch->parent.rx_indicate == RT_NULL)
{ {
@ -46,7 +46,7 @@ static rt_err_t rt_touch_irq_init(rt_touch_t touch)
{ {
if (touch->config.irq_pin.pin == RT_PIN_NONE) if (touch->config.irq_pin.pin == RT_PIN_NONE)
{ {
return -RT_EINVAL; return RT_EINVAL;
} }
rt_pin_mode(touch->config.irq_pin.pin, touch->config.irq_pin.mode); rt_pin_mode(touch->config.irq_pin.pin, touch->config.irq_pin.mode);
@ -68,7 +68,7 @@ static rt_err_t rt_touch_irq_init(rt_touch_t touch)
LOG_I("interrupt init success"); LOG_I("interrupt init success");
return 0; return RT_EOK;
} }
/* touch interrupt enable */ /* touch interrupt enable */
@ -199,7 +199,7 @@ static rt_err_t rt_touch_control(rt_device_t dev, int cmd, void *args)
break; break;
default: default:
return -RT_ERROR; return RT_ERROR;
} }
return result; return result;
@ -229,21 +229,6 @@ int rt_hw_touch_register(rt_touch_t touch,
rt_device_t device; rt_device_t device;
RT_ASSERT(touch != RT_NULL); RT_ASSERT(touch != RT_NULL);
char *touch_name = RT_NULL;
char *device_name = RT_NULL;
touch_name = "touch_";
device_name = rt_calloc(1, rt_strlen(touch_name) + 1 + rt_strlen(name));
if (device_name == RT_NULL)
{
LOG_E("device_name calloc failed!");
return -RT_ERROR;
}
rt_memcpy(device_name, touch_name, rt_strlen(touch_name) + 1);
strcat(device_name, name);
device = &touch->parent; device = &touch->parent;
#ifdef RT_USING_DEVICE_OPS #ifdef RT_USING_DEVICE_OPS
@ -261,7 +246,7 @@ int rt_hw_touch_register(rt_touch_t touch,
device->tx_complete = RT_NULL; device->tx_complete = RT_NULL;
device->user_data = data; device->user_data = data;
result = rt_device_register(device, device_name, flag | RT_DEVICE_FLAG_STANDALONE); result = rt_device_register(device, name, flag | RT_DEVICE_FLAG_STANDALONE);
if (result != RT_EOK) if (result != RT_EOK)
{ {