← Back to branch summary

~m-lombardi85/exfat-helenos/exfat

« back to all changes in this revision

Viewing changes to uspace/drv/bus/usb/uhci/transfer_list.c

  • Committer: Maurizio Lombardi
  • Date: 2012-02-27 12:58:00 UTC
  • mfrom: (1309.1.96 helenos-mainline)
  • Revision ID: m.lombardi85@gmail.com-20120227125800-n16me6glkloj4vl1
Merge mainline changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
uspace/drv/bus/usb/uhci/transfer_list.c
109
109
{
110
110
        assert(instance);
111
111
        assert(uhci_batch);
112
 
        usb_log_debug2("Queue %s: Adding batch(%p).\n", instance->name,
113
 
            uhci_batch->usb_batch);
 
112
        usb_log_debug2("Batch %p adding to queue %s.\n",
 
113
            uhci_batch->usb_batch, instance->name);
114
114
 
115
115
        fibril_mutex_lock(&instance->guard);
116
116
 
138
138
        /* Add to the driver's list */
139
139
        list_append(&uhci_batch->link, &instance->batch_list);
140
140
 
141
 
        usb_log_debug2("Batch %p " USB_TRANSFER_BATCH_FMT " scheduled in queue %s.\n",
142
 
            uhci_batch, USB_TRANSFER_BATCH_ARGS(*uhci_batch->usb_batch),
143
 
            instance->name);
 
141
        usb_log_debug2("Batch %p " USB_TRANSFER_BATCH_FMT
 
142
            " scheduled in queue %s.\n", uhci_batch->usb_batch,
 
143
            USB_TRANSFER_BATCH_ARGS(*uhci_batch->usb_batch), instance->name);
144
144
        fibril_mutex_unlock(&instance->guard);
145
145
}
146
146
/*----------------------------------------------------------------------------*/
204
204
        assert(uhci_batch->qh);
205
205
        assert(fibril_mutex_is_locked(&instance->guard));
206
206
 
207
 
        usb_log_debug2("Queue %s: removing batch(%p).\n",
208
 
            instance->name, uhci_batch->usb_batch);
 
207
        usb_log_debug2("Batch %p removing from queue %s.\n",
 
208
            uhci_batch->usb_batch, instance->name);
209
209
 
210
210
        /* Assume I'm the first */
211
211
        const char *qpos = "FIRST";
227
227
        /* Remove from the batch list */
228
228
        list_remove(&uhci_batch->link);
229
229
        usb_log_debug2("Batch %p " USB_TRANSFER_BATCH_FMT " removed (%s) "
230
 
            "from %s, next: %x.\n",
231
 
            uhci_batch, USB_TRANSFER_BATCH_ARGS(*uhci_batch->usb_batch),
 
230
            "from %s, next: %x.\n", uhci_batch->usb_batch,
 
231
            USB_TRANSFER_BATCH_ARGS(*uhci_batch->usb_batch),
232
232
            qpos, instance->name, uhci_batch->qh->next);
233
233
}
234
234
/**