--- np2/win9x/dclock.h 2005/02/07 14:46:14 1.3 +++ np2/win9x/dclock.h 2005/02/16 09:31:55 1.4 @@ -1,9 +1,11 @@ enum { - DCLOCK_X = 56, - DCLOCK_Y = 12 + DCLOCK_WIDTH = 56, + DCLOCK_HEIGHT = 12, + DCLOCK_YALIGN = (56 / 8) }; + typedef struct { UINT8 *pos; UINT16 mask; @@ -20,7 +22,7 @@ const DCPOS *pos; UINT16 drawing; UINT8 clk_x; UINT8 _padding; - UINT8 dat[(DCLOCK_X * DCLOCK_Y / 8) + 4]; + UINT8 dat[(DCLOCK_HEIGHT * DCLOCK_YALIGN) + 4]; } _DCLOCK, *DCLOCK; typedef struct { @@ -38,16 +40,16 @@ extern _DCLOCK dclock; extern DCLOCKPAL dclockpal; void dclock_init(void); -void dclock_init8(void); -void dclock_init16(void); +void dclock_palset(UINT bpp); void dclock_reset(void); void dclock_callback(void); void dclock_redraw(void); BOOL dclock_disp(void); void dclock_cntdown(UINT8 value); void dclock_make(void); -void dclock_out8(void *ptr, UINT width); -void dclock_out16(void *ptr, UINT width); +void dclock_out8(void *ptr, UINT yalign); +void dclock_out16(void *ptr, UINT yalign); +void dclock_out32(void *ptr, UINT yalign); #ifdef __cplusplus }