From e438a7ca097654167c301de7f827378ed5d6dbe9 Mon Sep 17 00:00:00 2001 From: hathach Date: Fri, 18 Jan 2013 12:28:12 +0700 Subject: house keeping --- tests/test/host/test_host_hid.c | 51 ++++++++++++++++++++++++++++++++ tests/test/host/test_host_hid_keyboard.c | 39 ++++++++++++++++++++++++ tests/test/test_hid_host.c | 51 -------------------------------- tinyusb/device/dcd.c | 6 ++-- 4 files changed, 92 insertions(+), 55 deletions(-) create mode 100644 tests/test/host/test_host_hid.c create mode 100644 tests/test/host/test_host_hid_keyboard.c delete mode 100644 tests/test/test_hid_host.c diff --git a/tests/test/host/test_host_hid.c b/tests/test/host/test_host_hid.c new file mode 100644 index 000000000..3891034e5 --- /dev/null +++ b/tests/test/host/test_host_hid.c @@ -0,0 +1,51 @@ +/* + * test_host_hid.c + * + * Created on: Dec 18, 2012 + * Author: hathach + */ + +/* + * Software License Agreement (BSD License) + * Copyright (c) 2012, hathach (tinyusb.net) + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + * + * This file is part of the tiny usb stack. + */ + +#include "unity.h" + +void setUp(void) +{ +} + +void tearDown(void) +{ +} + +void test_() +{ + TEST_IGNORE(); +} diff --git a/tests/test/host/test_host_hid_keyboard.c b/tests/test/host/test_host_hid_keyboard.c new file mode 100644 index 000000000..436c90b43 --- /dev/null +++ b/tests/test/host/test_host_hid_keyboard.c @@ -0,0 +1,39 @@ +/* + * test_host_hid_keyboard.c + * + * Created on: Jan 18, 2013 + * Author: hathach + */ + +/* + * Software License Agreement (BSD License) + * Copyright (c) 2012, hathach (tinyusb.net) + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED + * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT + * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT + * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING + * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY + * OF SUCH DAMAGE. + * + * This file is part of the tiny usb stack. + */ + +#define _TINY_USB_SOURCE_FILE + diff --git a/tests/test/test_hid_host.c b/tests/test/test_hid_host.c deleted file mode 100644 index 71bd1fa10..000000000 --- a/tests/test/test_hid_host.c +++ /dev/null @@ -1,51 +0,0 @@ -/* - * test_main.c - * - * Created on: Dec 18, 2012 - * Author: hathach - */ - -/* - * Software License Agreement (BSD License) - * Copyright (c) 2012, hathach (tinyusb.net) - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * 1. Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * 3. The name of the author may not be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT - * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT - * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING - * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY - * OF SUCH DAMAGE. - * - * This file is part of the tiny usb stack. - */ - -#include "unity.h" - -void setUp(void) -{ -} - -void tearDown(void) -{ -} - -void test_() -{ - TEST_IGNORE(); -} diff --git a/tinyusb/device/dcd.c b/tinyusb/device/dcd.c index 3fabf0e51..871da911a 100644 --- a/tinyusb/device/dcd.c +++ b/tinyusb/device/dcd.c @@ -39,11 +39,9 @@ #ifdef TUSB_CFG_DEVICE -// TODO refractor later -#include "descriptors.h" +#include "descriptors.h" // TODO refractor later -// TODO dcd abstract later -#define USB_ROM_SIZE (1024*2) +#define USB_ROM_SIZE (1024*2) // TODO dcd abstract later uint8_t usb_RomDriver_buffer[USB_ROM_SIZE] ATTR_ALIGNED(2048) TUSB_ATTR_RAM_SECTION; USBD_HANDLE_T g_hUsb; static volatile bool isConfigured = false; -- cgit v1.3.1