--- np2/i286c/i286c_0f.c	2003/10/17 11:10:02	1.3
+++ np2/i286c/i286c_0f.c	2003/10/21 11:22:05	1.5
@@ -1,14 +1,13 @@
 #include	"compiler.h"
 #include	"i286.h"
 #include	"i286c.h"
-#include	"i286c.mcr"
 #include	"memory.h"
-#include	"nevent.h"
+#include	"i286c.mcr"
 
 
 I286_0F _sgdt(UINT op) {
 
-	I286_CLOCK(11)
+	I286_WORKCLOCK(11);
 	if (op < 0xc0) {
 		UINT16 ad = c_get_ea[op]();
 		i286_memorywrite_w(ad + EA_FIX, i286reg.GDTR.limit);
@@ -25,7 +24,7 @@ I286_0F _sgdt(UINT op) {
 
 I286_0F _sidt(UINT op) {
 
-	I286_CLOCK(12)
+	I286_WORKCLOCK(12);
 	if (op < 0xc0) {
 		UINT16 ad = c_get_ea[op]();
 		i286_memorywrite_w(ad + EA_FIX, i286reg.IDTR.limit);
@@ -42,7 +41,7 @@ I286_0F _sidt(UINT op) {
 
 I286_0F _lgdt(UINT op) {
 
-	I286_CLOCK(11)
+	I286_WORKCLOCK(11);
 	if (op < 0xc0) {
 		UINT16 ad = c_get_ea[op]();
 		i286reg.GDTR.limit = i286_memoryread_w(ad + EA_FIX);
@@ -60,7 +59,7 @@ I286_0F _lgdt(UINT op) {
 
 I286_0F _lidt(UINT op) {
 
-	I286_CLOCK(11)
+	I286_WORKCLOCK(11);
 	if (op < 0xc0) {
 		UINT16 ad = c_get_ea[op]();
 		i286reg.IDTR.limit = i286_memoryread_w(ad + EA_FIX);
@@ -79,11 +78,11 @@ I286_0F _lidt(UINT op) {
 I286_0F _smsw(UINT op) {
 
 	if (op >= 0xc0) {
-		I286_CLOCK(3)
+		I286_WORKCLOCK(3);
 		*(reg16_b20[op]) = i286reg.MSW;
 	}
 	else {
-		I286_CLOCK(6)
+		I286_WORKCLOCK(6);
 		i286_memorywrite_w(c_calc_ea_dst[op](), i286reg.MSW);
 	}
 }
@@ -91,11 +90,11 @@ I286_0F _smsw(UINT op) {
 I286_0F _lmsw(UINT op) {
 
 	if (op >= 0xc0) {
-		I286_CLOCK(2)
+		I286_WORKCLOCK(2);
 		i286reg.MSW = *(reg16_b20[op]);
 	}
 	else {
-		I286_CLOCK(3)
+		I286_WORKCLOCK(3);
 		i286reg.MSW = i286_memoryread_w(c_calc_ea_dst[op]());
 	}
 }
@@ -111,7 +110,7 @@ I286_0F _loadall286(void) {
 
 	UINT16	tmp;
 
-	I286_CLOCK(195);
+	I286_WORKCLOCK(195);
 	i286reg.MSW = LOADINTELWORD(mem + 0x804);
 	tmp = LOADINTELWORD(mem + 0x818);
 	I286_OV = tmp & O_FLAG;
@@ -156,7 +155,7 @@ I286EXT i286c_cts(void) {
 		_loadall286();
 	}
 	else {
-		I286_CLOCK(20)
+		I286_WORKCLOCK(20);
 		INT_NUM(6, ip - 1);
 	}
 }