i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Apply coding style a little more firmly.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24435 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Stephan Aßmus
2008-03-18 11:09:13 +00:00
parent aa727f6643
commit 10134c6d28
1 changed files with 47 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/kernel/splash.cpp
+47 -20
View File
@@ -20,6 +20,7 @@
# define TRACE(x...) ; # define TRACE(x...) ;
#endif #endif
struct boot_splash_info { struct boot_splash_info {
mutex lock; mutex lock;
area_id area; area_id area;
@@ -34,8 +35,10 @@ struct boot_splash_info {
static struct boot_splash_info sBootSplash; static struct boot_splash_info sBootSplash;
static void static void
boot_splash_fb_vga_set_palette(const uint8 *palette, int32 firstIndex, int32 numEntries) boot_splash_fb_vga_set_palette(const uint8 *palette, int32 firstIndex,
int32 numEntries)
{ {
out8(firstIndex, VGA_COLOR_WRITE_MODE); out8(firstIndex, VGA_COLOR_WRITE_MODE);
// write VGA palette // write VGA palette
@@ -47,6 +50,7 @@ boot_splash_fb_vga_set_palette(const uint8 *palette, int32 firstIndex, int32 num
} }
} }
static void static void
boot_splash_fb_blit4(const uint8 *data, uint16 width, boot_splash_fb_blit4(const uint8 *data, uint16 width,
uint16 height, const uint8 *palette, uint16 left, uint16 top) uint16 height, const uint8 *palette, uint16 left, uint16 top)
@@ -54,6 +58,7 @@ boot_splash_fb_blit4(const uint8 *data, uint16 width,
// ToDo: no blit yet in VGA mode // ToDo: no blit yet in VGA mode
} }
static void static void
boot_splash_fb_blit8(const uint8 *data, uint16 width, boot_splash_fb_blit8(const uint8 *data, uint16 width,
uint16 height, const uint8 *palette, uint16 left, uint16 top) uint16 height, const uint8 *palette, uint16 left, uint16 top)
@@ -69,6 +74,7 @@ boot_splash_fb_blit8(const uint8 *data, uint16 width,
} }
} }
static void static void
boot_splash_fb_blit15(const uint8 *data, uint16 width, boot_splash_fb_blit15(const uint8 *data, uint16 width,
uint16 height, const uint8 *palette, uint16 left, uint16 top) uint16 height, const uint8 *palette, uint16 left, uint16 top)
@@ -90,6 +96,7 @@ boot_splash_fb_blit15(const uint8 *data, uint16 width,
} }
} }
static void static void
boot_splash_fb_blit16(const uint8 *data, uint16 width, boot_splash_fb_blit16(const uint8 *data, uint16 width,
uint16 height, const uint8 *palette, uint16 left, uint16 top) uint16 height, const uint8 *palette, uint16 left, uint16 top)
@@ -111,6 +118,7 @@ boot_splash_fb_blit16(const uint8 *data, uint16 width,
} }
} }
static void static void
boot_splash_fb_blit24(const uint8 *data, uint16 width, boot_splash_fb_blit24(const uint8 *data, uint16 width,
uint16 height, const uint8 *palette, uint16 left, uint16 top) uint16 height, const uint8 *palette, uint16 left, uint16 top)
@@ -132,6 +140,7 @@ boot_splash_fb_blit24(const uint8 *data, uint16 width,
} }
} }
static void static void
boot_splash_fb_blit32(const uint8 *data, uint16 width, boot_splash_fb_blit32(const uint8 *data, uint16 width,
uint16 height, const uint8 *palette, uint16 left, uint16 top) uint16 height, const uint8 *palette, uint16 left, uint16 top)
@@ -152,30 +161,38 @@ boot_splash_fb_blit32(const uint8 *data, uint16 width,
} }
} }
static void static void
boot_splash_fb_blit(const uint8 *data, uint16 width, boot_splash_fb_blit(const uint8 *data, uint16 width,
uint16 height, const uint8 *palette, uint16 left, uint16 top) uint16 height, const uint8 *palette, uint16 left, uint16 top)
{ {
switch (sBootSplash.depth) { switch (sBootSplash.depth) {
case 4: case 4:
return boot_splash_fb_blit4(data, width, height, palette, left, top); boot_splash_fb_blit4(data, width, height, palette, left, top);
return;
case 8: case 8:
return boot_splash_fb_blit8(data, width, height, palette, left, top); boot_splash_fb_blit8(data, width, height, palette, left, top);
return;
case 15: case 15:
return boot_splash_fb_blit15(data, width, height, palette, left, top); boot_splash_fb_blit15(data, width, height, palette, left, top);
return;
case 16: case 16:
return boot_splash_fb_blit16(data, width, height, palette, left, top); boot_splash_fb_blit16(data, width, height, palette, left, top);
return;
case 24: case 24:
return boot_splash_fb_blit24(data, width, height, palette, left, top); boot_splash_fb_blit24(data, width, height, palette, left, top);
return;
case 32: case 32:
return boot_splash_fb_blit32(data, width, height, palette, left, top); boot_splash_fb_blit32(data, width, height, palette, left, top);
return;
} }
} }
static void static void
boot_splash_fb_blit16_cropped(const uint8 *data, uint16 imageLeft, uint16 imageTop, uint16 imageRight, uint16 imageBottom, boot_splash_fb_blit16_cropped(const uint8 *data, uint16 imageLeft,
uint16 imageWidth, uint16 imageHeight, const uint8 *palette, uint16 left, uint16 top) uint16 imageTop, uint16 imageRight, uint16 imageBottom, uint16 imageWidth,
uint16 imageHeight, const uint8 *palette, uint16 left, uint16 top)
{ {
int32 dataOffset = (imageWidth * imageTop) + imageLeft; int32 dataOffset = (imageWidth * imageTop) + imageLeft;
@@ -197,10 +214,11 @@ boot_splash_fb_blit16_cropped(const uint8 *data, uint16 imageLeft, uint16 imageT
} }
} }
static void static void
boot_splash_fb_blit_cropped(const uint8 *data, uint16 imageLeft, uint16 imageTop, boot_splash_fb_blit_cropped(const uint8 *data, uint16 imageLeft,
uint16 imageRight, uint16 imageBottom, uint16 imageWidth, uint16 imageHeight, uint16 imageTop, uint16 imageRight, uint16 imageBottom, uint16 imageWidth,
const uint8 *palette, uint16 left, uint16 top) uint16 imageHeight, const uint8 *palette, uint16 left, uint16 top)
{ {
switch (sBootSplash.depth) { switch (sBootSplash.depth) {
case 4: case 4:
@@ -208,19 +226,24 @@ boot_splash_fb_blit_cropped(const uint8 *data, uint16 imageLeft, uint16 imageTop
case 15: case 15:
return; return;
case 16: case 16:
return boot_splash_fb_blit16_cropped(data, imageLeft, imageTop, imageRight, boot_splash_fb_blit16_cropped(data, imageLeft, imageTop,
imageBottom, imageWidth, imageHeight, palette, left, top); imageRight, imageBottom, imageWidth, imageHeight, palette,
left, top);
return;
case 24: case 24:
case 32: case 32:
return; return;
} }
} }
static status_t static status_t
boot_splash_fb_update(addr_t baseAddress, int32 width, int32 height, int32 depth, int32 bytesPerRow) boot_splash_fb_update(addr_t baseAddress, int32 width, int32 height,
int32 depth, int32 bytesPerRow)
{ {
TRACE("boot_splash_fb_update: buffer=%p, width=%ld, height=%ld, depth=%ld, bytesPerRow=%ld\n", TRACE("boot_splash_fb_update: buffer=%p, width=%ld, height=%ld, depth=%ld, "
(void *)baseAddress, width, height, depth, bytesPerRow); "bytesPerRow=%ld\n", (void *)baseAddress, width, height, depth,
bytesPerRow);
mutex_lock(&sBootSplash.lock); mutex_lock(&sBootSplash.lock);
@@ -231,12 +254,14 @@ boot_splash_fb_update(addr_t baseAddress, int32 width, int32 height, int32 depth
sBootSplash.bytes_per_pixel = (depth + 7) / 8; sBootSplash.bytes_per_pixel = (depth + 7) / 8;
sBootSplash.bytes_per_row = bytesPerRow; sBootSplash.bytes_per_row = bytesPerRow;
TRACE("boot_splash_fb_update: frame buffer mapped at %p\n", (void *)sBootSplash.frame_buffer); TRACE("boot_splash_fb_update: frame buffer mapped at %p\n",
(void *)sBootSplash.frame_buffer);
mutex_unlock(&sBootSplash.lock); mutex_unlock(&sBootSplash.lock);
return B_OK; return B_OK;
} }
bool bool
boot_splash_fb_available(void) boot_splash_fb_available(void)
{ {
@@ -244,6 +269,7 @@ boot_splash_fb_available(void)
return sBootSplash.frame_buffer != (addr_t)NULL; return sBootSplash.frame_buffer != (addr_t)NULL;
} }
status_t status_t
boot_splash_fb_init(struct kernel_args *args) boot_splash_fb_init(struct kernel_args *args)
{ {
@@ -271,6 +297,7 @@ boot_splash_fb_init(struct kernel_args *args)
return B_OK; return B_OK;
} }
void void
boot_splash_set_stage(int stage) boot_splash_set_stage(int stage)
{ {
@@ -304,12 +331,12 @@ boot_splash_set_stage(int stage)
stageOffset = 242; stageOffset = 242;
break; break;
case BOOT_SPLASH_STAGE_7: case BOOT_SPLASH_STAGE_7:
default:
stageOffset = iconsWidth; stageOffset = iconsWidth;
break; break;
} }
if (stage == BOOT_SPLASH_STAGE_7)
stageOffset = iconsWidth;
boot_splash_fb_blit_cropped(iconsImage, 0, 0, stageOffset, 32, boot_splash_fb_blit_cropped(iconsImage, 0, 0, stageOffset, 32,
iconsWidth, iconsHeight, iconsPalette, x, y ); iconsWidth, iconsHeight, iconsPalette, x, y );
} }