FlapJackApps/libdivecomputer
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove all legacy event code.

Browse Source
This commit is contained in:
Jef Driesen 2009-02-20 12:12:30 +00:00
parent 6b4663444b
commit f38ecdcb3f
4 changed files with 0 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/device-private.h
View File

@ -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);

65
src/device.c
View File

@ -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)
{

3
src/device.h
View File

@ -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);

1
src/libdivecomputer.symbols
View File

@ -23,7 +23,6 @@ device_foreach
device_get_type
device_handshake
device_read
device_set_progress
device_set_events
device_version
device_write