Browse Source

Rename transfer functions from "new" to "queue"

main
PaulStoffregen 7 years ago
parent
commit
1b300c9051
4 changed files with 16 additions and 18 deletions
  1. +2
    -2
      USBHost.h
  2. +2
    -2
      ehci.cpp
  3. +10
    -10
      enumeration.cpp
  4. +2
    -4
      hub.cpp

+ 2
- 2
USBHost.h View File

protected: protected:
static Pipe_t * new_Pipe(Device_t *dev, uint32_t type, uint32_t endpoint, static Pipe_t * new_Pipe(Device_t *dev, uint32_t type, uint32_t endpoint,
uint32_t direction, uint32_t max_packet_len); uint32_t direction, uint32_t max_packet_len);
static bool new_Control_Transfer(Device_t *dev, setup_t *setup,
static bool queue_Control_Transfer(Device_t *dev, setup_t *setup,
void *buf, USBDriver *driver); void *buf, USBDriver *driver);
static bool new_Data_Transfer(Pipe_t *pipe, void *buffer,
static bool queue_Data_Transfer(Pipe_t *pipe, void *buffer,
uint32_t len, USBDriver *driver); uint32_t len, USBDriver *driver);
static Device_t * new_Device(uint32_t speed, uint32_t hub_addr, uint32_t hub_port); static Device_t * new_Device(uint32_t speed, uint32_t hub_addr, uint32_t hub_port);
static void enumeration(const Transfer_t *transfer); static void enumeration(const Transfer_t *transfer);

+ 2
- 2
ehci.cpp View File



// Create a Control Transfer and queue it // Create a Control Transfer and queue it
// //
bool USBHost::new_Control_Transfer(Device_t *dev, setup_t *setup, void *buf, USBDriver *driver)
bool USBHost::queue_Control_Transfer(Device_t *dev, setup_t *setup, void *buf, USBDriver *driver)
{ {
Transfer_t *transfer, *data, *status; Transfer_t *transfer, *data, *status;
uint32_t status_direction; uint32_t status_direction;


// Create a Bulk or Interrupt Transfer and queue it // Create a Bulk or Interrupt Transfer and queue it
// //
bool USBHost::new_Data_Transfer(Pipe_t *pipe, void *buffer, uint32_t len, USBDriver *driver)
bool USBHost::queue_Data_Transfer(Pipe_t *pipe, void *buffer, uint32_t len, USBDriver *driver)
{ {
Serial.println("new_Data_Transfer"); Serial.println("new_Data_Transfer");
//Transfer_t *transfer = allocate_Transfer(); //Transfer_t *transfer = allocate_Transfer();

+ 10
- 10
enumeration.cpp View File

// any new devices detected while enumerating would // any new devices detected while enumerating would
// go onto a waiting list // go onto a waiting list
mk_setup(enumsetup, 0x80, 6, 0x0100, 0, 8); // 6=GET_DESCRIPTOR mk_setup(enumsetup, 0x80, 6, 0x0100, 0, 8); // 6=GET_DESCRIPTOR
new_Control_Transfer(dev, &enumsetup, enumbuf, NULL);
queue_Control_Transfer(dev, &enumsetup, enumbuf, NULL);
return dev; return dev;
} }


case 0: // read 8 bytes of device desc, set max packet, and send set address case 0: // read 8 bytes of device desc, set max packet, and send set address
pipe_set_maxlen(dev->control_pipe, enumbuf[7]); pipe_set_maxlen(dev->control_pipe, enumbuf[7]);
mk_setup(enumsetup, 0, 5, assign_addr(), 0, 0); // 5=SET_ADDRESS mk_setup(enumsetup, 0, 5, assign_addr(), 0, 0); // 5=SET_ADDRESS
new_Control_Transfer(dev, &enumsetup, NULL, NULL);
queue_Control_Transfer(dev, &enumsetup, NULL, NULL);
dev->enum_state = 1; dev->enum_state = 1;
return; return;
case 1: // request all 18 bytes of device descriptor case 1: // request all 18 bytes of device descriptor
pipe_set_addr(dev->control_pipe, enumsetup.wValue); pipe_set_addr(dev->control_pipe, enumsetup.wValue);
mk_setup(enumsetup, 0x80, 6, 0x0100, 0, 18); // 6=GET_DESCRIPTOR mk_setup(enumsetup, 0x80, 6, 0x0100, 0, 18); // 6=GET_DESCRIPTOR
new_Control_Transfer(dev, &enumsetup, enumbuf, NULL);
queue_Control_Transfer(dev, &enumsetup, enumbuf, NULL);
dev->enum_state = 2; dev->enum_state = 2;
return; return;
case 2: // parse 18 device desc bytes case 2: // parse 18 device desc bytes
case 3: // request Language ID case 3: // request Language ID
len = sizeof(enumbuf) - 4; len = sizeof(enumbuf) - 4;
mk_setup(enumsetup, 0x80, 6, 0x0300, 0, len); // 6=GET_DESCRIPTOR mk_setup(enumsetup, 0x80, 6, 0x0300, 0, len); // 6=GET_DESCRIPTOR
new_Control_Transfer(dev, &enumsetup, enumbuf + 4, NULL);
queue_Control_Transfer(dev, &enumsetup, enumbuf + 4, NULL);
dev->enum_state = 4; dev->enum_state = 4;
return; return;
case 4: // parse Language ID case 4: // parse Language ID
case 5: // request Manufacturer string case 5: // request Manufacturer string
len = sizeof(enumbuf) - 4; len = sizeof(enumbuf) - 4;
mk_setup(enumsetup, 0x80, 6, 0x0300 | enumbuf[0], dev->LanguageID, len); mk_setup(enumsetup, 0x80, 6, 0x0300 | enumbuf[0], dev->LanguageID, len);
new_Control_Transfer(dev, &enumsetup, enumbuf + 4, NULL);
queue_Control_Transfer(dev, &enumsetup, enumbuf + 4, NULL);
dev->enum_state = 6; dev->enum_state = 6;
return; return;
case 6: // parse Manufacturer string case 6: // parse Manufacturer string
case 7: // request Product string case 7: // request Product string
len = sizeof(enumbuf) - 4; len = sizeof(enumbuf) - 4;
mk_setup(enumsetup, 0x80, 6, 0x0300 | enumbuf[1], dev->LanguageID, len); mk_setup(enumsetup, 0x80, 6, 0x0300 | enumbuf[1], dev->LanguageID, len);
new_Control_Transfer(dev, &enumsetup, enumbuf + 4, NULL);
queue_Control_Transfer(dev, &enumsetup, enumbuf + 4, NULL);
dev->enum_state = 8; dev->enum_state = 8;
return; return;
case 8: // parse Product string case 8: // parse Product string
case 9: // request Serial Number string case 9: // request Serial Number string
len = sizeof(enumbuf) - 4; len = sizeof(enumbuf) - 4;
mk_setup(enumsetup, 0x80, 6, 0x0300 | enumbuf[2], dev->LanguageID, len); mk_setup(enumsetup, 0x80, 6, 0x0300 | enumbuf[2], dev->LanguageID, len);
new_Control_Transfer(dev, &enumsetup, enumbuf + 4, NULL);
queue_Control_Transfer(dev, &enumsetup, enumbuf + 4, NULL);
dev->enum_state = 10; dev->enum_state = 10;
return; return;
case 10: // parse Serial Number string case 10: // parse Serial Number string
break; break;
case 11: // request first 9 bytes of config desc case 11: // request first 9 bytes of config desc
mk_setup(enumsetup, 0x80, 6, 0x0200, 0, 9); // 6=GET_DESCRIPTOR mk_setup(enumsetup, 0x80, 6, 0x0200, 0, 9); // 6=GET_DESCRIPTOR
new_Control_Transfer(dev, &enumsetup, enumbuf, NULL);
queue_Control_Transfer(dev, &enumsetup, enumbuf, NULL);
dev->enum_state = 12; dev->enum_state = 12;
return; return;
case 12: // read 9 bytes, request all of config desc case 12: // read 9 bytes, request all of config desc
// TODO: how to handle device with too much config data // TODO: how to handle device with too much config data
} }
mk_setup(enumsetup, 0x80, 6, 0x0200, 0, len); // 6=GET_DESCRIPTOR mk_setup(enumsetup, 0x80, 6, 0x0200, 0, len); // 6=GET_DESCRIPTOR
new_Control_Transfer(dev, &enumsetup, enumbuf, NULL);
queue_Control_Transfer(dev, &enumsetup, enumbuf, NULL);
dev->enum_state = 13; dev->enum_state = 13;
return; return;
case 13: // read all config desc, send set config case 13: // read all config desc, send set config
dev->bMaxPower = enumbuf[8]; dev->bMaxPower = enumbuf[8];
// TODO: actually do something with interface descriptor? // TODO: actually do something with interface descriptor?
mk_setup(enumsetup, 0, 9, enumbuf[5], 0, 0); // 9=SET_CONFIGURATION mk_setup(enumsetup, 0, 9, enumbuf[5], 0, 0); // 9=SET_CONFIGURATION
new_Control_Transfer(dev, &enumsetup, NULL, NULL);
queue_Control_Transfer(dev, &enumsetup, NULL, NULL);
dev->enum_state = 14; dev->enum_state = 14;
return; return;
case 14: // device is now configured case 14: // device is now configured

+ 2
- 4
hub.cpp View File

changebits = 0; changebits = 0;
state = 0; state = 0;


// TODO: need a way to do control transfers with our own setup data.
mk_setup(setup, 0xA0, 6, 0x2900, 0, sizeof(hub_desc)); mk_setup(setup, 0xA0, 6, 0x2900, 0, sizeof(hub_desc));
new_Control_Transfer(dev, &setup, hub_desc, this);
queue_Control_Transfer(dev, &setup, hub_desc, this);


return true; return true;
} }


void USBHub::poweron(uint32_t port) void USBHub::poweron(uint32_t port)
{ {
// TODO: need a way to do control transfers with our own setup data.
mk_setup(setup, 0x23, 3, 8, port, 0); mk_setup(setup, 0x23, 3, 8, port, 0);
new_Control_Transfer(device, &setup, NULL, this);
queue_Control_Transfer(device, &setup, NULL, this);
} }


bool USBHub::control(const Transfer_t *transfer) bool USBHub::control(const Transfer_t *transfer)

Loading…
Cancel
Save