Index: uspace/drv/usbhub/Makefile =================================================================== --- uspace/drv/usbhub/Makefile (revision 578a25473f8e3994840079948eef787f62b04e52) +++ uspace/drv/usbhub/Makefile (revision 3eaa5a5e2a2abcbfcd52ad1b3e21314c5147c3ad) @@ -36,6 +36,5 @@ ports.c \ utils.c \ - usbhub.c \ - usblist.c + usbhub.c include $(USPACE_PREFIX)/Makefile.common Index: uspace/drv/usbhub/usbhub_private.h =================================================================== --- uspace/drv/usbhub/usbhub_private.h (revision 578a25473f8e3994840079948eef787f62b04e52) +++ uspace/drv/usbhub/usbhub_private.h (revision 3eaa5a5e2a2abcbfcd52ad1b3e21314c5147c3ad) @@ -38,5 +38,4 @@ #include "usbhub.h" -#include "usblist.h" #include Index: uspace/drv/usbhub/usblist.c =================================================================== --- uspace/drv/usbhub/usblist.c (revision 578a25473f8e3994840079948eef787f62b04e52) +++ (revision ) @@ -1,80 +1,0 @@ -/* - * Copyright (c) 2010 Matus Dekanek - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - 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. - * - 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. - */ -/** @addtogroup drvusbhub - * @{ - */ -/** @file - * @brief usblist implementation - */ -#include - -#include "usbhub_private.h" - - -usb_general_list_t * usb_lst_create(void) { - usb_general_list_t* result = usb_new(usb_general_list_t); - usb_lst_init(result); - return result; -} - -void usb_lst_init(usb_general_list_t * lst) { - lst->prev = lst; - lst->next = lst; - lst->data = NULL; -} - -void usb_lst_prepend(usb_general_list_t* item, void* data) { - usb_general_list_t* appended = usb_new(usb_general_list_t); - appended->data = data; - appended->next = item; - appended->prev = item->prev; - item->prev->next = appended; - item->prev = appended; -} - -void usb_lst_append(usb_general_list_t* item, void* data) { - usb_general_list_t* appended = usb_new(usb_general_list_t); - appended->data = data; - appended->next = item->next; - appended->prev = item; - item->next->prev = appended; - item->next = appended; -} - -void usb_lst_remove(usb_general_list_t* item) { - item->next->prev = item->prev; - item->prev->next = item->next; -} - - - -/** - * @} - */ - - Index: uspace/drv/usbhub/usblist.h =================================================================== --- uspace/drv/usbhub/usblist.h (revision 578a25473f8e3994840079948eef787f62b04e52) +++ (revision ) @@ -1,82 +1,0 @@ -/* - * Copyright (c) 2010 Matus Dekanek - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * - * - Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * - 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. - * - 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. - */ - -/** @addtogroup drvusbhub - * @{ - */ -/** @file - * @brief HC driver and hub driver. - * - * My private list implementation; I did not like the original helenos list. - * This one does not depend on the structure of stored data and has - * much simpler and more straight-forward semantics. - */ -#ifndef USBLIST_H -#define USBLIST_H - -/** - * general list structure - */ -typedef struct usb_general_list{ - void * data; - struct usb_general_list * prev, * next; -} usb_general_list_t; - -/** create head of usb general list */ -usb_general_list_t * usb_lst_create(void); - -/** initialize head of usb general list */ -void usb_lst_init(usb_general_list_t * lst); - - -/** is the list empty? */ -static inline bool usb_lst_empty(usb_general_list_t * lst){ - return lst?(lst->next==lst):true; -} - -/** append data behind item */ -void usb_lst_append(usb_general_list_t * lst, void * data); - -/** prepend data beore item */ -void usb_lst_prepend(usb_general_list_t * lst, void * data); - -/** remove list item from list */ -void usb_lst_remove(usb_general_list_t * item); - -/** get data o specified type from list item */ -#define usb_lst_get_data(item, type) (type *) (item->data) - -/** get usb_hub_info_t data from list item */ -static inline usb_hub_info_t * usb_hub_lst_get_data(usb_general_list_t * item) { - return usb_lst_get_data(item,usb_hub_info_t); -} - -#endif /* USBLIST_H */ -/** - * @} - */