socsvn commit: r272120 - soc2014/seiya/bootsplash/sys/dev/fb

[seiya at FreeBSD.org]

Author: seiya
Date: Sat Aug  9 10:30:02 2014
New Revision: 272120
URL: http://svnweb.FreeBSD.org/socsvn/?view=rev&rev=272120

Log:
  unify the order of function parameters

Modified:
  soc2014/seiya/bootsplash/sys/dev/fb/bmp.c
  soc2014/seiya/bootsplash/sys/dev/fb/bmp.h
  soc2014/seiya/bootsplash/sys/dev/fb/bsplash.c

Modified: soc2014/seiya/bootsplash/sys/dev/fb/bmp.c
==============================================================================
--- soc2014/seiya/bootsplash/sys/dev/fb/bmp.c	Sat Aug  9 09:13:10 2014	(r272119)
+++ soc2014/seiya/bootsplash/sys/dev/fb/bmp.c	Sat Aug  9 10:30:02 2014	(r272120)
@@ -136,8 +136,7 @@
  *
  */
 int
-bmp_draw(video_adapter_t *adp, BMP_INFO *bmp_info, int sx, int sy, int iy,
-         int width, int height)
+bmp_draw(video_adapter_t *adp, BMP_INFO *bmp_info, int iy, int sy, int sx, int width, int height)
 {
 	int		i, next_line;
 	static int	cleared;
@@ -367,11 +366,11 @@
 /*
  * bmp_DecodeRLE4
  *
- * Given (data) pointing to a line of RLE4-format data and (line) being the starting
+ * Given (data) pointing to a line of RLE4-format data and (sy) being the starting
  * line onscreen, decode the line from (sx). (width) is the horizontal length to be drawn.
  */
 static void
-bmp_DecodeRLE4(BMP_INFO *info, int line, int sx, int width)
+bmp_DecodeRLE4(BMP_INFO *info, int sy, int sx, int width)
 {
 	int count;		/* number of drawn pixels */
 	int i;
@@ -380,7 +379,7 @@
 
 	count = 0;
 	x = sx;			/* starting position */
-	y = line;
+	y = sy;
 
 	/* loop vreading data */
 	for (;;) {
@@ -447,17 +446,17 @@
 /*
  * bmp_DecodeRLE8
  *
- * Given (data) pointing to a line of RLE8-format data and (line) being the starting
+ * Given (data) pointing to a line of RLE8-format data and (sy) being the starting
  * line onscreen, decode the line from (sx). (width) is the horizontal length to be drawn.
  */
 static void
-bmp_DecodeRLE8(BMP_INFO *info, int line, int sx, int width)
+bmp_DecodeRLE8(BMP_INFO *info, int sy, int sx, int width)
 {
 	int i;
 	int count;		/* number of pixels to be drawn at once by bmp_draw_line() */
 	int x,y;		/* screen position on screen */
 
-	y = line;
+	y = sy;
 	x = sx;
 
 	/* loop reading data */

Modified: soc2014/seiya/bootsplash/sys/dev/fb/bmp.h
==============================================================================
--- soc2014/seiya/bootsplash/sys/dev/fb/bmp.h	Sat Aug  9 09:13:10 2014	(r272119)
+++ soc2014/seiya/bootsplash/sys/dev/fb/bmp.h	Sat Aug  9 10:30:02 2014	(r272120)
@@ -99,7 +99,6 @@
 } BMP_INFO;
 
 int bmp_init(BMP_INFO *bmp_info, char *data, int swidth, int sheight, int sdepth);
-int bmp_draw(video_adapter_t *adp, BMP_INFO *bmp_info, int vx, int vy, int iy,
-             int width, int height);
+int bmp_draw(video_adapter_t *adp, BMP_INFO *bmp_info, int iy, int sy, int sx, int width, int height);
 
 #endif /* _FB_BMP_H_ */

Modified: soc2014/seiya/bootsplash/sys/dev/fb/bsplash.c
==============================================================================
--- soc2014/seiya/bootsplash/sys/dev/fb/bsplash.c	Sat Aug  9 09:13:10 2014	(r272119)
+++ soc2014/seiya/bootsplash/sys/dev/fb/bsplash.c	Sat Aug  9 10:30:02 2014	(r272120)
@@ -316,7 +316,7 @@
 draw_bmp(BMP_INFO *bmp, int iy, int sy, int sx, int width, int height)
 {
 
-	if (bmp_draw(adp, bmp, sx, sy, iy, width, height) != 0)
+	if (bmp_draw(adp, bmp, iy, sy, sx, width, height) != 0)
 		return 1;
 
 	return 0;