From af2b9b9965311db992cdbb223dc0373f37f97e85 Mon Sep 17 00:00:00 2001 From: Bernard Xiong Date: Sat, 18 Nov 2017 17:13:46 +0800 Subject: [PATCH] [DeviceDrivers][USB Stack] code cleanup --- components/drivers/usb/usbhost/class/umouse.c | 161 ++++++++++-------- 1 file changed, 86 insertions(+), 75 deletions(-) diff --git a/components/drivers/usb/usbhost/class/umouse.c b/components/drivers/usb/usbhost/class/umouse.c index b1820da0f3..0fb529f598 100644 --- a/components/drivers/usb/usbhost/class/umouse.c +++ b/components/drivers/usb/usbhost/class/umouse.c @@ -15,19 +15,22 @@ #include #include #include "hid.h" + #ifdef RT_USING_RTGUI #include #include #include "drv_lcd.h" #endif + #if defined(RT_USBH_HID) && defined(RT_USBH_HID_MOUSE) -static struct uprotocal mouse_protocal; +static struct uprotocal mouse_protocal; #ifdef RT_USING_RTGUI #define LKEY_PRESS 0x01 #define RKEY_PRESS 0x02 #define MKEY_PRESS 0x04 #define MOUSE_SCALING 0x02 + static rt_bool_t lkey_down=RT_FALSE; //static rt_bool_t rkey_down=RT_FALSE; //static rt_bool_t mkey_down=RT_FALSE; @@ -36,86 +39,94 @@ static struct rtgui_event_mouse emouse; static rt_err_t rt_usbh_hid_mouse_callback(void* arg) { - struct uhid* hid; + struct uhid* hid; #ifdef RT_USING_RTGUI - rt_uint16_t xoffset=0; - rt_uint16_t yoffset=0; + rt_uint16_t xoffset=0; + rt_uint16_t yoffset=0; #endif hid = (struct uhid*)arg; - RT_DEBUG_LOG(RT_DEBUG_USB, ("hid 0x%x 0x%x\n", - *(rt_uint32_t*)hid->buffer, - *(rt_uint32_t*)(&hid->buffer[4]))); -#ifdef RT_USING_RTGUI - if(hid->buffer[1]!=0) - { - if(hid->buffer[1]>127) - { - xoffset=(256-hid->buffer[1])*MOUSE_SCALING; - if(emouse.x>xoffset) - { + RT_DEBUG_LOG(RT_DEBUG_USB, ("hid 0x%x 0x%x\n", + *(rt_uint32_t*)hid->buffer, + *(rt_uint32_t*)(&hid->buffer[4]))); +#ifdef RT_USING_RTGUI + if(hid->buffer[1]!=0) + { + if(hid->buffer[1]>127) + { + xoffset=(256-hid->buffer[1])*MOUSE_SCALING; + if(emouse.x>xoffset) + { emouse.x-=xoffset; - }else - { + } + else + { emouse.x=0; - } - }else - { - xoffset=(hid->buffer[1])*MOUSE_SCALING; - if((emouse.x+xoffset)<480) - { + } + } + else + { + xoffset=(hid->buffer[1])*MOUSE_SCALING; + if((emouse.x+xoffset)<480) + { emouse.x+=xoffset; - }else - { + } + else + { emouse.x=480; - } - } - } - if(hid->buffer[2]!=0) - { - - if(hid->buffer[2]>127) - { - yoffset=(256-hid->buffer[2])*MOUSE_SCALING; - if(emouse.y>yoffset) - { + } + } + } + if(hid->buffer[2]!=0) + { + + if(hid->buffer[2]>127) + { + yoffset=(256-hid->buffer[2])*MOUSE_SCALING; + if(emouse.y>yoffset) + { emouse.y-=yoffset; - }else - { + } + else + { emouse.y=0; - } - }else - { - yoffset=hid->buffer[2]*MOUSE_SCALING; - if(emouse.y+yoffset<272) - { + } + } + else + { + yoffset=hid->buffer[2]*MOUSE_SCALING; + if(emouse.y+yoffset<272) + { emouse.y+=yoffset; - }else - { + } + else + { emouse.y=272; - } - } - } - if(xoffset!=0||yoffset!=0) - { + } + } + } + if(xoffset!=0||yoffset!=0) + { cursor_set_position(emouse.x,emouse.y); - } + } if(hid->buffer[0]&LKEY_PRESS) - { - if(lkey_down==RT_FALSE){ - // rt_kprintf("mouse left key press down\n"); - emouse.button = (RTGUI_MOUSE_BUTTON_LEFT | RTGUI_MOUSE_BUTTON_DOWN); - rtgui_server_post_event(&emouse.parent, sizeof(struct rtgui_event_mouse)); - lkey_down=RT_TRUE; - } - }else if(lkey_down==RT_TRUE) - { - // rt_kprintf("mouse left key press up\n"); - emouse.button = (RTGUI_MOUSE_BUTTON_LEFT | RTGUI_MOUSE_BUTTON_UP); - rtgui_server_post_event(&emouse.parent, sizeof(struct rtgui_event_mouse)); - lkey_down=RT_FALSE; - } -#endif + { + if(lkey_down==RT_FALSE) + { + // rt_kprintf("mouse left key press down\n"); + emouse.button = (RTGUI_MOUSE_BUTTON_LEFT | RTGUI_MOUSE_BUTTON_DOWN); + rtgui_server_post_event(&emouse.parent, sizeof(struct rtgui_event_mouse)); + lkey_down=RT_TRUE; + } + } + else if(lkey_down==RT_TRUE) + { + // rt_kprintf("mouse left key press up\n"); + emouse.button = (RTGUI_MOUSE_BUTTON_LEFT | RTGUI_MOUSE_BUTTON_UP); + rtgui_server_post_event(&emouse.parent, sizeof(struct rtgui_event_mouse)); + lkey_down=RT_FALSE; + } +#endif return RT_EOK; } @@ -123,24 +134,24 @@ static rt_err_t rt_usbh_hid_mouse_init(void* arg) { struct uintf* intf = (struct uintf*)arg; - RT_ASSERT(intf != RT_NULL); - + RT_ASSERT(intf != RT_NULL); + rt_usbh_hid_set_protocal(intf, 0); rt_usbh_hid_set_idle(intf, 10, 0); - RT_DEBUG_LOG(RT_DEBUG_USB, ("start usb mouse\n")); -#ifdef RT_USING_RTGUI - RTGUI_EVENT_MOUSE_BUTTON_INIT(&emouse); + RT_DEBUG_LOG(RT_DEBUG_USB, ("start usb mouse\n")); +#ifdef RT_USING_RTGUI + RTGUI_EVENT_MOUSE_BUTTON_INIT(&emouse); emouse.wid = RT_NULL; - cursor_display(RT_TRUE); -#endif + cursor_display(RT_TRUE); +#endif return RT_EOK; } /** * This function will define the hid mouse protocal, it will be register to the protocal list. - * + * * @return the keyboard protocal structure. */ uprotocal_t rt_usbh_hid_protocal_mouse(void)