Converted u8_t to uint8_t and u16_t to uint16_t in the apps directory.
This commit is contained in:
Nicholas J Humfrey
Mariano Alvira
parent
1cda3da17e
commit
efab964451
61 changed files with 287 additions and 287 deletions
|
|
@ -39,12 +39,12 @@
|
|||
|
||||
struct vnc_viewer_state;
|
||||
|
||||
/*typedef unsigned long u32_t;*/
|
||||
/*typedef unsigned long uint32_t;*/
|
||||
|
||||
void vnc_viewer_init(void);
|
||||
void vnc_viewer_appcall(void *nullptr);
|
||||
|
||||
void vnc_viewer_connect(u16_t *server, u8_t display);
|
||||
void vnc_viewer_connect(uint16_t *server, uint8_t display);
|
||||
void vnc_viewer_close(void);
|
||||
|
||||
/* Callback: redraws the VNC viewer bitmap area. */
|
||||
|
|
@ -63,9 +63,9 @@ void vnc_viewer_refresh(void);
|
|||
#define VNC_VIEWER_POST_UPDATERQ_EVENT(x1,y1,x2,y2) \
|
||||
vnc_viewer_post_event(VNC_UPDATERQ_EVENT, x1, y1, x2, y2)
|
||||
|
||||
void vnc_viewer_post_event(u8_t event,
|
||||
u16_t data1, u16_t data2,
|
||||
u16_t data3, u16_t data4);
|
||||
void vnc_viewer_post_event(uint8_t event,
|
||||
uint16_t data1, uint16_t data2,
|
||||
uint16_t data3, uint16_t data4);
|
||||
|
||||
/* UIP_APPCALL: the name of the application function. This function
|
||||
must return void and take no arguments (i.e., C type "void
|
||||
|
|
@ -75,22 +75,22 @@ void vnc_viewer_post_event(u8_t event,
|
|||
#endif
|
||||
|
||||
struct vnc_key_event {
|
||||
u8_t down;
|
||||
u16_t key;
|
||||
uint8_t down;
|
||||
uint16_t key;
|
||||
};
|
||||
|
||||
struct vnc_pointer_event {
|
||||
u8_t buttonmask;
|
||||
u16_t x, y;
|
||||
uint8_t buttonmask;
|
||||
uint16_t x, y;
|
||||
};
|
||||
|
||||
struct vnc_updaterq_event {
|
||||
u16_t x, y;
|
||||
u16_t w, h;
|
||||
uint16_t x, y;
|
||||
uint16_t w, h;
|
||||
};
|
||||
|
||||
struct vnc_event {
|
||||
u8_t type;
|
||||
uint8_t type;
|
||||
union {
|
||||
struct vnc_key_event key;
|
||||
struct vnc_pointer_event ptr;
|
||||
|
|
@ -133,34 +133,34 @@ enum vnc_rectstate {
|
|||
};
|
||||
|
||||
struct vnc_viewer_state {
|
||||
u8_t close;
|
||||
u16_t w, h;
|
||||
uint8_t close;
|
||||
uint16_t w, h;
|
||||
|
||||
u8_t sendmsg;
|
||||
uint8_t sendmsg;
|
||||
|
||||
u8_t waitmsg;
|
||||
uint8_t waitmsg;
|
||||
|
||||
u16_t rectsleft;
|
||||
uint16_t rectsleft;
|
||||
|
||||
u8_t rectstate;
|
||||
u32_t rectstateleft;
|
||||
u16_t rectstatex, rectstatey;
|
||||
u16_t rectstateh, rectstatew;
|
||||
u16_t rectstatex0, rectstatey0;
|
||||
u16_t rectstatex2, rectstatey2;
|
||||
uint8_t rectstate;
|
||||
uint32_t rectstateleft;
|
||||
uint16_t rectstatex, rectstatey;
|
||||
uint16_t rectstateh, rectstatew;
|
||||
uint16_t rectstatex0, rectstatey0;
|
||||
uint16_t rectstatex2, rectstatey2;
|
||||
|
||||
|
||||
u16_t eventptr_acked;
|
||||
u16_t eventptr_unacked;
|
||||
u16_t eventptr_next;
|
||||
uint16_t eventptr_acked;
|
||||
uint16_t eventptr_unacked;
|
||||
uint16_t eventptr_next;
|
||||
#define VNC_EVENTQUEUE_SIZE 32
|
||||
struct vnc_event event_queue[VNC_EVENTQUEUE_SIZE];
|
||||
|
||||
|
||||
u16_t bufferleft;
|
||||
u16_t buffersize;
|
||||
uint16_t bufferleft;
|
||||
uint16_t buffersize;
|
||||
#define VNC_BUFFERSIZE 64
|
||||
u8_t buffer[VNC_BUFFERSIZE];
|
||||
uint8_t buffer[VNC_BUFFERSIZE];
|
||||
};
|
||||
|
||||
extern static struct vnc_viewer_state vnc_viewer_state;
|
||||
|
|
@ -173,25 +173,25 @@ extern static struct vnc_viewer_state vnc_viewer_state;
|
|||
|
||||
/* Generic rectangle - x, y coordinates, width and height. */
|
||||
struct rfb_rect {
|
||||
u16_t x;
|
||||
u16_t y;
|
||||
u16_t w;
|
||||
u16_t h;
|
||||
uint16_t x;
|
||||
uint16_t y;
|
||||
uint16_t w;
|
||||
uint16_t h;
|
||||
};
|
||||
|
||||
/* Pixel format definition. */
|
||||
struct rfb_pixel_format {
|
||||
u8_t bps; /* Bits per pixel: 8, 16 or 32. */
|
||||
u8_t depth; /* Color depth: 8-32 */
|
||||
u8_t endian; /* 1 - big endian (motorola), 0 - little endian
|
||||
uint8_t bps; /* Bits per pixel: 8, 16 or 32. */
|
||||
uint8_t depth; /* Color depth: 8-32 */
|
||||
uint8_t endian; /* 1 - big endian (motorola), 0 - little endian
|
||||
(x86) */
|
||||
u8_t truecolor; /* 1 - true color is used, 0 - true color is not used. */
|
||||
uint8_t truecolor; /* 1 - true color is used, 0 - true color is not used. */
|
||||
|
||||
/* The following fields are only used if true color is used. */
|
||||
u16_t red_max, green_max, blue_max;
|
||||
u8_t red_shift, green_shift, blue_shift;
|
||||
u8_t pad1;
|
||||
u16_t pad2;
|
||||
uint16_t red_max, green_max, blue_max;
|
||||
uint8_t red_shift, green_shift, blue_shift;
|
||||
uint8_t pad1;
|
||||
uint16_t pad2;
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -234,94 +234,94 @@ struct rfb_pixel_format {
|
|||
/* Server to client messages. */
|
||||
|
||||
struct rfb_server_init {
|
||||
u16_t width;
|
||||
u16_t height;
|
||||
uint16_t width;
|
||||
uint16_t height;
|
||||
struct rfb_pixel_format format;
|
||||
u8_t namelength[4];
|
||||
uint8_t namelength[4];
|
||||
/* Followed by name. */
|
||||
};
|
||||
|
||||
struct rfb_fb_update {
|
||||
u8_t type;
|
||||
u8_t pad;
|
||||
u16_t rects; /* Number of rectanges (struct rfb_fb_update_rect_hdr +
|
||||
uint8_t type;
|
||||
uint8_t pad;
|
||||
uint16_t rects; /* Number of rectanges (struct rfb_fb_update_rect_hdr +
|
||||
data) that follows. */
|
||||
};
|
||||
|
||||
struct rfb_fb_update_rect_hdr {
|
||||
struct rfb_rect rect;
|
||||
u8_t encoding[4];
|
||||
uint8_t encoding[4];
|
||||
};
|
||||
|
||||
struct rfb_copy_rect {
|
||||
u16_t srcx;
|
||||
u16_t srcy;
|
||||
uint16_t srcx;
|
||||
uint16_t srcy;
|
||||
};
|
||||
|
||||
struct rfb_rre_hdr {
|
||||
u16_t subrects[2]; /* Number of subrectangles (struct
|
||||
uint16_t subrects[2]; /* Number of subrectangles (struct
|
||||
rfb_rre_subrect) to follow. */
|
||||
u8_t bgpixel;
|
||||
uint8_t bgpixel;
|
||||
};
|
||||
|
||||
struct rfb_rre_subrect {
|
||||
u8_t pixel;
|
||||
uint8_t pixel;
|
||||
struct rfb_rect rect;
|
||||
};
|
||||
|
||||
struct rfb_corre_rect {
|
||||
u8_t x;
|
||||
u8_t y;
|
||||
u8_t w;
|
||||
u8_t h;
|
||||
uint8_t x;
|
||||
uint8_t y;
|
||||
uint8_t w;
|
||||
uint8_t h;
|
||||
};
|
||||
|
||||
/* Client to server messages. */
|
||||
|
||||
struct rfb_set_pixel_format {
|
||||
u8_t type;
|
||||
u8_t pad;
|
||||
u16_t pad2;
|
||||
uint8_t type;
|
||||
uint8_t pad;
|
||||
uint16_t pad2;
|
||||
struct rfb_pixel_format format;
|
||||
};
|
||||
|
||||
struct rfb_fix_colormap_entries {
|
||||
u8_t type;
|
||||
u8_t pad;
|
||||
u16_t firstcolor;
|
||||
u16_t colors;
|
||||
uint8_t type;
|
||||
uint8_t pad;
|
||||
uint16_t firstcolor;
|
||||
uint16_t colors;
|
||||
};
|
||||
|
||||
struct rfb_set_encodings {
|
||||
u8_t type;
|
||||
u8_t pad;
|
||||
u16_t encodings;
|
||||
uint8_t type;
|
||||
uint8_t pad;
|
||||
uint16_t encodings;
|
||||
};
|
||||
|
||||
struct rfb_fb_update_request {
|
||||
u8_t type;
|
||||
u8_t incremental;
|
||||
u16_t x;
|
||||
u16_t y;
|
||||
u16_t w;
|
||||
u16_t h;
|
||||
uint8_t type;
|
||||
uint8_t incremental;
|
||||
uint16_t x;
|
||||
uint16_t y;
|
||||
uint16_t w;
|
||||
uint16_t h;
|
||||
};
|
||||
|
||||
struct rfb_key_event {
|
||||
u8_t type;
|
||||
u8_t down;
|
||||
u16_t pad;
|
||||
u8_t key[4];
|
||||
uint8_t type;
|
||||
uint8_t down;
|
||||
uint16_t pad;
|
||||
uint8_t key[4];
|
||||
};
|
||||
|
||||
#define RFB_BUTTON_MASK1 1
|
||||
#define RFB_BUTTON_MASK2 2
|
||||
#define RFB_BUTTON_MASK3 4
|
||||
struct rfb_pointer_event {
|
||||
u8_t type;
|
||||
u8_t buttonmask;
|
||||
u16_t x;
|
||||
u16_t y;
|
||||
uint8_t type;
|
||||
uint8_t buttonmask;
|
||||
uint16_t x;
|
||||
uint16_t y;
|
||||
};
|
||||
|
||||
#endif /* __VNC_VIEWER_H__ */
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue