Index: uspace/drv/ohci/hc.h =================================================================== --- uspace/drv/ohci/hc.h (revision 4ca18aea925fcd2731c31488a3682fd2f11e4d50) +++ uspace/drv/ohci/hc.h (revision fc9f88d9f0d41777b52d2f7694a032f3b6eccac0) @@ -48,4 +48,5 @@ #include "ohci_regs.h" #include "root_hub.h" +#include "hw_struct/hcca.h" typedef struct hc { Index: uspace/drv/ohci/hw_struct/completion_codes.h =================================================================== --- uspace/drv/ohci/hw_struct/completion_codes.h (revision fc9f88d9f0d41777b52d2f7694a032f3b6eccac0) +++ uspace/drv/ohci/hw_struct/completion_codes.h (revision fc9f88d9f0d41777b52d2f7694a032f3b6eccac0) @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2011 Jan Vesely + * 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 drvusbohci + * @{ + */ +/** @file + * @brief OHCI driver + */ +#ifndef DRV_OHCI_HW_STRUCT_COMPLETION_CODES_H +#define DRV_OHCI_HW_STRUCT_COMPLETION_CODES_H + +#define CC_NOERROR (0x0) +#define CC_CRC (0x1) +#define CC_BITSTUFF (0x2) +#define CC_TOGGLE (0x3) +#define CC_STALL (0x4) +#define CC_NORESPONSE (0x5) +#define CC_PIDFAIL (0x6) +#define CC_PIDUNEXPECTED (0x7) +#define CC_DATAOVERRRUN (0x8) +#define CC_DATAUNDERRRUN (0x9) +#define CC_BUFFEROVERRRUN (0xc) +#define CC_BUFFERUNDERRUN (0xd) +#define CC_NOACCESS1 (0xe) +#define CC_NOACCESS2 (0xf) + +#endif +/** + * @} + */ Index: uspace/drv/ohci/hw_struct/endpoint_descriptor.h =================================================================== --- uspace/drv/ohci/hw_struct/endpoint_descriptor.h (revision 4ca18aea925fcd2731c31488a3682fd2f11e4d50) +++ uspace/drv/ohci/hw_struct/endpoint_descriptor.h (revision fc9f88d9f0d41777b52d2f7694a032f3b6eccac0) @@ -32,8 +32,10 @@ * @brief OHCI driver */ -#ifndef DRV_OHCI_ENDPOINT_DESCRIPTOR_H -#define DRV_OHCI_ENDPOINT_DESCRIPTOR_H +#ifndef DRV_OHCI_HW_STRUCT_ENDPOINT_DESCRIPTOR_H +#define DRV_OHCI_HW_STRUCT_ENDPOINT_DESCRIPTOR_H #include + +#include "completion_codes.h" typedef struct ed { Index: uspace/drv/ohci/hw_struct/hcca.h =================================================================== --- uspace/drv/ohci/hw_struct/hcca.h (revision fc9f88d9f0d41777b52d2f7694a032f3b6eccac0) +++ uspace/drv/ohci/hw_struct/hcca.h (revision fc9f88d9f0d41777b52d2f7694a032f3b6eccac0) @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2011 Jan Vesely + * 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 drvusbohci + * @{ + */ +/** @file + * @brief OHCI driver + */ +#ifndef DRV_OHCI_HW_STRUCT_HCCA_H +#define DRV_OHCI_HW_STRUCT_HCCA_H + +#include + +typedef struct hcca { + uint32_t int_ep[32]; + uint16_t frame_number; + uint16_t pad1; + uint32_t done_head; + uint32_t reserved[29]; +} __attribute__((packed)) hcca_t; + +#endif +/** + * @} + */ + Index: uspace/drv/ohci/hw_struct/iso_transfer_descriptor.h =================================================================== --- uspace/drv/ohci/hw_struct/iso_transfer_descriptor.h (revision 4ca18aea925fcd2731c31488a3682fd2f11e4d50) +++ uspace/drv/ohci/hw_struct/iso_transfer_descriptor.h (revision fc9f88d9f0d41777b52d2f7694a032f3b6eccac0) @@ -32,8 +32,10 @@ * @brief OHCI driver */ -#ifndef DRV_OHCI_ISO_TRANSFER_DESCRIPTOR_H -#define DRV_OHCI_ISO_TRANSFER_DESCRIPTOR_H +#ifndef DRV_OHCI_HW_STRUCT_ISO_TRANSFER_DESCRIPTOR_H +#define DRV_OHCI_HW_STRUCT_ISO_TRANSFER_DESCRIPTOR_H #include + +#include "completion_codes.h" typedef struct itd { Index: uspace/drv/ohci/hw_struct/transfer_descriptor.h =================================================================== --- uspace/drv/ohci/hw_struct/transfer_descriptor.h (revision 4ca18aea925fcd2731c31488a3682fd2f11e4d50) +++ uspace/drv/ohci/hw_struct/transfer_descriptor.h (revision fc9f88d9f0d41777b52d2f7694a032f3b6eccac0) @@ -32,8 +32,10 @@ * @brief OHCI driver */ -#ifndef DRV_OHCI_TRANSFER_DESCRIPTOR_H -#define DRV_OHCI_TRANSFER_DESCRIPTOR_H +#ifndef DRV_OHCI_HW_STRUCT_TRANSFER_DESCRIPTOR_H +#define DRV_OHCI_HW_STRUCT_TRANSFER_DESCRIPTOR_H #include + +#include "completion_codes.h" typedef struct td { @@ -66,3 +68,2 @@ * @} */ -