From d39c3fe52f99a8d58e9633ff4eeb0b3fbfe6136d Mon Sep 17 00:00:00 2001
From: Marcus Meissner <marcus@jet.franken.de>
Date: Mon, 9 Jan 2006 05:20:28 +0000
Subject: [PATCH] added simple nikon_getptpipinfo function, fixed typo

git-svn-id: https://svn.code.sf.net/p/gphoto/code/trunk/libgphoto2@8438 67ed7778-7388-44ab-90cf-0a291f65f57c
---
 camlibs/ptp2/ptp.c | 25 ++++++++++++++++++++++++-
 camlibs/ptp2/ptp.h |  1 +
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/camlibs/ptp2/ptp.c b/camlibs/ptp2/ptp.c
index 9abce5b12..1433028ed 100644
--- a/camlibs/ptp2/ptp.c
+++ b/camlibs/ptp2/ptp.c
@@ -1696,6 +1696,29 @@ ptp_nikon_device_ready (PTPParams* params)
         return ptp_transaction(params, &ptp, PTP_DP_NODATA, 0, NULL, NULL);
 }
 
+/**
+ * ptp_nikon_getptpipinfo:
+ *
+ * This command gets the ptpip info data.
+ *  
+ * params:	PTPParams*
+ *	unsigned char *data	- data
+ *	unsigned int size	- size of returned data
+ *
+ * Return values: Some PTP_RC_* code.
+ *
+ **/
+uint16_t
+ptp_nikon_getptpipinfo (PTPParams* params, unsigned char **data, unsigned int *size)
+{
+        PTPContainer ptp;
+        
+        PTP_CNT_INIT(ptp);
+        ptp.Code=PTP_OC_NIKON_GetDevicePTPIPInfo;
+        ptp.Nparam=0;
+        return ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, data, size);
+}
+
 /* Non PTP protocol functions */
 /* devinfo testing functions */
 
@@ -2246,7 +2269,7 @@ ptp_render_property_value(PTPParams* params, uint16_t dpc,
 		{PTP_DPC_CompressionSetting, 4, N_("RAW")},
 		{PTP_DPC_CompressionSetting, 5, N_("RAW + JPEG Basic")},
 		{PTP_DPC_WhiteBalance, 2, N_("Auto")},
-		{PTP_DPC_WhiteBalance, 6, N_("Incadescent")},
+		{PTP_DPC_WhiteBalance, 6, N_("Incandescent")},
 		{PTP_DPC_WhiteBalance, 5, N_("Fluorescent")},
 		{PTP_DPC_WhiteBalance, 4, N_("Daylight")},
 		{PTP_DPC_WhiteBalance, 7, N_("Flash")},
diff --git a/camlibs/ptp2/ptp.h b/camlibs/ptp2/ptp.h
index f8b5350e4..d61765be1 100644
--- a/camlibs/ptp2/ptp.h
+++ b/camlibs/ptp2/ptp.h
@@ -987,6 +987,7 @@ uint16_t ptp_canon_theme_download (PTPParams* params, uint32_t themenr,
 
 uint16_t ptp_nikon_curve_download (PTPParams* params, 
 				unsigned char **data, unsigned int *size);
+uint16_t ptp_nikon_getptpipinfo (PTPParams* params, unsigned char **data, unsigned int *size);
 uint16_t ptp_nikon_setcontrolmode (PTPParams* params, uint32_t mode);
 uint16_t ptp_nikon_capture (PTPParams* params, uint32_t x);
 uint16_t ptp_nikon_check_event (PTPParams* params, PTPUSBEventContainer **evt, int *evtcnt);