Changeset e05d6c3 in mainline for uspace/drv/ohci/batch.c
- Timestamp:
- 2011-04-15T07:45:26Z (14 years ago)
- Branches:
- lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
- Children:
- 3a85a2b
- Parents:
- a39cfb8 (diff), e583fd4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the(diff)
links above to see all the changes relative to each parent. - File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
uspace/drv/ohci/batch.c
ra39cfb8 re05d6c3 161 161 usb_log_debug("Batch(%p) found error TD(%d):%x.\n", 162 162 instance, i, data->tds[i]->status); 163 /* Make sure TD queue is empty (one TD), 164 * ED should be marked as halted */ 165 data->ed->td_tail = 166 (data->ed->td_head & ED_TDTAIL_PTR_MASK); 167 ++i; 163 168 break; 164 169 } … … 169 174 assert(hcd_ep); 170 175 hcd_ep->td = data->tds[i]; 176 /* Clear possible ED HALT */ 177 data->ed->td_head &= ~ED_TDHEAD_HALTED_FLAG; 178 uint32_t pa = addr_to_phys(hcd_ep->td); 179 assert(pa == (data->ed->td_head & ED_TDHEAD_PTR_MASK)); 180 assert(pa == (data->ed->td_tail & ED_TDTAIL_PTR_MASK)); 171 181 172 182 return true;
Note:
See TracChangeset
for help on using the changeset viewer.