--- np2/calendar.c	2004/01/15 17:42:57	1.2
+++ np2/calendar.c	2004/07/26 18:52:55	1.5
@@ -8,7 +8,8 @@
 	_CALENDAR	cal;
 
 
-static const BYTE days[12] = {31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31};
+static const UINT8 days[12] = {	31, 28, 31, 30, 31, 30,
+								31, 31, 30, 31, 30, 31};
 
 static void secinc(_SYSTIME *dt) {
 
@@ -34,7 +35,7 @@ static void secinc(_SYSTIME *dt) {
 	month = dt->month - 1;
 	if (month < 12) {
 		daylimit = days[month];
-		if ((daylimit == 28) && (!(cal.dt.year & 3))) {
+		if ((daylimit == 28) && (!(dt->year & 3))) {
 			daylimit++;						// = 29;
 		}
 	}
@@ -58,7 +59,7 @@ secinc_exit:
 	return;
 }
 
-static void date2deg(_SYSTIME *t, const BYTE *bcd) {
+static void date2deg(_SYSTIME *t, const UINT8 *bcd) {
 
 	UINT16	year;
 
@@ -75,20 +76,20 @@ static void date2deg(_SYSTIME *t, const 
 	t->second = (UINT16)AdjustBeforeDivision(bcd[5]);
 }
 
-static void date2bcd(BYTE *bcd, const _SYSTIME *t) {
+static void date2bcd(UINT8 *bcd, const _SYSTIME *t) {
 
-	bcd[0] = AdjustAfterMultiply((BYTE)((t->year) % 100));
-	bcd[1] = (BYTE)(((t->month) << 4) + (t->week));
-	bcd[2] = AdjustAfterMultiply((BYTE)t->day);
-	bcd[3] = AdjustAfterMultiply((BYTE)t->hour);
-	bcd[4] = AdjustAfterMultiply((BYTE)t->minute);
-	bcd[5] = AdjustAfterMultiply((BYTE)t->second);
+	bcd[0] = AdjustAfterMultiply((UINT8)(t->year % 100));
+	bcd[1] = (UINT8)((t->month << 4) + t->week);
+	bcd[2] = AdjustAfterMultiply((UINT8)t->day);
+	bcd[3] = AdjustAfterMultiply((UINT8)t->hour);
+	bcd[4] = AdjustAfterMultiply((UINT8)t->minute);
+	bcd[5] = AdjustAfterMultiply((UINT8)t->second);
 }
 
 
 // -----
 
-void calendar_init(void) {
+void calendar_initialize(void) {
 
 	timemng_gettime(&cal.dt);
 	cal.steps = 0;
@@ -108,23 +109,23 @@ void calendar_inc(void) {
 	secinc(&cal.dt);
 }
 
-void calendar_set(const BYTE *bcd) {
+void calendar_set(const UINT8 *bcd) {
 
 	date2deg(&cal.dt, bcd);
 }
 
-void calendar_getvir(BYTE *bcd) {
+void calendar_getvir(UINT8 *bcd) {
 
 	date2bcd(bcd, &cal.dt);
 }
 
-void calendar_getreal(BYTE *bcd) {
+void calendar_getreal(UINT8 *bcd) {
 
 	timemng_gettime(&cal.realc);
 	date2bcd(bcd, &cal.realc);
 }
 
-void calendar_get(BYTE *bcd) {
+void calendar_get(UINT8 *bcd) {
 
 	if (!np2cfg.calendar) {
 		date2bcd(bcd, &cal.dt);