Ignore:
Timestamp:
2011-08-21T13:07:35Z (13 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
00aece0, f1a9e87
Parents:
86a34d3e (diff), a6480d5 (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.
Message:

Merge mainline changes.

File:
1 moved

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/arch/abs32le/include/elf_linux.h

    r86a34d3e rbd5f3b7  
    11/*
    2  * Copyright (c) 2011 Vojtech Horky
     2 * Copyright (c) 2011 Jiri Svoboda
    33 * All rights reserved.
    44 *
     
    2727 */
    2828
    29 /** @addtogroup drvusbmast
     29/** @addtogroup libcabs32le
    3030 * @{
    3131 */
    3232/** @file
    33  * Generic functions for USB mass storage.
    3433 */
    3534
    36 #ifndef USB_USBMAST_MAST_H_
    37 #define USB_USBMAST_MAST_H_
     35#ifndef LIBC_abs32le_ELF_LINUX_H_
     36#define LBIC_abs32le_ELF_LINUX_H_
    3837
    39 #include <scsi/spc.h>
     38#include <libarch/istate.h>
    4039#include <sys/types.h>
    41 #include <usb/usb.h>
    42 #include <usb/dev/pipes.h>
    43 #include <usb/dev/driver.h>
    4440
    45 #define BULK_IN_EP 0
    46 #define BULK_OUT_EP 1
     41typedef struct {
     42} elf_regs_t;
    4743
    48 int usb_massstor_data_in(usb_device_t *dev, uint32_t, uint8_t, void *,
    49     size_t, void *, size_t, size_t *);
    50 int usb_massstor_reset(usb_device_t *);
    51 void usb_massstor_reset_recovery(usb_device_t *);
    52 int usb_massstor_get_max_lun(usb_device_t *);
    53 size_t usb_masstor_get_lun_count(usb_device_t *);
     44static inline void istate_to_elf_regs(istate_t *istate, elf_regs_t *elf_regs)
     45{
     46        (void) istate; (void) elf_regs;
     47}
    5448
    5549#endif
    5650
    57 /**
    58  * @}
     51/** @}
    5952 */
Note: See TracChangeset for help on using the changeset viewer.