diff options
author | Linus Walleij <triad@df.lth.se> | 2009-08-23 21:50:39 +0000 |
---|---|---|
committer | Linus Walleij <triad@df.lth.se> | 2009-08-23 21:50:39 +0000 |
commit | d866d24d1673ba48ad2397908018b0761bb3beff (patch) | |
tree | 8926cb0ba90a7e23c9342fe1b1e364ec196cb64d /src/ptp.h | |
parent | 3fa653c013780f3c0a3258b681ea651d7a967be6 (diff) | |
download | libmtp-d866d24d1673ba48ad2397908018b0761bb3beff.tar.gz |
Various changes
Diffstat (limited to 'src/ptp.h')
-rw-r--r-- | src/ptp.h | 11 |
1 files changed, 8 insertions, 3 deletions
@@ -40,6 +40,11 @@ extern "C" { #define PTP_DL_BE 0xF0 #define PTP_DL_LE 0x0F +/* USB interface class */ +#ifndef USB_CLASS_PTP +#define USB_CLASS_PTP 6 +#endif + /* PTP request/response/event general PTP container (transport independent) */ struct _PTPContainer { @@ -1839,17 +1844,17 @@ typedef struct _PTPCanonEOSDeviceInfo { typedef struct _PTPParams PTPParams; -typedef uint16_t (* PTPDataGetFunc) (PTPParams* params, void* private, +typedef uint16_t (* PTPDataGetFunc) (PTPParams* params, void*priv, unsigned long wantlen, unsigned char *data, unsigned long *gotlen); -typedef uint16_t (* PTPDataPutFunc) (PTPParams* params, void* private, +typedef uint16_t (* PTPDataPutFunc) (PTPParams* params, void*priv, unsigned long sendlen, unsigned char *data, unsigned long *putlen); typedef struct _PTPDataHandler { PTPDataGetFunc getfunc; PTPDataPutFunc putfunc; - void *private; + void *priv; } PTPDataHandler; /* |