darktable/libgphoto2
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* library.c: added HP PhotoSmart 850, cosmetics

Browse Source 
* ptp-pack.c: fixed a bug in ptp_unpack_DI(), totallen could
	  be bigger than uint8_t


git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@6032 67ed7778-7388-44ab-90cf-0a291f65f57c
This commit is contained in:
Mariusz Woloszyn
2003-01-10 18:16:05 +00:00
parent 464744dda0
commit a2fecb6820
3 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
camlibs/ptp/ChangeLog
View File

@@ -1,3 +1,9 @@
2003-01-10 Mariusz Woloszyn
* library.c: added HP PhotoSmart 850, cosmetics
2003-01-08 Mariusz Woloszyn
* ptp-pack.c: fixed a bug in ptp_unpack_DI(), totallen could be
bigger than uint8_t
2002-12-10 Mariusz Woloszyn
* library.c: better handling of foldername to handler conversion
(storage id matching was missing)

15
camlibs/ptp/library.c
View File

@@ -219,16 +219,17 @@ static struct {
/* HP PTP cameras */
{"HP PhotoSmart 318 (PTP mode)", 0x03f0, 0x6302},
{"HP PhotoSmart 612 (PTP mode)", 0x03f0, 0x6302},
{"HP PhotoSmart 715 (PTP mode)", 0x03f0, 0x6402},
{"HP PhotoSmart 715 (PTP mode)", 0x03f0, 0x6402},
{"HP PhotoSmart 850 (PTP mode)", 0x03f0, 0x4302},
/* I got information that all SONY PTP cameras use the same
product/vendor IDs */
{"Sony DSC-P5 (PTP mode)", 0x054c, 0x004e},
{"Sony DSC-F707V (PTP mode)", 0x054c, 0x004e},
{"Sony DSC-P30 (PTP mode)", 0x054c, 0x004e},
{"Sony DSC-P50 (PTP mode)", 0x054c, 0x004e},
{"Sony DSC-S75 (PTP mode)", 0x054c, 0x004e},
{"Sony DSC-S85 (PTP mode)", 0x054c, 0x004e},
{"Sony MVC-CD300 (PTP mode)", 0x054c, 0x004e},
{"Sony DSC-P50 (PTP mode)", 0x054c, 0x004e},
{"Sony DSC-S75 (PTP mode)", 0x054c, 0x004e},
{"Sony DSC-S85 (PTP mode)", 0x054c, 0x004e},
{"Sony MVC-CD300 (PTP mode)", 0x054c, 0x004e},
/* Nikon D100 has a PTP mode: westin 2002.10.16 */
{"Nikon DSC D100 (PTP mode)", 0x04b0, 0x0402},
@@ -236,8 +237,8 @@ static struct {
{"Nikon Coolpix 5700 (PTP mode)", 0x04b0, 0x010d},
/* Nikon Coolpix 885: S. Anderson, 19 nov 2002 */
{"Nikon Coolpix 885 (PTP mode)", 0x04b0, 0x0112},
/* Nikon Coolpix 4300: Marco Rodriguez, 10 dic 2002 */
{"Nikon Coolpix 4300 (PTP mode)", 0x04b0, 0x010f},
/* Nikon Coolpix 4300: Marco Rodriguez, 10 dic 2002 */
{"Nikon Coolpix 4300 (PTP mode)", 0x04b0, 0x010f},

3
camlibs/ptp/ptp-pack.c
View File

@@ -135,7 +135,8 @@ ptp_unpack_uint16_t_array(PTPParams *params, PTPReq *req, uint16_t offset, uint1
static inline void
ptp_unpack_DI (PTPParams *params, PTPReq *req, PTPDeviceInfo *di)
{
uint8_t len, totallen;
uint8_t len;
unsigned int totallen;
di->StaqndardVersion = dtoh16a(&req->data[PTP_di_StandardVersion]);
di->VendorExtensionID =