--- np2/win9x/dclock.h	2003/10/21 11:22:05	1.2
+++ np2/win9x/dclock.h	2005/02/16 09:31:55	1.4
@@ -1,26 +1,28 @@
 
 enum {
-	DCLOCK_X		= 56,
-	DCLOCK_Y		= 12
+	DCLOCK_WIDTH	= 56,
+	DCLOCK_HEIGHT	= 12,
+	DCLOCK_YALIGN	= (56 / 8)
 };
 
+
 typedef struct {
-	BYTE	*pos;
+	UINT8	*pos;
 	UINT16	mask;
-	BYTE	rolbit;
-	BYTE	reserved;
+	UINT8	rolbit;
+	UINT8	reserved;
 } DCPOS;
 
 typedef struct {
-const BYTE	*fnt;
+const UINT8	*fnt;
 const DCPOS	*pos;
-	BYTE	flm[8];
-	BYTE	now[8];
-	BYTE	bak[8];
+	UINT8	flm[8];
+	UINT8	now[8];
+	UINT8	bak[8];
 	UINT16	drawing;
-	BYTE	clk_x;
-	BYTE	_padding;
-	BYTE	dat[(DCLOCK_X * DCLOCK_Y / 8) + 4];
+	UINT8	clk_x;
+	UINT8	_padding;
+	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(BYTE value);
+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
 }