Remove old unused fuji implementation

Mostly wasn't used, or had been improved in the fudge repo
petabyt · Nov 21, 2023 · fe66e93 · fe66e93
1 parent 547bf60
commit fe66e93
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 136 deletions.
diff --git a/src/cl_ops.h b/src/cl_ops.h
@@ -86,16 +86,6 @@ int ptp_ml_get_bmp_lv(struct PtpRuntime *r, uint32_t **buffer_ptr);
 int ptp_chdk_get_version(struct PtpRuntime *r);
 int ptp_chdk_upload_file(struct PtpRuntime *r, char *input, char *dest);
 
-// Fuji vendor version of SendObjectInfo - same as standard, but no parameters
-int ptp_fuji_send_object_info(struct PtpRuntime *r, struct PtpObjectInfo *oi);
-int ptp_fuji_send_object(struct PtpRuntime *r, struct PtpObjectInfo *oi, void *data, int length);
-
-// Fujifilm IP-only functions
-int ptpip_fuji_init(struct PtpRuntime *r, char *device_name);
-int ptpip_fuji_get_events(struct PtpRuntime *r);
-int ptpip_fuji_wait_unlocked(struct PtpRuntime *r);
-int ptpip_fuji_get_object_info(struct PtpRuntime *r, uint32_t handle, struct PtpFujiObjectInfo *oi);
-
 // Canon advanced extensions - available in canon-adv.c
 int ptp_eos_activate_command(struct PtpRuntime *r);
 int ptp_eos_exec_evproc(struct PtpRuntime *r, void *data, int length, int expect_return);

diff --git a/src/conv.c b/src/conv.c
@@ -156,7 +156,7 @@ struct CanonAperture {
 	int value;
 	int data;
 }canon_aperture[] = {
-	{12, 0xd},
+	{12, 0xd}, // TODO: standard PTP scales this by 100
 	{14, 0x10},
 	{16, 0x13},
 	{18, 0x15},

diff --git a/src/fuji.c b/src/fuji.c
diff --git a/src/ip.c b/src/ip.c
@@ -137,7 +137,6 @@ int ptpip_close(struct PtpRuntime *r) {
 
 int ptpip_cmd_write(struct PtpRuntime *r, void *data, int size) {
 	int result = write(r->fd, data, size);
-	//printf("cmd: write %d bytes\n", result);
 	//for (int i = 0; i < result; i++) { printf("%02X ", ((uint8_t *)data)[i]); } puts("");
 	if (result < 0) {
 		return -1;
@@ -148,7 +147,6 @@ int ptpip_cmd_write(struct PtpRuntime *r, void *data, int size) {
 
 int ptpip_cmd_read(struct PtpRuntime *r, void *data, int size) {
 	int result = read(r->fd, data, size);
-	printf("cmd: Read %d bytes\n", result);
 	//for (int i = 0; i < result; i++) { printf("%02X ", ((uint8_t *)data)[i]); } puts("");
 	if (result < 0) {
 		return -1;