Changeset afbe96a in mainline for fb/fb.c

Timestamp:

2006-07-04T17:18:24Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0166e99

Parents:

09087d2

Message:

Replace old u?? types with respective C99 variants (e.g. uint32_t, int64_t, uintptr_t etc.).

File:

• fb/fb.c (modified) (10 diffs)

fb/fb.c

@@ -71 +71 @@
 
 struct {
-        __u8 *fbaddress ;
+        uint8_t *fbaddress ;
 
         unsigned int xres ;
@@ -95 +95 @@
         int cursor_shown;
         /* Double buffering */
-        __u8 *dbdata;
+        uint8_t *dbdata;
         unsigned int dboffset;
         unsigned int paused;
@@ -121 +121 @@
         unsigned int width;
         unsigned int height;
-        __u8 *data;
+        uint8_t *data;
 } pixmap_t;
 static pixmap_t pixmaps[MAX_PIXMAPS];
@@ -154 +154 @@
 static void rgb_3byte(void *dst, int rgb)
 {
-        __u8 *scr = dst;
+        uint8_t *scr = dst;
 #if (defined(BIG_ENDIAN) || defined(FB_BIG_ENDIAN))
         scr[0] = RED(rgb, 8);
@@ -170 +170 @@
 static int byte3_rgb(void *src)
 {
-        __u8 *scr = src;
+        uint8_t *scr = src;
 #if (defined(BIG_ENDIAN) || defined(FB_BIG_ENDIAN))
         return scr[0] << 16 | scr[1] << 8 | scr[2];
@@ -182 +182 @@
 {
         /* 5-bit, 6-bits, 5-bits */ 
-        *((__u16 *)(dst)) = RED(rgb, 5) << 11 | GREEN(rgb, 6) << 5 | BLUE(rgb, 5);
+        *((uint16_t *)(dst)) = RED(rgb, 5) << 11 | GREEN(rgb, 6) << 5 | BLUE(rgb, 5);
 }
 
@@ -188 +188 @@
 static int byte2_rgb(void *src)
 {
-        int color = *(__u16 *)(src);
+        int color = *(uint16_t *)(src);
         return (((color >> 11) & 0x1f) << (16 + 3)) | (((color >> 5) & 0x3f) << (8 + 2)) | ((color & 0x1f) << 3);
 }
@@ -195 +195 @@
 static void rgb_1byte(void *dst, int rgb)
 {
-        *(__u8 *)dst = RED(rgb, 3) << 5 | GREEN(rgb, 2) << 3 | BLUE(rgb, 3);
+        *(uint8_t *)dst = RED(rgb, 3) << 5 | GREEN(rgb, 2) << 3 | BLUE(rgb, 3);
 }
 
@@ -201 +201 @@
 static int byte1_rgb(void *src)
 {
-        int color = *(__u8 *)src;
+        int color = *(uint8_t *)src;
         return (((color >> 5) & 0x7) << (16 + 5)) | (((color >> 3) & 0x3) << (8 + 6)) | ((color & 0x7) << 5);
 }
@@ -377 +377 @@
  * @param transparent If false, print background color
  */
-static void draw_glyph(viewport_t *vport,__u8 glyph, unsigned int sx, unsigned int sy, 
+static void draw_glyph(viewport_t *vport,uint8_t glyph, unsigned int sx, unsigned int sy, 
                        style_t style, int transparent)
 {