Changeset 83c439c in mainline for uspace/drv/uhci-hcd/batch.c


Ignore:
Timestamp:
2011-02-12T02:12:52Z (14 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
2806cd2
Parents:
7dd3318
Message:

Rename tracker⇒batch

File:
1 moved

Legend:

Unmodified
Added
Removed

  • uspace/drv/uhci-hcd/batch.c

    r7dd3318 r83c439c  
    3636#include <usb/debug.h>
    3737
    38 #include "tracker.h"
     38#include "batch.h"
    3939#include "transfer_list.h"
    4040#include "uhci.h"
    … …  
    4343#define DEFAULT_ERROR_COUNT 3
    4444
    45 static int tracker_schedule(tracker_t *instance);
    46 
    47 static void tracker_call_in(tracker_t *instance);
    48 static void tracker_call_out(tracker_t *instance);
    49 static void tracker_call_in_and_dispose(tracker_t *instance);
    50 static void tracker_call_out_and_dispose(tracker_t *instance);
    51 
    52 
    53 tracker_t * tracker_get(device_t *dev, usb_target_t target,
     45static int batch_schedule(batch_t *instance);
     46
     47static void batch_call_in(batch_t *instance);
     48static void batch_call_out(batch_t *instance);
     49static void batch_call_in_and_dispose(batch_t *instance);
     50static void batch_call_out_and_dispose(batch_t *instance);
     51
     52
     53batch_t * batch_get(device_t *dev, usb_target_t target,
    5454    usb_transfer_type_t transfer_type, size_t max_packet_size,
    5555    dev_speed_t speed, char *buffer, size_t size,
    … …  
    6161        assert(func_in != NULL || func_out != NULL);
    6262
    63         tracker_t *instance = malloc(sizeof(tracker_t));
     63        batch_t *instance = malloc(sizeof(batch_t));
    6464        if (instance == NULL) {
    65                 usb_log_error("Failed to allocate tracker instance.\n");
     65                usb_log_error("Failed to allocate batch instance.\n");
    6666                return NULL;
    6767        }
    … …  
    136136}
    137137/*----------------------------------------------------------------------------*/
    138 bool tracker_is_complete(tracker_t *instance)
     138bool batch_is_complete(batch_t *instance)
    139139{
    140140        assert(instance);
    … …  
    157157}
    158158/*----------------------------------------------------------------------------*/
    159 void tracker_control_write(tracker_t *instance)
     159void batch_control_write(batch_t *instance)
    160160{
    161161        assert(instance);
    … …  
    187187            0, 1, false, instance->target, USB_PID_IN, NULL, NULL);
    188188
    189         instance->next_step = tracker_call_out_and_dispose;
    190         tracker_schedule(instance);
    191 }
    192 /*----------------------------------------------------------------------------*/
    193 void tracker_control_read(tracker_t *instance)
     189        instance->next_step = batch_call_out_and_dispose;
     190        batch_schedule(instance);
     191}
     192/*----------------------------------------------------------------------------*/
     193void batch_control_read(batch_t *instance)
    194194{
    195195        assert(instance);
    … …  
    218218            0, 1, false, instance->target, USB_PID_OUT, NULL, NULL);
    219219
    220         instance->next_step = tracker_call_in_and_dispose;
    221         tracker_schedule(instance);
    222 }
    223 /*----------------------------------------------------------------------------*/
    224 void tracker_interrupt_in(tracker_t *instance)
     220        instance->next_step = batch_call_in_and_dispose;
     221        batch_schedule(instance);
     222}
     223/*----------------------------------------------------------------------------*/
     224void batch_interrupt_in(batch_t *instance)
    225225{
    226226        assert(instance);
    … …  
    240240        }
    241241
    242         instance->next_step = tracker_call_in_and_dispose;
    243         tracker_schedule(instance);
    244 }
    245 /*----------------------------------------------------------------------------*/
    246 void tracker_interrupt_out(tracker_t *instance)
     242        instance->next_step = batch_call_in_and_dispose;
     243        batch_schedule(instance);
     244}
     245/*----------------------------------------------------------------------------*/
     246void batch_interrupt_out(batch_t *instance)
    247247{
    248248        assert(instance);
    … …  
    264264        }
    265265
    266         instance->next_step = tracker_call_out_and_dispose;
    267         tracker_schedule(instance);
    268 }
    269 /*----------------------------------------------------------------------------*/
    270 void tracker_call_in(tracker_t *instance)
     266        instance->next_step = batch_call_out_and_dispose;
     267        batch_schedule(instance);
     268}
     269/*----------------------------------------------------------------------------*/
     270void batch_call_in(batch_t *instance)
    271271{
    272272        assert(instance);
    … …  
    284284}
    285285/*----------------------------------------------------------------------------*/
    286 void tracker_call_out(tracker_t *instance)
     286void batch_call_out(batch_t *instance)
    287287{
    288288        assert(instance);
    … …  
    295295}
    296296/*----------------------------------------------------------------------------*/
    297 void tracker_call_in_and_dispose(tracker_t *instance)
    298 {
    299         assert(instance);
    300         tracker_call_in(instance);
    301         usb_log_debug("Disposing tracker: %p.\n", instance);
     297void batch_call_in_and_dispose(batch_t *instance)
     298{
     299        assert(instance);
     300        batch_call_in(instance);
     301        usb_log_debug("Disposing batch: %p.\n", instance);
    302302        free32(instance->tds);
    303303        free32(instance->qh);
    … …  
    307307}
    308308/*----------------------------------------------------------------------------*/
    309 void tracker_call_out_and_dispose(tracker_t *instance)
    310 {
    311         assert(instance);
    312         tracker_call_out(instance);
    313         usb_log_debug("Disposing tracker: %p.\n", instance);
     309void batch_call_out_and_dispose(batch_t *instance)
     310{
     311        assert(instance);
     312        batch_call_out(instance);
     313        usb_log_debug("Disposing batch: %p.\n", instance);
    314314        free32(instance->tds);
    315315        free32(instance->qh);
    … …  
    319319}
    320320/*----------------------------------------------------------------------------*/
    321 int tracker_schedule(tracker_t *instance)
     321int batch_schedule(batch_t *instance)
    322322{
    323323        assert(instance);
    … …  
    328328/*----------------------------------------------------------------------------*/
    329329/* DEPRECATED FUNCTIONS NEEDED BY THE OLD API */
    330 void tracker_control_setup_old(tracker_t *instance)
     330void batch_control_setup_old(batch_t *instance)
    331331{
    332332        assert(instance);
    … …  
    338338            USB_PID_SETUP, instance->setup_buffer, NULL);
    339339
    340         instance->next_step = tracker_call_out_and_dispose;
    341         tracker_schedule(instance);
    342 }
    343 /*----------------------------------------------------------------------------*/
    344 void tracker_control_write_data_old(tracker_t *instance)
     340        instance->next_step = batch_call_out_and_dispose;
     341        batch_schedule(instance);
     342}
     343/*----------------------------------------------------------------------------*/
     344void batch_control_write_data_old(batch_t *instance)
    345345{
    346346        assert(instance);
    347347        instance->packets -= 2;
    348         tracker_interrupt_out(instance);
    349 }
    350 /*----------------------------------------------------------------------------*/
    351 void tracker_control_read_data_old(tracker_t *instance)
     348        batch_interrupt_out(instance);
     349}
     350/*----------------------------------------------------------------------------*/
     351void batch_control_read_data_old(batch_t *instance)
    352352{
    353353        assert(instance);
    354354        instance->packets -= 2;
    355         tracker_interrupt_in(instance);
    356 }
    357 /*----------------------------------------------------------------------------*/
    358 void tracker_control_write_status_old(tracker_t *instance)
     355        batch_interrupt_in(instance);
     356}
     357/*----------------------------------------------------------------------------*/
     358void batch_control_write_status_old(batch_t *instance)
    359359{
    360360        assert(instance);
    … …  
    362362        transfer_descriptor_init(instance->tds, DEFAULT_ERROR_COUNT,
    363363            0, 1, false, instance->target, USB_PID_IN, NULL, NULL);
    364         instance->next_step = tracker_call_in_and_dispose;
    365         tracker_schedule(instance);
    366 }
    367 /*----------------------------------------------------------------------------*/
    368 void tracker_control_read_status_old(tracker_t *instance)
     364        instance->next_step = batch_call_in_and_dispose;
     365        batch_schedule(instance);
     366}
     367/*----------------------------------------------------------------------------*/
     368void batch_control_read_status_old(batch_t *instance)
    369369{
    370370        assert(instance);
    … …  
    372372        transfer_descriptor_init(instance->tds, DEFAULT_ERROR_COUNT,
    373373            0, 1, false, instance->target, USB_PID_OUT, NULL, NULL);
    374         instance->next_step = tracker_call_out_and_dispose;
    375         tracker_schedule(instance);
     374        instance->next_step = batch_call_out_and_dispose;
     375        batch_schedule(instance);
    376376}
    377377/**
Note: See TracChangeset for help on using the changeset viewer.