gpointer user_data)
{
struct aoview_serial *serial = (struct aoview_serial *) source;
+ aoview_serial_callback func = (aoview_serial_callback) callback;
gint revents = serial->poll_fd.revents;
if (revents & G_IO_IN)
if (revents & G_IO_OUT)
aoview_buf_flush(&serial->out_buf, serial->fd);
- if (callback && (revents & G_IO_IN))
- (*callback)(user_data);
+ if (func)
+ (*func)(user_data, serial, revents);
return TRUE;
}
serial->poll_fd.events = G_IO_IN | G_IO_OUT | G_IO_HUP | G_IO_ERR;
g_source_attach(&serial->source, NULL);
g_source_add_poll(&serial->source,&serial->poll_fd);
+ aoview_serial_set_callback(serial, NULL);
return serial;
}
aoview_serial_close(struct aoview_serial *serial)
{
g_source_remove_poll(&serial->source, &serial->poll_fd);
+ close(serial->fd);
g_source_destroy(&serial->source);
- g_source_unref(&serial->source);
}
void
aoview_serial_set_callback(struct aoview_serial *serial,
- GSourceFunc func,
- gpointer data,
- GDestroyNotify notify)
+ aoview_serial_callback func)
{
- g_source_set_callback(&serial->source, func, data, notify);
+ g_source_set_callback(&serial->source, (GSourceFunc) func, serial, NULL);
}