source: mainline/uspace/drv/uhci-hcd/batch.h@ ca56afa

lfn serial ticket/834-toolchain-update topic/msim-upgrade topic/simplify-dev-export
Last change on this file since ca56afa was eb1a2f4, checked in by Vojtech Horky <vojtechhorky@…>, 14 years ago

Merge mainline changes (DDF refactoring)

This merge includes DDF refactoring that brought multifunctional devices
(i.e. ddf_dev_t and ddf_fun_t). Please, see ticket #295 at HelenOS
upstream Trac.

The conflicts themselves were easy to solve (merely several renamings).

Changes to USB subsystem:

  • drivers uses ddf_dev_t and ddf_fun_t
  • different signatures of many library functions
  • several hacks around communication with parent device (now the communication is clearer and somehow what we have now is hack about other hacks)
    • will repair and clean later
  • maybe added some extra debugging messages (the diff has about 240K, and I admit I have no energy to double check that)

WARNING:

  • the diff is VERY long, recommended is viewing partial diffs of the merge (i.e. merges in mainline branch that lead to the parent one)
  • merging with your branches might involve huge renamings, sorry, no other way is possible

BUGS:

  • hub driver will not work (no function created)

GOOD NEWS:

  • QEMU keyboard seems to work with QEMU 0.13 and 0.14
  • we are up-to-date with mainline again
  • Property mode set to 100644
File size: 3.1 KB
RevLine 
[4192d3d6]1/*
2 * Copyright (c) 2011 Jan Vesely
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 *
9 * - Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer.
11 * - Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in the
13 * documentation and/or other materials provided with the distribution.
14 * - The name of the author may not be used to endorse or promote products
15 * derived from this software without specific prior written permission.
16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
18 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
19 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
20 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
21 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
22 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
23 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */
28/** @addtogroup usb
29 * @{
30 */
31/** @file
32 * @brief UHCI driver
33 */
[83c439c]34#ifndef DRV_UHCI_BATCH_H
35#define DRV_UHCI_BATCH_H
[4192d3d6]36
37#include <adt/list.h>
38
39#include <usbhc_iface.h>
40#include <usb/usb.h>
41
42#include "uhci_struct/transfer_descriptor.h"
[7dd3318]43#include "uhci_struct/queue_head.h"
[4192d3d6]44
45typedef enum {
46 LOW_SPEED,
47 FULL_SPEED,
48} dev_speed_t;
49
[83c439c]50typedef struct batch
[4192d3d6]51{
52 link_t link;
[7dd3318]53 dev_speed_t speed;
[4192d3d6]54 usb_target_t target;
[9a818a9]55 usb_transfer_type_t transfer_type;
[4192d3d6]56 union {
57 usbhc_iface_transfer_in_callback_t callback_in;
58 usbhc_iface_transfer_out_callback_t callback_out;
59 };
60 void *arg;
[7dd3318]61 char *transport_buffer;
62 char *setup_buffer;
63 size_t setup_size;
[4192d3d6]64 char *buffer;
65 size_t buffer_size;
66 size_t max_packet_size;
[7dd3318]67 size_t packets;
68 size_t transfered_size;
69 int error;
[eb1a2f4]70 ddf_fun_t *fun;
[7dd3318]71 queue_head_t *qh;
72 transfer_descriptor_t *tds;
[83c439c]73 void (*next_step)(struct batch*);
74} batch_t;
[4192d3d6]75
[eb1a2f4]76batch_t * batch_get(ddf_fun_t *fun, usb_target_t target,
[9a818a9]77 usb_transfer_type_t transfer_type, size_t max_packet_size,
78 dev_speed_t speed, char *buffer, size_t size,
[7dd3318]79 char *setup_buffer, size_t setup_size,
[4192d3d6]80 usbhc_iface_transfer_in_callback_t func_in,
81 usbhc_iface_transfer_out_callback_t func_out, void *arg);
82
[83c439c]83bool batch_is_complete(batch_t *instance);
[7dd3318]84
[83c439c]85void batch_control_write(batch_t *instance);
[4192d3d6]86
[83c439c]87void batch_control_read(batch_t *instance);
[4192d3d6]88
[83c439c]89void batch_interrupt_in(batch_t *instance);
[4192d3d6]90
[83c439c]91void batch_interrupt_out(batch_t *instance);
[4192d3d6]92
[da17cf0]93/* DEPRECATED FUNCTIONS NEEDED BY THE OLD API */
[83c439c]94void batch_control_setup_old(batch_t *instance);
[da17cf0]95
[83c439c]96void batch_control_write_data_old(batch_t *instance);
[da17cf0]97
[83c439c]98void batch_control_read_data_old(batch_t *instance);
[da17cf0]99
[83c439c]100void batch_control_write_status_old(batch_t *instance);
[da17cf0]101
[83c439c]102void batch_control_read_status_old(batch_t *instance);
[4192d3d6]103#endif
104/**
105 * @}
106 */
Note: See TracBrowser for help on using the repository browser.