From f38ecdcb3f71d0b2a17867c6a3fd38e379b82868 Mon Sep 17 00:00:00 2001
From: Jef Driesen <jefdriesen@users.sourceforge.net>
Date: Fri, 20 Feb 2009 12:12:30 +0000
Subject: [PATCH] Remove all legacy event code.

---
 src/device-private.h        | 20 ------------
 src/device.c                | 65 -------------------------------------
 src/device.h                |  3 --
 src/libdivecomputer.symbols |  1 -
 4 files changed, 89 deletions(-)

diff --git a/src/device-private.h b/src/device-private.h
index a93c429..51076a9 100644
--- a/src/device-private.h
+++ b/src/device-private.h
@@ -39,9 +39,6 @@ typedef struct device_backend_t device_backend_t;
 
 struct device_t {
 	const device_backend_t *backend;
-	// Progress callback data.
-	progress_callback_t progress;
-	void *userdata;
 	// Event notifications.
 	unsigned int event_mask;
 	device_event_callback_t event_callback;
@@ -66,23 +63,6 @@ struct device_backend_t {
 	device_status_t (*close) (device_t *device);
 };
 
-#define INFINITE ((unsigned int)-1)
-
-typedef struct device_progress_state_t {
-	progress_callback_t callback;
-	void *userdata;
-	unsigned int current, maximum;
-} device_progress_state_t;
-
-void
-progress_init (device_progress_state_t *progress, device_t *device, unsigned int maximum);
-
-void
-progress_event (device_progress_state_t *progress, device_event_t event, unsigned int value);
-
-void
-progress_set_maximum (device_progress_state_t *progress, unsigned int value);
-
 void
 device_init (device_t *device, const device_backend_t *backend);
 
diff --git a/src/device.c b/src/device.c
index 181021c..5e15b48 100644
--- a/src/device.c
+++ b/src/device.c
@@ -29,8 +29,6 @@ void
 device_init (device_t *device, const device_backend_t *backend)
 {
 	device->backend = backend;
-	device->progress = NULL;
-	device->userdata = NULL;
 
 	device->event_mask = 0;
 	device->event_callback = NULL;
@@ -48,19 +46,6 @@ device_get_type (device_t *device)
 }
 
 
-device_status_t
-device_set_progress (device_t *device, progress_callback_t callback, void *userdata)
-{
-	if (device == NULL)
-		return DEVICE_STATUS_UNSUPPORTED;
-
-	device->progress = callback;
-	device->userdata = userdata;
-
-	return DEVICE_STATUS_SUCCESS;
-}
-
-
 device_status_t
 device_set_events (device_t *device, unsigned int events, device_event_callback_t callback, void *userdata)
 {
@@ -166,56 +151,6 @@ device_close (device_t *device)
 }
 
 
-void
-progress_init (device_progress_state_t *progress, device_t *device, unsigned int maximum)
-{
-	if (progress == NULL)
-		return;
-
-	progress->callback = (device ? device->progress : NULL);
-	progress->userdata = (device ? device->userdata : NULL);
-	progress->maximum = maximum;
-	progress->current = 0;
-}
-
-
-void
-progress_event (device_progress_state_t *progress, device_event_t event, unsigned int value)
-{
-	if (progress == NULL)
-		return;
-
-	switch (event) {
-	case DEVICE_EVENT_WAITING:
-		break;
-	case DEVICE_EVENT_PROGRESS:
-		progress->current += value;
-		break;
-	default:
-		return;
-	}
-
-	assert (progress->maximum != 0);
-	assert (progress->maximum >= progress->current);
-
-	if (progress->callback)
-		progress->callback (event, progress->current, progress->maximum, progress->userdata);
-}
-
-
-void
-progress_set_maximum (device_progress_state_t *progress, unsigned int value)
-{
-	if (progress == NULL)
-		return;
-
-	assert (value <= progress->maximum);
-	assert (value >= progress->current);
-
-	progress->maximum = value;
-}
-
-
 void
 device_event_emit (device_t *device, device_event_t event, const void *data)
 {
diff --git a/src/device.h b/src/device.h
index 2c20d91..3c87a40 100644
--- a/src/device.h
+++ b/src/device.h
@@ -71,12 +71,9 @@ typedef struct device_progress_t {
 typedef void (*device_event_callback_t) (device_t *device, device_event_t event, const void *data, void *userdata);
 
 typedef int (*dive_callback_t) (const unsigned char *data, unsigned int size, void *userdata);
-typedef void (*progress_callback_t) (device_event_t event, unsigned int current, unsigned int maximum, void *userdata);
 
 device_type_t device_get_type (device_t *device);
 
-device_status_t device_set_progress (device_t *device, progress_callback_t callback, void *userdata);
-
 device_status_t device_set_events (device_t *device, unsigned int events, device_event_callback_t callback, void *userdata);
 
 device_status_t device_handshake (device_t *device, unsigned char data[], unsigned int size);
diff --git a/src/libdivecomputer.symbols b/src/libdivecomputer.symbols
index 2e22ebc..04f19bc 100644
--- a/src/libdivecomputer.symbols
+++ b/src/libdivecomputer.symbols
@@ -23,7 +23,6 @@ device_foreach
 device_get_type
 device_handshake
 device_read
-device_set_progress
 device_set_events
 device_version
 device_write