replace long with tbus
This commit is contained in:
parent
ebdb838a63
commit
a8a2f0a0b0
10
xup/xup.c
10
xup/xup.c
@ -179,7 +179,7 @@ lib_mod_connect(struct mod* mod)
|
|||||||
out_uint32_le(s, 0);
|
out_uint32_le(s, 0);
|
||||||
out_uint32_le(s, 0);
|
out_uint32_le(s, 0);
|
||||||
s_mark_end(s);
|
s_mark_end(s);
|
||||||
len = s->end - s->data;
|
len = (int)(s->end - s->data);
|
||||||
s_pop_layer(s, iso_hdr);
|
s_pop_layer(s, iso_hdr);
|
||||||
out_uint32_le(s, len);
|
out_uint32_le(s, len);
|
||||||
lib_send(mod, s->data, len);
|
lib_send(mod, s->data, len);
|
||||||
@ -198,8 +198,8 @@ lib_mod_connect(struct mod* mod)
|
|||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
/* return error */
|
/* return error */
|
||||||
int DEFAULT_CC
|
int DEFAULT_CC
|
||||||
lib_mod_event(struct mod* mod, int msg, long param1, long param2,
|
lib_mod_event(struct mod* mod, int msg, tbus param1, tbus param2,
|
||||||
long param3, long param4)
|
tbus param3, tbus param4)
|
||||||
{
|
{
|
||||||
struct stream* s;
|
struct stream* s;
|
||||||
int len;
|
int len;
|
||||||
@ -216,7 +216,7 @@ lib_mod_event(struct mod* mod, int msg, long param1, long param2,
|
|||||||
out_uint32_le(s, param3);
|
out_uint32_le(s, param3);
|
||||||
out_uint32_le(s, param4);
|
out_uint32_le(s, param4);
|
||||||
s_mark_end(s);
|
s_mark_end(s);
|
||||||
len = s->end - s->data;
|
len = (int)(s->end - s->data);
|
||||||
s_pop_layer(s, iso_hdr);
|
s_pop_layer(s, iso_hdr);
|
||||||
out_uint32_le(s, len);
|
out_uint32_le(s, len);
|
||||||
rv = lib_send(mod, s->data, len);
|
rv = lib_send(mod, s->data, len);
|
||||||
@ -448,7 +448,7 @@ mod_init(void)
|
|||||||
|
|
||||||
mod = (struct mod*)g_malloc(sizeof(struct mod), 1);
|
mod = (struct mod*)g_malloc(sizeof(struct mod), 1);
|
||||||
mod->size = sizeof(struct mod);
|
mod->size = sizeof(struct mod);
|
||||||
mod->handle = (long)mod;
|
mod->handle = (tbus)mod;
|
||||||
mod->mod_connect = lib_mod_connect;
|
mod->mod_connect = lib_mod_connect;
|
||||||
mod->mod_start = lib_mod_start;
|
mod->mod_start = lib_mod_start;
|
||||||
mod->mod_event = lib_mod_event;
|
mod->mod_event = lib_mod_event;
|
||||||
|
14
xup/xup.h
14
xup/xup.h
@ -33,8 +33,8 @@ struct mod
|
|||||||
/* client functions */
|
/* client functions */
|
||||||
int (*mod_start)(struct mod* v, int w, int h, int bpp);
|
int (*mod_start)(struct mod* v, int w, int h, int bpp);
|
||||||
int (*mod_connect)(struct mod* v);
|
int (*mod_connect)(struct mod* v);
|
||||||
int (*mod_event)(struct mod* v, int msg, long param1, long param2,
|
int (*mod_event)(struct mod* v, int msg, tbus param1, tbus param2,
|
||||||
long param3, long param4);
|
tbus param3, tbus param4);
|
||||||
int (*mod_signal)(struct mod* v);
|
int (*mod_signal)(struct mod* v);
|
||||||
int (*mod_end)(struct mod* v);
|
int (*mod_end)(struct mod* v);
|
||||||
int (*mod_set_param)(struct mod* v, char* name, char* value);
|
int (*mod_set_param)(struct mod* v, char* name, char* value);
|
||||||
@ -42,7 +42,7 @@ struct mod
|
|||||||
int (*mod_get_wait_objs)(struct mod* v, tbus* read_objs, int* rcount,
|
int (*mod_get_wait_objs)(struct mod* v, tbus* read_objs, int* rcount,
|
||||||
tbus* write_objs, int* wcount, int* timeout);
|
tbus* write_objs, int* wcount, int* timeout);
|
||||||
int (*mod_check_wait_objs)(struct mod* v);
|
int (*mod_check_wait_objs)(struct mod* v);
|
||||||
long mod_dumby[100 - 9]; /* align, 100 minus the number of mod
|
tbus mod_dumby[100 - 9]; /* align, 100 minus the number of mod
|
||||||
functions above */
|
functions above */
|
||||||
/* server functions */
|
/* server functions */
|
||||||
int (*server_begin_update)(struct mod* v);
|
int (*server_begin_update)(struct mod* v);
|
||||||
@ -83,12 +83,12 @@ struct mod
|
|||||||
int (*server_get_channel_id)(struct mod* v, char* name);
|
int (*server_get_channel_id)(struct mod* v, char* name);
|
||||||
int (*server_send_to_channel)(struct mod* v, int channel_id,
|
int (*server_send_to_channel)(struct mod* v, int channel_id,
|
||||||
char* data, int data_len);
|
char* data, int data_len);
|
||||||
long server_dumby[100 - 24]; /* align, 100 minus the number of server
|
tbus server_dumby[100 - 24]; /* align, 100 minus the number of server
|
||||||
functions above */
|
functions above */
|
||||||
/* common */
|
/* common */
|
||||||
long handle; /* pointer to self as long */
|
tbus handle; /* pointer to self as long */
|
||||||
long wm;
|
tbus wm;
|
||||||
long painter;
|
tbus painter;
|
||||||
int sck;
|
int sck;
|
||||||
/* mod data */
|
/* mod data */
|
||||||
int width;
|
int width;
|
||||||
|
Loading…
Reference in New Issue
Block a user