git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30713 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz
2009-05-11 23:56:26 +00:00
parent 9bc8951dc9
commit aaf7738499
3 changed files with 77 additions and 79 deletions
+6 -5
View File
@@ -5,7 +5,6 @@
* Authors: * Authors:
* Michael Lotz <[email protected]> * Michael Lotz <[email protected]>
*/ */
#ifndef EHCI_H #ifndef EHCI_H
#define EHCI_H #define EHCI_H
@@ -18,13 +17,13 @@ struct pci_module_info;
class EHCIRootHub; class EHCIRootHub;
typedef struct transfer_data_s { typedef struct transfer_data {
Transfer * transfer; Transfer * transfer;
ehci_qh * queue_head; ehci_qh * queue_head;
ehci_qtd * data_descriptor; ehci_qtd * data_descriptor;
bool incoming; bool incoming;
bool canceled; bool canceled;
transfer_data_s *link; transfer_data * link;
} transfer_data; } transfer_data;
@@ -97,7 +96,8 @@ static int32 CleanupThread(void *data);
bool *directionIn); bool *directionIn);
// Descriptor functions // Descriptor functions
ehci_qtd *CreateDescriptor(size_t bufferSizeToAllocate, ehci_qtd * CreateDescriptor(
size_t bufferSizeToAllocate,
uint8 pid); uint8 pid);
status_t CreateDescriptorChain(Pipe *pipe, status_t CreateDescriptorChain(Pipe *pipe,
ehci_qtd **firstDescriptor, ehci_qtd **firstDescriptor,
@@ -112,7 +112,8 @@ static int32 CleanupThread(void *data);
void LinkDescriptors(ehci_qtd *first, void LinkDescriptors(ehci_qtd *first,
ehci_qtd *last, ehci_qtd *alt); ehci_qtd *last, ehci_qtd *alt);
size_t WriteDescriptorChain(ehci_qtd *topDescriptor, size_t WriteDescriptorChain(
ehci_qtd *topDescriptor,
iovec *vector, size_t vectorCount); iovec *vector, size_t vectorCount);
size_t ReadDescriptorChain(ehci_qtd *topDescriptor, size_t ReadDescriptorChain(ehci_qtd *topDescriptor,
iovec *vector, size_t vectorCount, iovec *vector, size_t vectorCount,
+2 -3
View File
@@ -7,7 +7,6 @@
* Salvatore Benedetto <[email protected]> * Salvatore Benedetto <[email protected]>
* Michael Lotz <[email protected]> * Michael Lotz <[email protected]>
*/ */
#ifndef OHCI_H #ifndef OHCI_H
#define OHCI_H #define OHCI_H
@@ -19,7 +18,7 @@ struct pci_info;
struct pci_module_info; struct pci_module_info;
class OHCIRootHub; class OHCIRootHub;
typedef struct transfer_data_s { typedef struct transfer_data {
Transfer * transfer; Transfer * transfer;
ohci_endpoint_descriptor * endpoint; ohci_endpoint_descriptor * endpoint;
ohci_general_td * first_descriptor; ohci_general_td * first_descriptor;
@@ -27,7 +26,7 @@ typedef struct transfer_data_s {
ohci_general_td * last_descriptor; ohci_general_td * last_descriptor;
bool incoming; bool incoming;
bool canceled; bool canceled;
transfer_data_s *link; transfer_data * link;
} transfer_data; } transfer_data;
+4 -6
View File
@@ -7,7 +7,6 @@
* Niels S. Reedijk * Niels S. Reedijk
* Salvatore Benedetto <[email protected]> * Salvatore Benedetto <[email protected]>
*/ */
#ifndef UHCI_H #ifndef UHCI_H
#define UHCI_H #define UHCI_H
@@ -62,7 +61,7 @@ private:
}; };
typedef struct transfer_data_s { typedef struct transfer_data {
Transfer * transfer; Transfer * transfer;
Queue * queue; Queue * queue;
uhci_qh * transfer_queue; uhci_qh * transfer_queue;
@@ -70,13 +69,13 @@ typedef struct transfer_data_s {
uhci_td * data_descriptor; uhci_td * data_descriptor;
bool incoming; bool incoming;
bool canceled; bool canceled;
transfer_data_s *link; transfer_data * link;
} transfer_data; } transfer_data;
// This structure is used to create a list of // This structure is used to create a list of
// descriptors per isochronous transfer // descriptors per isochronous transfer
typedef struct isochronous_transfer_data_s { typedef struct isochronous_transfer_data {
Transfer * transfer; Transfer * transfer;
// The next field is used to keep track // The next field is used to keep track
// of every isochronous descriptor as they are NOT // of every isochronous descriptor as they are NOT
@@ -86,7 +85,7 @@ typedef struct isochronous_transfer_data_s {
uint16 last_to_process; uint16 last_to_process;
bool incoming; bool incoming;
bool is_active; bool is_active;
isochronous_transfer_data_s *link; isochronous_transfer_data * link;
} isochronous_transfer_data; } isochronous_transfer_data;
@@ -242,7 +241,6 @@ static pci_module_info *sPCIModule;
UHCIRootHub * fRootHub; UHCIRootHub * fRootHub;
uint8 fRootHubAddress; uint8 fRootHubAddress;
uint8 fPortResetChange; uint8 fPortResetChange;
}; };