diff -U3 -r hsfmodem-old/modules/cdbgscr.c hsfmodem/modules/cdbgscr.c
--- hsfmodem-old/modules/cdbgscr.c	2006-01-13 19:23:50.000000000 +0000
+++ hsfmodem/modules/cdbgscr.c	2006-02-12 08:03:57.000000000 +0000
@@ -69,7 +69,7 @@
 static PDBG_PRINT_FUNC m_pfnServer;
 
 __shimcall__
-BOOL LinuxScrSetEntryPointCallback( PVOID epcbk )
+CXT_BOOL LinuxScrSetEntryPointCallback( PVOID epcbk )
 {
 #if (OS_TYPE == OS_LINUX)
 	m_pfnServer = DBGSRV_Print;
diff -U3 -r hsfmodem-old/modules/cnxthw_common.c hsfmodem/modules/cnxthw_common.c
--- hsfmodem-old/modules/cnxthw_common.c	2006-01-27 12:49:32.000000000 +0000
+++ hsfmodem/modules/cnxthw_common.c	2006-02-12 08:03:56.000000000 +0000
@@ -19,8 +19,8 @@
 	HANDLE hDevMgr, ePmeState PmeState, ePmeState OldPmeState)
 {
     COM_STATUS ret;
-    BOOL enabled = ((OldPmeState == DEVMGR_D0) || (OldPmeState == DEVMGR_QUICK_D0));
-    BOOL enabling = ((PmeState == DEVMGR_D0) || (PmeState == DEVMGR_QUICK_D0));
+    CXT_BOOL enabled = ((OldPmeState == DEVMGR_D0) || (OldPmeState == DEVMGR_QUICK_D0));
+    CXT_BOOL enabling = ((PmeState == DEVMGR_D0) || (PmeState == DEVMGR_QUICK_D0));
 
     //printk(KERN_DEBUG"%s: %d -> %d\n", __FUNCTION__, OldPmeState, PmeState);
 
diff -U3 -r hsfmodem-old/modules/cnxthwpci_common.c hsfmodem/modules/cnxthwpci_common.c
--- hsfmodem-old/modules/cnxthwpci_common.c	2006-01-29 17:59:09.000000000 +0000
+++ hsfmodem/modules/cnxthwpci_common.c	2006-02-12 08:08:51.000000000 +0000
@@ -161,7 +161,7 @@
 		return 0;
 	
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
-	pDevNode->pci_state = (UINT32 *) OsAllocate(64/sizeof(UINT32));
+	pDevNode->pci_state = (CXT_UINT32 *) OsAllocate(64/sizeof(CXT_UINT32));
 	if (!pDevNode->pci_state) return -ENOMEM;
 #endif
  
diff -U3 -r hsfmodem-old/modules/cnxthwusb_common.c hsfmodem/modules/cnxthwusb_common.c
--- hsfmodem-old/modules/cnxthwusb_common.c	2006-01-29 17:59:09.000000000 +0000
+++ hsfmodem/modules/cnxthwusb_common.c	2006-02-12 08:08:51.000000000 +0000
@@ -40,7 +40,7 @@
 #include "cnxthw_common.c"
 
 //#undef dbg
-//#define dbg(format, arg...) { UINT32 dwTime = OsGetSystemTime(); printk(KERN_DEBUG "%07lu.%03lu: "__FILE__ ": " format "\n" , dwTime/1000, dwTime%1000, ## arg); }
+//#define dbg(format, arg...) { CXT_UINT32 dwTime = OsGetSystemTime(); printk(KERN_DEBUG "%07lu.%03lu: "__FILE__ ": " format "\n" , dwTime/1000, dwTime%1000, ## arg); }
 
 #if !TARGET_HCF_FAMILY
 void *GetHwFuncs(void);
diff -U3 -r hsfmodem-old/modules/GPL/serial_cnxt.c hsfmodem/modules/GPL/serial_cnxt.c
--- hsfmodem-old/modules/GPL/serial_cnxt.c	2006-02-07 16:30:11.000000000 +0000
+++ hsfmodem/modules/GPL/serial_cnxt.c	2006-02-12 08:08:30.000000000 +0000
@@ -290,7 +290,7 @@
 cnxt_tx_free(struct cnxt_serial_inst *inst)
 {
     int r;
-    UINT32 val = 0;
+    CXT_UINT32 val = 0;
 
     if ((r=ComCtrl_Monitor(inst->hcomctrl, COMCTRL_MONITOR_TXFREE, &val)) != COM_STATUS_SUCCESS) {
 	printk(KERN_ERR "%s: ComCtrlMonitor COMCTRL_MONITOR_TXFREE failed, status=%d\n", __FUNCTION__, r);
@@ -498,7 +498,7 @@
 
 __shimcall__
 static void
-cnxt_event_handler(struct cnxt_serial_inst *inst, UINT32 dwEvtMask)
+cnxt_event_handler(struct cnxt_serial_inst *inst, CXT_UINT32 dwEvtMask)
 {
     struct uart_port *port = inst->port;
     u_int mctrl_flags, orig_mctrl_flags;
@@ -1167,7 +1167,7 @@
 #if (__GNUC__ == 3 && __GNUC_MINOR__ > 1) || __GNUC__ > 3
 			__shimcall__
 #endif
-			void (*) (PVOID pRef, UINT32 dwEventMask)) cnxt_event_handler;
+			void (*) (PVOID pRef, CXT_UINT32 dwEventMask)) cnxt_event_handler;
     EvtHandler.pRef = inst;
 
     if ((r=ComCtrl_Configure(inst->hcomctrl, COMCTRL_CONFIG_EVENT_HANDLER, &EvtHandler))) {
diff -U3 -r hsfmodem-old/modules/imported/include/cnxt_diag_codes_ex.h hsfmodem/modules/imported/include/cnxt_diag_codes_ex.h
--- hsfmodem-old/modules/imported/include/cnxt_diag_codes_ex.h	2006-02-07 16:43:56.000000000 +0000
+++ hsfmodem/modules/imported/include/cnxt_diag_codes_ex.h	2006-02-12 08:03:58.000000000 +0000
@@ -137,8 +137,8 @@
 		CSDIAG_AGC_MIN						,/*DWORD			dB */
 /*35*/	CSDIAG_AGC_MAX						,/*DWORD			dB */
 		CSDIAG_AGC_LAST						,/*DWORD			dB */
-		CSDIAG_120_HZ_POWER					,/*BOOL				High power level detect in band below 120 Hz */
-		CSDIAG_HIGHPASS_FILTER_ENABLED		,/*BOOL				High Pass filter enabled */
+		CSDIAG_120_HZ_POWER					,/*CXT_BOOL				High power level detect in band below 120 Hz */
+		CSDIAG_HIGHPASS_FILTER_ENABLED		,/*CXT_BOOL				High Pass filter enabled */
 		CSDIAG_HIGHEST_RX_STATE				,/*DWORD			TBD	 */
 /*40*/	CSDIAG_HIGHEST_TX_STATE				,/*DWORD			TBD	 */
 		CSDIAG_MODEM_STATE					,/*DWORD			TBD	 */
@@ -195,12 +195,12 @@
 		CSDIAG_RX_TRELLIS_STATES			,/*INT				Number of trellis states (16, 32, 64), helps distinguish remote modem vendor */
 		CSDIAG_TIME_DTR_TO_HANDSHAKE		,/*DWORD			Time (in milliseconds) from off hook to start of handshake */
 		CSDIAG_TIME_DTR_TO_PROTOCOL			,/*DWORD			Time (in milliseconds) from off hook to start of normal data transfer after protocol negotiation */
-/*95*/	CSDIAG_QC_ENABLED					,/*BOOL				return TRUE if QC is enabled */
+/*95*/	CSDIAG_QC_ENABLED					,/*CXT_BOOL				return TRUE if QC is enabled */
 		CSDIAG_SERVER_TYPE					,/*SERVER_TYPE_INFO V34, V90 or V92 */
 		CSDIAG_INFO0_V92                    ,/* TBD */
 		CSDIAG_QC_SYGNAL_MAP				,/* TBD */
-		CSDIAG_MH_ENABLED					,/*BOOL				return TRUE if MOH is enabled */
-/*100*/	CSDIAG_CID_ENABLED					,/*BOOL				return TRUE if CID is enabled */
+		CSDIAG_MH_ENABLED					,/*CXT_BOOL				return TRUE if MOH is enabled */
+/*100*/	CSDIAG_CID_ENABLED					,/*CXT_BOOL				return TRUE if CID is enabled */
 		CSDIAG_TIME_ON_HOLD					,/*DWORD			Seconds, time spent with the server on hold */
 		CSDIAG_SERVER_HOLD_DURATION			,/*DWORD			seconds, from MHack (which contains maximum server hold time duration) */
 		CSDIAG_MOH_REMOTE_RESPONSE			,/*DIAG_MOH_REMOTE_RESPONSE_T	 */
@@ -210,8 +210,8 @@
 		CSDIAG_MOH_LOCAL_RESPONSE			,/*MOH_LOCAL_DECISION_T */
 		CSDIAG_TIMEOUT_FOR_USER_RESPONSE	,/*DWORD */
 		CSDIAG_NEGOTIATION_TIME				,/*DWORD		  time elapsed between the beginning of the negotiation and the actual monitor */
-/*110*/	CSDIAG_K56_RATES_SUPORTED			,/*BOOL			  TRUE if V90 or FLEX are enabled */
-		CSDIAG_PULSE_DIALING_ENABLED		,/*BOOL			  TRUE if Pulse dialing is enabled in ctry params */
+/*110*/	CSDIAG_K56_RATES_SUPORTED			,/*CXT_BOOL			  TRUE if V90 or FLEX are enabled */
+		CSDIAG_PULSE_DIALING_ENABLED		,/*CXT_BOOL			  TRUE if Pulse dialing is enabled in ctry params */
 		CSDIAG_LAST_DIAL_TYPE				,/*LAST_DIAL_TYPE pulse or tone */
 		CSDIAG_FILTER_COEFFICIENTS			,/*MODEM_FILTER_T */
 		CSDIAG_REMOTE_MSE					,
@@ -219,11 +219,11 @@
 		CSDIAG_REMOTE_RX_SIGNAL_POWER		,
 		CSDIAG_REMOTE_RX_BIT_RATE			,
 		CSDIAG_REMOTE_TX_BIT_RATE			,
-		CSDIAG_CONNECTION_DIRECTION			,/*BOOL (True for originator calls, False for Answer calls)  */
+		CSDIAG_CONNECTION_DIRECTION			,/*CXT_BOOL (True for originator calls, False for Answer calls)  */
 /*120*/	CSDIAG_CID_SETTING					,/*DWORD. (0 - Disabled, 1 - Enabled, string format, 2 - Enabled, binary format) */
 		CSDIAG_MOH_METHOD					,/*MOH_METHOD */
-		CSDIAG_OGC_ENABLED					,/*BOOL (0 - Disabled,1 - Enabled) */
-		CSDIAG_HANDSET_EXCLUSIVE_BIT		,/*BOOL (0 - not handset exclusive,1 - is handset exclusive) */
+		CSDIAG_OGC_ENABLED					,/*CXT_BOOL (0 - Disabled,1 - Enabled) */
+		CSDIAG_HANDSET_EXCLUSIVE_BIT		,/*CXT_BOOL (0 - not handset exclusive,1 - is handset exclusive) */
         CSDIAG_APP_V92_AWARE                ,/*App indicated V.92 support in init sequence, RMY 060302 */
 
 /*Lasso Test temporary range */
@@ -265,20 +265,20 @@
 /* For Modem Control only */
 typedef enum 
 {
-/*0*/	CSDIAG_CTRL_MOH_ENABLE,						/*			IN: BOOL				None */
+/*0*/	CSDIAG_CTRL_MOH_ENABLE,						/*			IN: CXT_BOOL				None */
 		CSDIAG_CTRL_CW_DETECTED,					/*			IN: CW_FAKE_MOH_T		NONE */
 		CSDIAG_CTRL_MOH_LOCAL_DECISION,				/*			IN: MOH_LOCAL_DECISION_T */
 		CSDIAG_CTRL_QC_PROFILE_FLUSH,				/*			TBD */
 		CSDIAG_CTRL_QC_PROFILE_LOAD,				/*			TBD */
 /*5*/	CSDIAG_CTRL_QC_PROFILE_DELETION,			/*			NONE				 */
-		CSDIAG_CTRL_QC_PROFILE_WRITE,				/*			IN: BOOL: ENABLE OR DISABLE WRITING */
+		CSDIAG_CTRL_QC_PROFILE_WRITE,				/*			IN: CXT_BOOL: ENABLE OR DISABLE WRITING */
 		CSDIAG_CTRL_OUTGOING_CALL_REQ,				/*			NONE */
-		CSDIAG_CTRL_UPSTREAM_ENABLE,				/*			IN: BOOL				None */
-		CSDIAG_CTRL_QC_DISABLE,						/*			IN: BOOL  1 to disable, 0 to enable */
+		CSDIAG_CTRL_UPSTREAM_ENABLE,				/*			IN: CXT_BOOL				None */
+		CSDIAG_CTRL_QC_DISABLE,						/*			IN: CXT_BOOL  1 to disable, 0 to enable */
 /*10*/	CSDIAG_CTRL_MOH_LOCAL_TIMEOUT,				/*			IN: DWORD  1-13 */
 		CSDIAG_CTRL_MOH_CW_SETTINGS,				/*			IN: CW_SET_T */
 		CSDIAG_CTRL_V44_COMPRESSION_MODE,			/*			IN: DWORD 0-3 */
-		CSDIAG_CTRL_V44_COMPRESSION_NEGOTIATION,	/*			IN: BOOL 0-1 */
+		CSDIAG_CTRL_V44_COMPRESSION_NEGOTIATION,	/*			IN: CXT_BOOL 0-1 */
 		CSDIAG_CTRL_V44_CAPABILITY,					/*			IN: DWORD 0-2 */
 /*15*/	CSDIAG_CTRL_V44_TX_DICTIONARY_SIZE,			/*			IN: DWORD 256-65536 */
 		CSDIAG_CTRL_V44_RX_DICTIONARY_SIZE,			/*			IN: DWORD 256-65536 */
@@ -289,32 +289,32 @@
 
 		/* send in band AT command for ACF only */
 		CSDIAG_CTRL_ACF_SEND_IN_BAND_AT_CMD,  /* send usual string but without 'AT' or <cr> */
-		CSDIAG_CTRL_SET_CID,						/*			IN: BOOL (1 - Enable, 0 - Disable) */
+		CSDIAG_CTRL_SET_CID,						/*			IN: CXT_BOOL (1 - Enable, 0 - Disable) */
  		CSDIAG_CTRL_MOH_SET_METHOD,					/*			IN: MOH_METHOD */
  		CSDIAG_CTRL_DBG_PRINT,						/*			IN: string */
 		
 		/*Lasso Test temporary range */
-/*10000*/CSDIAG_CTRL_OSCILATOR_SET=TMP_LASSO_TESTS_RANGE, /*		IN: BOOL 1 to start, 0 to stop */
+/*10000*/CSDIAG_CTRL_OSCILATOR_SET=TMP_LASSO_TESTS_RANGE, /*		IN: CXT_BOOL 1 to start, 0 to stop */
 		CSDIAG_CTRL_SET_GPIO,						/*			IN: DIAG_GET_SET_GPIO_T */
 		/*W.O.R. Test */
 		CSDIAG_CTRL_SET_POWER_TYPE,					/*			IN: DIAG_POWER_TYPE  */
-		CSDIAG_CTRL_ARM_FOR_WAKE,					/*			IN: BOOL (1 - Arm, 0 - Disarm) */
+		CSDIAG_CTRL_ARM_FOR_WAKE,					/*			IN: CXT_BOOL (1 - Arm, 0 - Disarm) */
 		CSDIAG_CTRL_CLEAR_PME,						/*			NONE */
 		/*Codec LoopBack */
-		CSDIAG_CTRL_START_ANALOG_LOOPBACK,			/*			IN: BOOL	(1 - Start, 0 - Stop)	- RKCTRL */
-		CSDIAG_CTRL_BUS_IF_SET_DATA_TRANSFER,		/*			IN: BOOL	(1 - Start, 0 - Stop) */
+		CSDIAG_CTRL_START_ANALOG_LOOPBACK,			/*			IN: CXT_BOOL	(1 - Start, 0 - Stop)	- RKCTRL */
+		CSDIAG_CTRL_BUS_IF_SET_DATA_TRANSFER,		/*			IN: CXT_BOOL	(1 - Start, 0 - Stop) */
 		CSDIAG_CTRL_TRANSMIT_DATA,					/*			IN: BYTE* (data stream) //Analog LoopBack */
 		/*Tone Loopback */
-		CSDIAG_CTRL_SINGLE_TONE_GENERATE,			/*			IN: TONE_GENERATOR_TEST_T (BOOL to start/stop, tone description) // */
+		CSDIAG_CTRL_SINGLE_TONE_GENERATE,			/*			IN: TONE_GENERATOR_TEST_T (CXT_BOOL to start/stop, tone description) // */
 		CSDIAG_CTRL_SINGLE_TONE_DETECT,				/*			IN:	DWORD timeout			TONE_DETECTOR_TEST_T (tone type, timeout) //Result will be notified by callback CSDIAG_TRAP_TONE_DETECTED */
 		CSDIAG_CTRL_DTMF_TONE_GENERATE,				/*			IN: DPDIALDIGITS */
-		CSDIAG_CTRL_DTMF_TONE_DETECT,				/*			IN: BOOL (1 - Start, 0 - Stop); */
-		CSDIAG_CTRL_START_RING_DETECTOR,			/*          IN: BOOL (1- start, 0 - stop) */
+		CSDIAG_CTRL_DTMF_TONE_DETECT,				/*			IN: CXT_BOOL (1 - Start, 0 - Stop); */
+		CSDIAG_CTRL_START_RING_DETECTOR,			/*          IN: CXT_BOOL (1- start, 0 - stop) */
  
 		CSDIAG_CTRL_GO_OFF_HOOK,					/*			NONE */
 		CSDIAG_CTRL_GO_ON_HOOK,						/*			NONE */
  
-		CSDIAG_CTRL_V34_CONNECTION,					/*			IN: BOOL (1- start, 0 - stop) */
+		CSDIAG_CTRL_V34_CONNECTION,					/*			IN: CXT_BOOL (1- start, 0 - stop) */
 		CSDIAG_CTRL_OVP_DETECTION,					/*			IN: DWORD (timeout) */
 		CSDIAG_CTRL_CID_DETECTION,					/*			IN: DWORD (timeout) */
 		/* A BLAM code. Keep it here for compatibility. */
@@ -337,12 +337,12 @@
 
  
 	CSDIAG_TRAP_SINGLE_TONE_DETECTED = TMP_LASSO_TESTS_RANGE,	/*DIAG_SINGLE_TONE_DETECTOR_RESULT */
-	CSDIAG_TRAP_DTMF_GENERATOR_RESULT,							/*BOOL */
+	CSDIAG_TRAP_DTMF_GENERATOR_RESULT,							/*CXT_BOOL */
 	CSDIAG_TRAP_DTMF_DETECTOR_RESULT,							/*DIAG_DTMF_DETECTOR_RESULT  */
 	CSDIAG_TRAP_RING_DETECTOR_RESULT,							/*RING_DET_PARAMS (0 - Timed Out, 1 - Detected) */
 	CSDIAG_TRAP_RECIEVE_DATA,									/*byte * stream */
-	CSDIAG_TRAP_OVP_DETECTED,									/*BOOL (0 - Timed Out, 1 - Detected) */
-	CSDIAG_TRAP_RLSD_DETECTED,									/*BOOL (0 - Timed Out, 1 - Detected) */
+	CSDIAG_TRAP_OVP_DETECTED,									/*CXT_BOOL (0 - Timed Out, 1 - Detected) */
+	CSDIAG_TRAP_RLSD_DETECTED,									/*CXT_BOOL (0 - Timed Out, 1 - Detected) */
  
 	CSDIAG_TRAP_LAST,
 }CNXT_DIAG_TRAP_CODES, *PCNXT_DIAG_TRAP_CODES;
@@ -355,20 +355,20 @@
 		CSDIAG_CFG_BIT_RATE_TX_MAX,					/*			INT - Bit Rate		None */
 		CSDIAG_CFG_BIT_RATE_RX_MIN,					/*			INT - Bit Rate		None */
 		CSDIAG_CFG_BIT_RATE_TX_MIN,					/*			INT - Bit Rate		None */
-/*5*/	CSDIAG_CFG_AUTOMODE_ENABLE,					/*			BOOL - 1/0			None */
+/*5*/	CSDIAG_CFG_AUTOMODE_ENABLE,					/*			CXT_BOOL - 1/0			None */
 		/*QC configs	 */
 		CSDIAG_CFG_QC_PROFILE_DELETION,				/*			NONE				 */
-		CSDIAG_CFG_QC_PROFILE_WRITE,				/*			BOOL: ENABLE OR DISABLE WRITING */
-		CSDIAG_CFG_QC_DISABLE,						/*			BOOL  1 to disable, 0 to enable */
+		CSDIAG_CFG_QC_PROFILE_WRITE,				/*			CXT_BOOL: ENABLE OR DISABLE WRITING */
+		CSDIAG_CFG_QC_DISABLE,						/*			CXT_BOOL  1 to disable, 0 to enable */
 		/*Upstream configs */
-		CSDIAG_CFG_UPSTREAM_ENABLE,					/*			BOOL				None */
+		CSDIAG_CFG_UPSTREAM_ENABLE,					/*			CXT_BOOL				None */
 		/*Moh Configs */
-/*10*/	CSDIAG_CFG_MOH_ENABLE,						/*			IN: BOOL				None */
+/*10*/	CSDIAG_CFG_MOH_ENABLE,						/*			IN: CXT_BOOL				None */
 		CSDIAG_CFG_MOH_LOCAL_TIMEOUT,				/*			DWORD  1-13 */
 		CSDIAG_CFG_MOH_CW_SETTINGS,					/*			CW_SET_T */
 		/*ds44 params */
 		CSDIAG_CFG_V44_COMPRESSION_MODE,			/*			DWORD 0-3 */
-		CSDIAG_CFG_V44_COMPRESSION_NEGOTIATION,		/*			BOOL 0-1 */
+		CSDIAG_CFG_V44_COMPRESSION_NEGOTIATION,		/*			CXT_BOOL 0-1 */
 /*15*/	CSDIAG_CFG_V44_CAPABILITY,					/*			DWORD 0-2 */
 		CSDIAG_CFG_V44_TX_DICTIONARY_SIZE,			/*			DWORD 256-65536 */
 		CSDIAG_CFG_V44_RX_DICTIONARY_SIZE,			/*			DWORD 256-65536 */
diff -U3 -r hsfmodem-old/modules/imported/include/codesdeps.h hsfmodem/modules/imported/include/codesdeps.h
--- hsfmodem-old/modules/imported/include/codesdeps.h	2006-02-07 16:43:56.000000000 +0000
+++ hsfmodem/modules/imported/include/codesdeps.h	2006-02-12 08:04:01.000000000 +0000
@@ -521,13 +521,13 @@
 	WORD	amplitude2;
 	DWORD	OnTime;
 	DWORD	OffTime;
-    BOOL	bRepeatedTone;
+    CXT_BOOL	bRepeatedTone;
 } TONEGEN, *PTONEGEN;
  
 typedef struct
 {
 	TONEGEN  ToneGenParams;
-	BOOL     StartGenerating; /* TRUE to START, FALSE to STOP */
+	CXT_BOOL     StartGenerating; /* TRUE to START, FALSE to STOP */
 }TONE_GENERATOR_TEST_T;
  
  
@@ -553,13 +553,13 @@
  
 typedef struct 
 {
-	BOOL		 result;
+	CXT_BOOL		 result;
 	DPDIALDIGITS dtmf;
 }DIAG_DTMF_DETECTOR_RESULT;
  
 typedef struct 
 {
-	BOOL		     result;
+	CXT_BOOL		     result;
 	eTONEDETECT_TYPE tone;
 }DIAG_SINGLE_TONE_DETECTOR_RESULT;
  
@@ -597,7 +597,7 @@
 {
 	DWORD StartAddress;
 	DWORD Length; /* in bytes (not supported!) */
-	BOOL  AddressType; /* 0 - memory, 1-IO */
+	CXT_BOOL  AddressType; /* 0 - memory, 1-IO */
 }DIAG_ADDRESS_SPACE_INFO_T;
  
 typedef struct
diff -U3 -r hsfmodem-old/modules/imported/include/comctrl_ex.h hsfmodem/modules/imported/include/comctrl_ex.h
--- hsfmodem-old/modules/imported/include/comctrl_ex.h	2006-02-07 16:43:56.000000000 +0000
+++ hsfmodem/modules/imported/include/comctrl_ex.h	2006-02-12 08:08:34.000000000 +0000
@@ -115,7 +115,7 @@
 */
 typedef enum 
 {
-    COMCTRL_MONITOR_STATUS,             /* [out] UINT32 - combination of status bits STS_XXX */
+    COMCTRL_MONITOR_STATUS,             /* [out] CXT_UINT32 - combination of status bits STS_XXX */
     COMCTRL_MONITOR_DEVICEID,           /* Device Node */
 
     COMCTRL_MONITOR_TXSIZE,
@@ -127,7 +127,7 @@
     COMCTRL_MONITOR_RXFREE,
 
 	COMCTRL_MONITOR_PORTNAME,
-	COMCTRL_MONITOR_MOH,				/* [out] UINT32 - connection supports MOH */
+	COMCTRL_MONITOR_MOH,				/* [out] CXT_UINT32 - connection supports MOH */
 /*#$YS$ */
 	COMCTRL_MONITOR_SYSINST,
 #ifdef COMCTRL_MONITOR_POUND_UG_SUPPORT
@@ -210,9 +210,9 @@
 */
 typedef struct tagPORT_CONFIG
 {
-    UINT32          dwValidFileds;  /* Combination of PortConfiguration bits*/
+    CXT_UINT32          dwValidFileds;  /* Combination of PortConfiguration bits*/
 
-    UINT32          dwDteSpeed;
+    CXT_UINT32          dwDteSpeed;
 
     enum
     {
@@ -229,12 +229,12 @@
         PC_DATABITS_8
     }               eDataBits;      /* Data bits - only 7 and 8 are enabled*/
 
-    BOOL            fXOutput;       /* Xoff/Xon enabled for output*/
-    BOOL            fXInput;        /* Xoff/Xon enabled for input*/
-    BOOL            fError;         /* Replace chars with parity error by ErrorChar*/
-    BOOL            fNull;          /* Skip NULL characters*/
-    BOOL            fCTS;           /* Use CTS for Tx flow control*/
-    BOOL            fRTS;           /* Use RTS for Rx flow control*/
+    CXT_BOOL            fXOutput;       /* Xoff/Xon enabled for output*/
+    CXT_BOOL            fXInput;        /* Xoff/Xon enabled for input*/
+    CXT_BOOL            fError;         /* Replace chars with parity error by ErrorChar*/
+    CXT_BOOL            fNull;          /* Skip NULL characters*/
+    CXT_BOOL            fCTS;           /* Use CTS for Tx flow control*/
+    CXT_BOOL            fRTS;           /* Use RTS for Rx flow control*/
 
     char            cXonChar;
     char            cXoffChar;
@@ -249,7 +249,7 @@
 */
 typedef struct tagPORT_EVENT_HANDLER
 {
-    void    (*pfnCallback) (PVOID pRef, UINT32 dwEventMask) __shimcall__;
+    void    (*pfnCallback) (PVOID pRef, CXT_UINT32 dwEventMask) __shimcall__;
     PVOID   pRef;
 
 } PORT_EVENT_HANDLER, *PPORT_EVENT_HANDLER;
@@ -259,7 +259,7 @@
 */
 typedef struct tagPORT_MONITOR_DATA
 {
-	UINT32	dwSize;
+	CXT_UINT32	dwSize;
     PVOID   pBuf;
 
 } PORT_MONITOR_DATA, *PPORT_MONITOR_DATA;
@@ -309,7 +309,7 @@
 #define COMCTRL_MAX_PORT_NAME_LENGTH	256
 
 /* Direct API */
-__shimcall__ UINT32       ComCtrl_GetInterfaceVersion  (void);
+__shimcall__ CXT_UINT32       ComCtrl_GetInterfaceVersion  (void);
 __shimcall__ HANDLE       ComCtrl_Create               (void);            
 __shimcall__ COM_STATUS   ComCtrl_Destroy              (HANDLE hInst);
 __shimcall__ COM_STATUS   ComCtrl_Open                 (HANDLE hInst);
@@ -317,8 +317,8 @@
 __shimcall__ COM_STATUS   ComCtrl_Configure            (HANDLE hInst, COMCTRL_CONFIG_CODE  eCode,  PVOID pConfig);
 __shimcall__ COM_STATUS   ComCtrl_Monitor              (HANDLE hInst, COMCTRL_MONITOR_CODE eCode, PVOID pMonitor);
 __shimcall__ COM_STATUS   ComCtrl_Control              (HANDLE hInst, COMCTRL_CONTROL_CODE eCode, PVOID pControl);
-__shimcall__ UINT32       ComCtrl_Read                 (HANDLE hInst, PVOID pBuf, UINT32 dwSize);
-__shimcall__ UINT32       ComCtrl_Write                (HANDLE hInst, PVOID pBuf, UINT32 dwSize);
+__shimcall__ CXT_UINT32       ComCtrl_Read                 (HANDLE hInst, PVOID pBuf, CXT_UINT32 dwSize);
+__shimcall__ CXT_UINT32       ComCtrl_Write                (HANDLE hInst, PVOID pBuf, CXT_UINT32 dwSize);
 
 
 /* Interface through function table */
@@ -327,7 +327,7 @@
 {
     /************ Common Interface functions. ************/
 
-    UINT32      (*GetInterfaceVersion)  (void);
+    CXT_UINT32      (*GetInterfaceVersion)  (void);
     HANDLE      (*Create)               (void);
     COM_STATUS  (*Destroy)              (HANDLE hInst);
     COM_STATUS  (*Open)                 (HANDLE hInst);
@@ -338,8 +338,8 @@
 
     /************ Specific Interface functions. ************/
 
-    UINT32      (*Read)   (HANDLE hInst, PVOID pBuf, UINT32 dwSize);
-    UINT32      (*Write)  (HANDLE hInst, PVOID pBuf, UINT32 dwSize);
+    CXT_UINT32      (*Read)   (HANDLE hInst, PVOID pBuf, CXT_UINT32 dwSize);
+    CXT_UINT32      (*Write)  (HANDLE hInst, PVOID pBuf, CXT_UINT32 dwSize);
 
 } I_COM_CTRL_MGR_T, *PI_COM_CTRL_T;
 
diff -U3 -r hsfmodem-old/modules/imported/include/comtypes.h hsfmodem/modules/imported/include/comtypes.h
--- hsfmodem-old/modules/imported/include/comtypes.h	2006-02-07 16:43:56.000000000 +0000
+++ hsfmodem/modules/imported/include/comtypes.h	2006-02-12 08:04:03.000000000 +0000
@@ -106,7 +106,7 @@
 								PVOID /* pRefData */);	
 typedef __shimcall__ void (*PFREE_FUNC)(		PVOID /* Block Pointer */,
 								PVOID /* pRefData */);		
-typedef BOOL  ( __stdcall *PISR)(PVOID);
+typedef CXT_BOOL  ( __stdcall *PISR)(PVOID);
 
 /***********************************************************/
 
diff -U3 -r hsfmodem-old/modules/imported/include/configcodes.h hsfmodem/modules/imported/include/configcodes.h
--- hsfmodem-old/modules/imported/include/configcodes.h	2006-02-07 16:43:56.000000000 +0000
+++ hsfmodem/modules/imported/include/configcodes.h	2006-02-12 08:04:02.000000000 +0000
@@ -103,14 +103,14 @@
     CFGMGR_CADENCE_PARAMS,                          /* CADENCE_CFG * - params of the cadence */
 
     /* AT-parser to LMON */
-    CFGMGR_FORCE_RENEG_UP,                          /* UINT8            */
-    CFGMGR_FORCE_RENEG_DOWN,                        /* UINT8            */
+    CFGMGR_FORCE_RENEG_UP,                          /* CXT_UINT8            */
+    CFGMGR_FORCE_RENEG_DOWN,                        /* CXT_UINT8            */
 /*#$YS$ */
 #if !defined NO_V34FAX_SUPPORT
-    CFGMGR_V34FAX_ENABLED,                          /* UINT8            */
+    CFGMGR_V34FAX_ENABLED,                          /* CXT_UINT8            */
 #endif
 
-    /* S-Registers  - UINT8 */
+    /* S-Registers  - CXT_UINT8 */
 	CFGMGR_SREG,									/* S0 */
 	CFGMGR_NRINGS_TO_ANSWER     = CFGMGR_SREG+0,	/* Number of rings before modem answers the call */
 	CFGMGR_RING_COUNTER         = CFGMGR_SREG+1,    /* Number of rings detected */
@@ -177,20 +177,20 @@
     CFGMGR_ATMESSAGE_I12,
 
     /* DTE configuration    */
-    CFGMGR_DTE_ECHO,                    /* UINT8            */
+    CFGMGR_DTE_ECHO,                    /* CXT_UINT8            */
     CFGMGR_DTE_CONFIG,                  /* DTE_USER_CONFIG  */
 
     CFGMGR_SYNC_MODE,                   /* AT&Q             */
 
-    CFGMGR_RLSD_BEHAVIOR,               /* UINT8            */
-    CFGMGR_DTR_BEHAVIOR,                /* UINT8            */
+    CFGMGR_RLSD_BEHAVIOR,               /* CXT_UINT8            */
+    CFGMGR_DTR_BEHAVIOR,                /* CXT_UINT8            */
 
     /* Speaker Control */
-    CFGMGR_SPEAKER_VOLUME,              /* UINT8            */
-    CFGMGR_SPEAKER_CONTROL,             /* UINT8            */
+    CFGMGR_SPEAKER_VOLUME,              /* CXT_UINT8            */
+    CFGMGR_SPEAKER_CONTROL,             /* CXT_UINT8            */
 
     /* Pulse Dial Make/Break Ratio */
-    CFGMGR_PULSE_MAKE_BREAK,            /* UINT8            */
+    CFGMGR_PULSE_MAKE_BREAK,            /* CXT_UINT8            */
 
     /* Ring burst frequencies */
     CFGMGR_IMMEDIATE_RING_DETECTED,     /* immediate ring used in French CID */
@@ -203,7 +203,7 @@
     CFGMGR_DTMF_GENERATOR,              /* PDTMF_GEN_PARAMS         */
 
     /* Modulation Report                                            */
-    CFGMGR_MODULATION_REPORT,           /* UINT8                    */
+    CFGMGR_MODULATION_REPORT,           /* CXT_UINT8                    */
 
     /* to replace STATUS_CP_CARRIER */
     CFGMGR_MODULATION_INFO,
@@ -221,14 +221,14 @@
     CFGMGR_FAX_CALL_TONE_CADENCE,
 
     /* FAX Service Class 1 Configuration Values                     */
-    CFGMGR_FAX_AUTO_ANSWER,             /* UINT8                    */
+    CFGMGR_FAX_AUTO_ANSWER,             /* CXT_UINT8                    */
 
     /*  OEM flags                                                   */
     CFGMGR_OEM_FLAGS,                   /* OEMFlagStructure         */
 	CFGMGR_OEM_FLAGS2,					/* OEMFlag2Structure        */
     CFGMGR_OEM_FILTERS,                 /* OEMFilterStructure       */
-    CFGMGR_OEM_SPKR_MUTE_DELAY,         /* UINT16 SpkrMuteDelay     */
-	CFGMGR_OEM_READ_MASK,				/* UINT16 OEMReadMask       */
+    CFGMGR_OEM_SPKR_MUTE_DELAY,         /* CXT_UINT16 SpkrMuteDelay     */
+	CFGMGR_OEM_READ_MASK,				/* CXT_UINT16 OEMReadMask       */
     CFGMGR_OEM_THRESHOLD,				/* OEMThresholdStruct       */
 
     CFGMGR_COUNTRY_CODE,                /* current country code     */
@@ -282,7 +282,7 @@
 #if !defined NO_POUNDUG_SUPPORT
     CFGMGR_POUND_UD,                    /* #UD/#UG structure        */
 #endif
-    CFGMGR_ATPARSER_ONLINE,              /* UINT8                   */
+    CFGMGR_ATPARSER_ONLINE,              /* CXT_UINT8                   */
 #if !defined NO_BL_SUPPORT
     CFGMGR_BLACK_LIST,                  /*  Black List structure    */
 #endif
@@ -329,7 +329,7 @@
 	CFGMGR_TONE_GEN_CI,						/* TONEGEN_PARAMS*				*/
  
     /** HW - buffer switch delay. **/
-    CFGMGR_BUFFERS_DELAY,                   /* UINT16*. */
+    CFGMGR_BUFFERS_DELAY,                   /* CXT_UINT16*. */
    	CFGMGR_PCI_DEVICE_ID,	/*(414) */
 	CFGMGR_PCI_VENDOR_ID,
  
@@ -350,13 +350,13 @@
 	CFGMGR_CTRY_CADENCE          ,    /* CntryCadenceStructure          */
 	CFGMGR_CTRY_CALLERID         ,    /* CntryCallerIDStructure         */ 
  
-	CFGMGR_HSFI_TYPE         ,    /* BOOL (TRUE for SmartHSFi, FALSE for HSFi)         */ 
+	CFGMGR_HSFI_TYPE         ,    /* CXT_BOOL (TRUE for SmartHSFi, FALSE for HSFi)         */ 
 	/************************************************/
     /************Common configuration codes *********/
     /************************************************/
 	
 
-    CFGMGR_CENTERAL_SITE,						    /* BOOL - TRUE - for sentral site emulation */
+    CFGMGR_CENTERAL_SITE,						    /* CXT_BOOL - TRUE - for sentral site emulation */
 	CFGMGR_RXSAMPLES_OUT_FILENAME,					/* char[CFGMGR_MAX_FILENAME] File name for dumping RxSamples			*/
 	CFGMGR_TXSAMPLES_OUT_FILENAME,					/* char[CFGMGR_MAX_FILENAME] File name for dumping TxSamples			*/
 	CFGMGR_RXLEN_OUT_FILENAME,					    /* char[CFGMGR_MAX_FILENAME]File name for dumping Rx Length			*/
diff -U3 -r hsfmodem-old/modules/imported/include/configtypes.h hsfmodem/modules/imported/include/configtypes.h
--- hsfmodem-old/modules/imported/include/configtypes.h	2006-02-07 16:43:56.000000000 +0000
+++ hsfmodem/modules/imported/include/configtypes.h	2006-02-12 08:08:36.000000000 +0000
@@ -97,85 +97,85 @@
 
 typedef struct tagDTE_USER_CONFIG
 {
-    UINT8       bQuiet;     /* DTE result codes disabled*/
-    UINT8       bVerbose;   /* Long result form*/
-    UINT8       bLevel;     /* Result codes level */
-    UINT8       bConnect;   /* Connect Message Form*/
+    CXT_UINT8       bQuiet;     /* DTE result codes disabled*/
+    CXT_UINT8       bVerbose;   /* Long result form*/
+    CXT_UINT8       bLevel;     /* Result codes level */
+    CXT_UINT8       bConnect;   /* Connect Message Form*/
 
 } DTE_USER_CONFIG, *PDTE_USER_CONFIG;
 
 typedef struct tagMS_USER_CONFIG
 {
    MODULATION_TYPE	eModulation;
-   BOOL				bAutomode;
-   UINT32			dwMinTxSpeed;
-   UINT32			dwMaxTxSpeed;
-   UINT32			dwMinRxSpeed;
-   UINT32			dwMaxRxSpeed;
+   CXT_BOOL				bAutomode;
+   CXT_UINT32			dwMinTxSpeed;
+   CXT_UINT32			dwMaxTxSpeed;
+   CXT_UINT32			dwMinRxSpeed;
+   CXT_UINT32			dwMaxRxSpeed;
 
 } MS_USER_CONFIG, *PMS_USER_CONFIG;
 
 typedef struct tagDS_USER_CONFIG 
 {
-	UINT32	dwCompressDict;
-	UINT32	dwCompressStr;
-	UINT32	dwCompressDir;
-	UINT32	dwCompressNeg;
+	CXT_UINT32	dwCompressDict;
+	CXT_UINT32	dwCompressStr;
+	CXT_UINT32	dwCompressDir;
+	CXT_UINT32	dwCompressNeg;
 } DS_USER_CONFIG, *PDS_USER_CONFIG;
 
 #if !defined NO_V44_SUPPORT
 typedef struct DS44InfoStructTag
 {
-	UINT32 dwV44CompressDir;
-	UINT32 dwV44CompressNeg;
-	UINT32 dwV44Capability;
-	UINT32 dwV44TxDict;
-	UINT32 dwV44RxDict;
-	UINT32 dwV44TxStr;
-	UINT32 dwV44RxStr;
-	UINT32 dwV44TxHist;
-	UINT32 dwV44RxHist;
+	CXT_UINT32 dwV44CompressDir;
+	CXT_UINT32 dwV44CompressNeg;
+	CXT_UINT32 dwV44Capability;
+	CXT_UINT32 dwV44TxDict;
+	CXT_UINT32 dwV44RxDict;
+	CXT_UINT32 dwV44TxStr;
+	CXT_UINT32 dwV44RxStr;
+	CXT_UINT32 dwV44TxHist;
+	CXT_UINT32 dwV44RxHist;
 } DS44InfoStruct;
 #endif
 
 typedef struct tagEC_USER_CONFIG
 {
-   UINT32   dwOrgReq;
-   UINT32   dwOrgFbk;
-   UINT32   dwAnsFbk;
-   BOOL     bV42SkipToXID;
+   CXT_UINT32   dwOrgReq;
+   CXT_UINT32   dwOrgFbk;
+   CXT_UINT32   dwAnsFbk;
+   CXT_BOOL     bV42SkipToXID;
 } EC_USER_CONFIG, *PEC_USER_CONFIG;
 
 /*#$YS$ Added for Break handling */
 typedef struct tagBRK_USER_CONFIG
 {
-   UINT32   dwBreakSel;
-   UINT32   dwTimed;
-   UINT32   dwDefaultLen;
+   CXT_UINT32   dwBreakSel;
+   CXT_UINT32   dwTimed;
+   CXT_UINT32   dwDefaultLen;
 } BRK_USER_CONFIG, *PBRK_USER_CONFIG;
 
 
 /*YS@001130 */
 typedef struct tagITF_USER_CONFIG
 {
-   UINT32   dwXoffThresh;
-   UINT32   dwXonThresh;
-   UINT32   dwRptPeriod;
+   CXT_UINT32   dwXoffThresh;
+   CXT_UINT32   dwXonThresh;
+   CXT_UINT32   dwRptPeriod;
 } ITF_USER_CONFIG, *PITF_USER_CONFIG;
 
 /*#$YS$ */
 /* CFGMGR_VDR_PARAMS */
 typedef struct tagVDRParams 
 {
-	UINT32  dwRingReportEnable;
-    UINT32  dwRingReportType;
+	CXT_UINT32  dwRingReportEnable;
+    CXT_UINT32  dwRingReportType;
 } VDR_PARAMS, *PVDR_PARAMS;
 
 
 typedef struct
 {
 	MODULATION_TYPE Modulation;
-	UINT32 TxBitRate, RxBitRate;
+	CXT_UINT32 TxBitRate, RxBitRate;
 } CARRIER_REPORT;
 
 #define QC_PROFILE_RAMDATA_VALID		0x01
@@ -212,11 +212,11 @@
 
 typedef struct ModemOnHoldInfoTag
 {
-   UINT32	dwAllowHoldTime;
-   UINT32	dwHoldEnable;
-   UINT8	cRemoteModemInfo;
-/*   UINT8	cRawOnHoldTime; */
-   BOOL		bServerOnHold;
+   CXT_UINT32	dwAllowHoldTime;
+   CXT_UINT32	dwHoldEnable;
+   CXT_UINT8	cRemoteModemInfo;
+/*   CXT_UINT8	cRawOnHoldTime; */
+   CXT_BOOL		bServerOnHold;
 
    MOH_STATE eMxpertState;
 } ModemOnHoldInfo;
@@ -245,9 +245,9 @@
 /*
 typedef struct PACKED_ATTRIB
 {
-	UINT8	RingMaxFrequency,
+	CXT_UINT8	RingMaxFrequency,
 			RingMinFrequency;
-	UINT16	RingStable,
+	CXT_UINT16	RingStable,
 			MinTimeBeforeAnswering,
 			MinDelayBtwnRings,
 			MaxDelayBtwnRings,
@@ -268,17 +268,17 @@
 
 typedef struct PACKED_ATTRIB
 {
-	UINT16	InterCallDelay1,		/*Delay when same number dialed after outgoing call*/
+	CXT_UINT16	InterCallDelay1,		/*Delay when same number dialed after outgoing call*/
 			InterCallDelay2,		/*Delay when different number dialed after outgoing call*/
 			InterCallDelay3,		/*Delay after incoming call*/
 			BillingDelay;			/*Delay between ATA and start of v8bis*/
-	UINT16	uiDummy1,
+	CXT_UINT16	uiDummy1,
 			uiDummy2;
 } CALL_PROGRESS_TIMING_CONFIG, *PCALL_PROGRESS_TIMING_CONFIG;
 
 typedef struct PACKED_ATTRIB
 {
-	UINT16	DialToneStable,
+	CXT_UINT16	DialToneStable,
 			WDialToneStable,
 			AnswerToneStable,
 			CallProgressToneStable;
@@ -286,7 +286,7 @@
 
 typedef struct  PACKED_ATTRIB
 {
-	UINT8 v8o,		/* 1 = enable +A8x indicators, 6 = disable +A8x (originate)*/
+	CXT_UINT8 v8o,		/* 1 = enable +A8x indicators, 6 = disable +A8x (originate)*/
 		  v8a,		/* 1 = enable +A8x indicators, 5 = disable +A8x (answer)*/
 		  v8c,		/* value of V.8 CI signal call function*/
 		  v8b,		/* 0 = disable V.8bis, 1 = DCE-controlled V.8bis, 2 = DTE-controlled V.8bis*/
@@ -322,22 +322,22 @@
 
 typedef struct
 {
-    UINT8	    NS_FlexVersion;                     /* NS - Flex Version Number*/
-    UINT8	    NS_DSPVersion;                      /* NS - DSP Version Number*/
-	UINT8	    bRemoteIsConexant;                  /* remote modem is Conexant*/
-    UINT8	    bK56UseUlaw;                        /* use u-law in K56 negotiation*/
-    UINT8	    bK56flexNegotiated;                 /* remote server supports K56*/
-    UINT8	    bV90InNonStdFld;                    /* v.90 support is detected in NSF*/
-    UINT8	    bV90InStdFld;                       /* v.90 support is detected in SF*/
-    UINT8	    bV70_Enabled;
+    CXT_UINT8	    NS_FlexVersion;                     /* NS - Flex Version Number*/
+    CXT_UINT8	    NS_DSPVersion;                      /* NS - DSP Version Number*/
+	CXT_UINT8	    bRemoteIsConexant;                  /* remote modem is Conexant*/
+    CXT_UINT8	    bK56UseUlaw;                        /* use u-law in K56 negotiation*/
+    CXT_UINT8	    bK56flexNegotiated;                 /* remote server supports K56*/
+    CXT_UINT8	    bV90InNonStdFld;                    /* v.90 support is detected in NSF*/
+    CXT_UINT8	    bV90InStdFld;                       /* v.90 support is detected in SF*/
+    CXT_UINT8	    bV70_Enabled;
     V8BIS_STATE eState;
     V8BIS_FAILURE_REASON    eReason;
 } V8BIS_RESULT, *PV8BIS_RESULT;
 
 /* Structure passed with CFGMGR_ANSWER_TONE_DETECTOR/CFGMGR_BELL_TONE_DETECTOR */
 typedef struct tagAnswerToneParams {
-    UINT16  m_wCenterFrequency;
-    UINT16  m_wBandwidth;
+    CXT_UINT16  m_wCenterFrequency;
+    CXT_UINT16  m_wBandwidth;
     short   m_nAmplitude;			/* normed to 32768*/
 } ANSWER_TONE_PARAMS, *PANSWER_TONE_PARAMS;
 
@@ -425,19 +425,19 @@
 /* Transmit Level*/
 #pragma pack(1)
 typedef struct PACKED_ATTRIB tagTxlevel {
-	UINT8	TxDataLevelMin;
-	UINT8	TxDataLevelMax;
-	UINT8	TxDataLevelDefault;
-	UINT8	TxFaxLevelMin;
-	UINT8	TxFaxLevelMax;
-	UINT8	TxFaxLevelDefault;
-	UINT8	TxVoiceLevelMin;
-	UINT8	TxVoiceLevelMax;
-	UINT8	TxVoiceLevelDefault;
+	CXT_UINT8	TxDataLevelMin;
+	CXT_UINT8	TxDataLevelMax;
+	CXT_UINT8	TxDataLevelDefault;
+	CXT_UINT8	TxFaxLevelMin;
+	CXT_UINT8	TxFaxLevelMax;
+	CXT_UINT8	TxFaxLevelDefault;
+	CXT_UINT8	TxVoiceLevelMin;
+	CXT_UINT8	TxVoiceLevelMax;
+	CXT_UINT8	TxVoiceLevelDefault;
 	char	TxLvlAdj;							/* can be + or - */
-	UINT8	LowDialLevel;
-	UINT8	HighDialLevel;
-	UINT8	MaxVTSLineSingleToneLevel;
+	CXT_UINT8	LowDialLevel;
+	CXT_UINT8	HighDialLevel;
+	CXT_UINT8	MaxVTSLineSingleToneLevel;
 } CntryTxlevelStructure;
 #pragma pack()
 
@@ -452,59 +452,59 @@
 		workaround the bug. It should be removed if future versions of
 		GAS fix this (Ahi).
 */
-	UINT8	Padding;
+	CXT_UINT8	Padding;
 #endif
  
-	UINT8	PulseDialMode;
-	UINT8	PulseMapAmperP0;					/* Maps the &P values*/
-	UINT8	PulseMapAmperP1;
-	UINT8	PulseMapAmperP2;
-	UINT8	PulseMapAmperP3;
+	CXT_UINT8	PulseDialMode;
+	CXT_UINT8	PulseMapAmperP0;					/* Maps the &P values*/
+	CXT_UINT8	PulseMapAmperP1;
+	CXT_UINT8	PulseMapAmperP2;
+	CXT_UINT8	PulseMapAmperP3;
 	char	PulseMakeOffset;					/* can be +/- */
 	char	PulseBreakOffset;					/* can be +/- */
-	UINT8	PulseSetupTime;
-	UINT8	PulseClearTime;
-	UINT16	PulseInterd;
-	UINT16	LineMuteDelay;						/*VRO: Line mute delay*/
+	CXT_UINT8	PulseSetupTime;
+	CXT_UINT8	PulseClearTime;
+	CXT_UINT16	PulseInterd;
+	CXT_UINT16	LineMuteDelay;						/*VRO: Line mute delay*/
 } CntryPulseStructure;
 #pragma pack()
 
 /* Ring Detection Parameters*/
 #pragma pack(1)
 typedef struct PACKED_ATTRIB tagRing {
-	UINT8	RingMaxFrequency;
-	UINT8	RingMinFrequency;
-	UINT16	RingStable;
-	UINT16	MinTimeBeforeAnswering;
-	UINT16	MinDelayBtwnRings;
-	UINT16	MaxDelayBtwnRings;
-    UINT16	MinRingOnTime;
-    UINT16	MinImmediateRingOn;
-    UINT16	MaxImmediateRingOn;
-	UINT8	P85RingWakePulseWidth;
+	CXT_UINT8	RingMaxFrequency;
+	CXT_UINT8	RingMinFrequency;
+	CXT_UINT16	RingStable;
+	CXT_UINT16	MinTimeBeforeAnswering;
+	CXT_UINT16	MinDelayBtwnRings;
+	CXT_UINT16	MaxDelayBtwnRings;
+    CXT_UINT16	MinRingOnTime;
+    CXT_UINT16	MinImmediateRingOn;
+    CXT_UINT16	MaxImmediateRingOn;
+	CXT_UINT8	P85RingWakePulseWidth;
 } CntryRingStructure;
 #pragma pack()
 
 /* DTMF Dial Parameters*/
 #pragma pack(1)
 typedef struct PACKED_ATTRIB tagDTMF {
-	UINT16	DTMFOnTime;
-	UINT16	DTMFInterdigit;   
+	CXT_UINT16	DTMFOnTime;
+	CXT_UINT16	DTMFInterdigit;   
 } CntryDTMFStructure;
 #pragma pack()
 
 #pragma pack(1)
 typedef struct PACKED_ATTRIB FilterParamTAG {
-	UINT16	FilterType;
-	UINT16	Biquad1[5];
-	UINT16	Biquad2[5];    
-	UINT16	LpFBK;
-	UINT16	LpGain;
-	UINT16	ThreshU;
-	UINT16	ThreshL;
-	UINT16	Biquad1_PreF[5];
-	UINT16	Biquad2_PreF[5];
-	BOOL	SqDisState;
+	CXT_UINT16	FilterType;
+	CXT_UINT16	Biquad1[5];
+	CXT_UINT16	Biquad2[5];    
+	CXT_UINT16	LpFBK;
+	CXT_UINT16	LpGain;
+	CXT_UINT16	ThreshU;
+	CXT_UINT16	ThreshL;
+	CXT_UINT16	Biquad1_PreF[5];
+	CXT_UINT16	Biquad2_PreF[5];
+	CXT_BOOL	SqDisState;
 } FilterParam, *ptrFilterParam;
 #pragma pack()
 
@@ -519,35 +519,35 @@
 
 /* RLSD Threshold Adjustment*/
 typedef struct tagRLSD {
-	UINT32		XrthOffset;				/* can be + or -*/
+	CXT_UINT32		XrthOffset;				/* can be + or -*/
 } CntryRLSDStructure;
 
 /* Tone Detection Parameters*/
 #pragma pack(1)
 typedef struct PACKED_ATTRIB tagTone {
-	UINT16		DialStable;
-	UINT16		WDialStable; 
-	UINT16		AnswerStable;
-	UINT16		ProgressStable;
-	UINT8		DialtoneWaitTime;
-    UINT16		PolarityReversalIgnoreTime;
+	CXT_UINT16		DialStable;
+	CXT_UINT16		WDialStable; 
+	CXT_UINT16		AnswerStable;
+	CXT_UINT16		ProgressStable;
+	CXT_UINT8		DialtoneWaitTime;
+    CXT_UINT16		PolarityReversalIgnoreTime;
 } CntryToneStructure;
 #pragma pack()
 
 #pragma pack(1)
 typedef struct PACKED_ATTRIB tagCadPrm {
 	struct {
-		UINT32	lMin;
-		UINT32	lMax;
+		CXT_UINT32	lMin;
+		CXT_UINT32	lMax;
 	} Interval[MAX_INTERVALS];
-	UINT32		lNumIntervalsNeeded;
+	CXT_UINT32		lNumIntervalsNeeded;
 } CadPrm;
 #pragma pack()
 
 /* TONE CADENCE*/
 #pragma pack(1)
 typedef struct PACKED_ATTRIB tagCadence {
-	UINT8		ToneCadence_NumberOfPhases;
+	CXT_UINT8		ToneCadence_NumberOfPhases;
 	CadPrm		DialtoneParams;
 //new        CadPrm		WDialtoneParams;
 	CadPrm		BusyParams;
@@ -573,18 +573,18 @@
 /* Blacklisting Parameters*/
 #pragma pack(1)
 typedef struct PACKED_ATTRIB tagBlacklisting {
-	UINT8			BlstAction_NoDialTone;
-	UINT8			BlstAction_KeyAbort;
-	UINT8			BlstAction_Busy;
-	UINT8			BlstAction_NoConnection;
-	UINT8			BlstAction_NoAnswer;
-	UINT8			BlstAction_VoiceAnswer;
-	UINT16			BlackListingDelay1;			/* InterCall Delay upon Failure when redialing same number */
-	UINT16			BlackListingDelay2;			/* InterCall Delay upon Failure when redialing different number */
-	UINT16			BlackListingDelay3;			/* Method 2 Delay */
-	UINT16			BlackListingDelay4;			/* Method 3 Delay */ 
-	UINT16			BlackListingCount1;			/* Method 2 # of Failures */
-	UINT16			BlackListingCount2;			/* Method 3 # of Failures */
+	CXT_UINT8			BlstAction_NoDialTone;
+	CXT_UINT8			BlstAction_KeyAbort;
+	CXT_UINT8			BlstAction_Busy;
+	CXT_UINT8			BlstAction_NoConnection;
+	CXT_UINT8			BlstAction_NoAnswer;
+	CXT_UINT8			BlstAction_VoiceAnswer;
+	CXT_UINT16			BlackListingDelay1;			/* InterCall Delay upon Failure when redialing same number */
+	CXT_UINT16			BlackListingDelay2;			/* InterCall Delay upon Failure when redialing different number */
+	CXT_UINT16			BlackListingDelay3;			/* Method 2 Delay */
+	CXT_UINT16			BlackListingDelay4;			/* Method 3 Delay */ 
+	CXT_UINT16			BlackListingCount1;			/* Method 2 # of Failures */
+	CXT_UINT16			BlackListingCount2;			/* Method 3 # of Failures */
 	BLFlagStructure	BlstFlags;
 } CntryBlacklistingStructure;
 #pragma pack()
@@ -601,11 +601,11 @@
 /* CallerID Parameter*/
 #pragma pack(1)
 typedef struct PACKED_ATTRIB tagCallerID {
-	UINT8		Cid_TYPE;
-	UINT8		Cid_Prefix;
-	UINT8		Cid_Suffix;
-	UINT16		Cid_WaitTime;
-	UINT8		PreRing_Cid_Indicator;
+	CXT_UINT8		Cid_TYPE;
+	CXT_UINT8		Cid_Prefix;
+	CXT_UINT8		Cid_Suffix;
+	CXT_UINT16		Cid_WaitTime;
+	CXT_UINT8		PreRing_Cid_Indicator;
 } CntryCallerIDStructure;
 #pragma pack()
 
@@ -657,9 +657,9 @@
 /* Agress speed Parameter*/
 #pragma pack(1)
 typedef struct PACKED_ATTRIB tagAgressSpeedIndex {
-	UINT8	cV90AgressSpeedIndex;
-	UINT8	cK56AgressSpeedIndex;
-	UINT8	cV34AgressSpeedIndex;
+	CXT_UINT8	cV90AgressSpeedIndex;
+	CXT_UINT8	cK56AgressSpeedIndex;
+	CXT_UINT8	cV34AgressSpeedIndex;
 } CntryAgressSpeedIndexStructure;
 #pragma pack()
 
@@ -678,8 +678,8 @@
 #pragma pack(1)
 typedef struct PACKED_ATTRIB CAS_Action_Tag {
 	CAS_ACTION		Action;
-	UINT32			Tone;
-	UINT32			Duration;
+	CXT_UINT32			Tone;
+	CXT_UINT32			Duration;
 } CntryCASAction;
 #pragma pack()
 
@@ -687,8 +687,8 @@
 
 #pragma pack(1)
 typedef struct PACKED_ATTRIB CallerID2_Tag {
-  UINT8				Cid_TYPE;
-  UINT32			CASDetectionTime; /* time given for cas detection */
+  CXT_UINT8				Cid_TYPE;
+  CXT_UINT32			CASDetectionTime; /* time given for cas detection */
   CntryCASAction	CASAction[MAX_CAS_ACTIONS];
 } CntryCallerID2Structure;
 #pragma pack()
@@ -702,10 +702,10 @@
 #pragma pack(1)
 typedef struct PACKED_ATTRIB CW_HWToneDetectorParams_tag
 {
-   UINT16 wToneFrequency;
-   UINT8 cToneCounterTolerance;
-   UINT8 cToneCheckCounterPeriod;
-   UINT16 wToneSampleDuration;
+   CXT_UINT16 wToneFrequency;
+   CXT_UINT8 cToneCounterTolerance;
+   CXT_UINT8 cToneCheckCounterPeriod;
+   CXT_UINT16 wToneSampleDuration;
 } CW_HWToneDetectorParams;
 #pragma pack()
 
@@ -716,15 +716,15 @@
    CW_HWToneDetectorParams SAS_DetectorSettings;
    CW_HWToneDetectorParams CAS_DetectorSettings;
 
-   UINT16 wCallWaitingTimeOut;
-   UINT16 wCW_AGCMAXG;
-   UINT16 wCW_AGCSLR;
-   UINT16 wCW_AGCREF;
-   UINT16 wCW_Alpha2Coefficient;
-   UINT16 wCW_Beta2Coefficient;
-   UINT16 wCW_Alpha1Coefficient;
-   UINT16 wCW_UpdateRate;
-   UINT16 wCW_DetectThreshold;
+   CXT_UINT16 wCallWaitingTimeOut;
+   CXT_UINT16 wCW_AGCMAXG;
+   CXT_UINT16 wCW_AGCSLR;
+   CXT_UINT16 wCW_AGCREF;
+   CXT_UINT16 wCW_Alpha2Coefficient;
+   CXT_UINT16 wCW_Beta2Coefficient;
+   CXT_UINT16 wCW_Alpha1Coefficient;
+   CXT_UINT16 wCW_UpdateRate;
+   CXT_UINT16 wCW_DetectThreshold;
 } CntryCallWaitingHwToneDetector;
 */
 #pragma pack()
@@ -733,8 +733,8 @@
 
 #pragma pack(1)
 typedef struct PACKED_ATTRIB CntryCallWaitingParams_Tag {
-	UINT8							ValidFlag;	/* if set to 0 CW isn't supported */
-	UINT32							CycleTime;	/* in ms */
+	CXT_UINT8							ValidFlag;	/* if set to 0 CW isn't supported */
+	CXT_UINT32							CycleTime;	/* in ms */
 	CntryCallWaitingToneDetector	CW_ToneDetector;
 //    SINGLETONEDETECT		        ToneAS;
 	CntryCallWaitingAction			AcceptAction[MOH_MAX_SWITCH_COMMANDS];
@@ -747,20 +747,20 @@
 
 typedef struct PACKED_ATTRIB CallWaitingInfoTag
 {
-	UINT32	dwCWEnable;
-	BOOL		bCWDetected;
-	BOOL		bCWCIDCollected;
+	CXT_UINT32	dwCWEnable;
+	CXT_BOOL		bCWDetected;
+	CXT_BOOL		bCWCIDCollected;
 	CW_HWToneDetectorParams *pCWToneParams;
-	BOOL		bLookingForCAS;
-	BOOL		bInCWCID;
+	CXT_BOOL		bLookingForCAS;
+	CXT_BOOL		bInCWCID;
 } CallWaitingInfo;
 
 typedef struct PACKED_ATTRIB CntryV92Control_Tag {
-	UINT32	UpstreamEnable : 1;
-	UINT32	Fill1		   : 15;
-	UINT32	MohDetectCw    : 1;
-	UINT32	OgcEnable	   : 1;
-	UINT32	Fill2		   : 14;
+	CXT_UINT32	UpstreamEnable : 1;
+	CXT_UINT32	Fill1		   : 15;
+	CXT_UINT32	MohDetectCw    : 1;
+	CXT_UINT32	OgcEnable	   : 1;
+	CXT_UINT32	Fill2		   : 14;
 } CntryV92Control;
 
 typedef struct CntryOGCParams_Tag
@@ -773,47 +773,47 @@
 #if !defined NO_QC_SUPPORT
 typedef struct PACKED_ATTRIB QuickConnectInfoTag
 {
-   BOOL bProfileStorageEnable;
-   UINT8 cEraseProfile;
-   UINT32 dwCW_MOH_QCPrintState;
-/*   UINT32 dwATCmdQCValue; */
-   UINT32 dwQCEnable;
-   BOOL bSaveProfile;
-
-   UINT16 wRxCurrState;
-   UINT16 wRxPrevState;
-   UINT16 wTxCurrState;
-   UINT16 wTxPrevState;
-   UINT8 cCurrConf;
-   UINT8 cPrevConf;
-   BOOL bStartWA;
-   BOOL bDpConfigChangeAA;
-   BOOL bSentQC2a;
-   BOOL bGotQCA1d;
-   BOOL bUseV8Normal;   
-   BOOL bStartedTraining;
+   CXT_BOOL bProfileStorageEnable;
+   CXT_UINT8 cEraseProfile;
+   CXT_UINT32 dwCW_MOH_QCPrintState;
+/*   CXT_UINT32 dwATCmdQCValue; */
+   CXT_UINT32 dwQCEnable;
+   CXT_BOOL bSaveProfile;
+
+   CXT_UINT16 wRxCurrState;
+   CXT_UINT16 wRxPrevState;
+   CXT_UINT16 wTxCurrState;
+   CXT_UINT16 wTxPrevState;
+   CXT_UINT8 cCurrConf;
+   CXT_UINT8 cPrevConf;
+   CXT_BOOL bStartWA;
+   CXT_BOOL bDpConfigChangeAA;
+   CXT_BOOL bSentQC2a;
+   CXT_BOOL bGotQCA1d;
+   CXT_BOOL bUseV8Normal;   
+   CXT_BOOL bStartedTraining;
 
    /* Measurement, remove when done */
-   UINT32 dwTotalTime;
-   UINT32 dwStartTime;
-   UINT32 dwStopTime;
-   UINT32 dwV8QCSetupTimeStamp;
-   UINT32 dwV8GotQC1dTimeStamp;
-   UINT32 dwATCmdQCPSSValue;
-   BOOL  bQCPSSEnable;
-   UINT32 dwATCmdQCPSValue;
+   CXT_UINT32 dwTotalTime;
+   CXT_UINT32 dwStartTime;
+   CXT_UINT32 dwStopTime;
+   CXT_UINT32 dwV8QCSetupTimeStamp;
+   CXT_UINT32 dwV8GotQC1dTimeStamp;
+   CXT_UINT32 dwATCmdQCPSSValue;
+   CXT_BOOL  bQCPSSEnable;
+   CXT_UINT32 dwATCmdQCPSValue;
 } QuickConnectInfo;
 #endif
 
 typedef struct PACKED_ATTRIB tagCtryPrmsStruct {
-	UINT16							T35Code;							/* T.35 Country Identification*/
+	CXT_UINT16							T35Code;							/* T.35 Country Identification*/
 	char							cInter[MAX_OEM_STR_LEN];			/* Country Name*/
 	char							cIntCode[MAX_OEM_STR_LEN];			/* Country International Access code*/
 	CntryTxlevelStructure			Txlevel;							/* + Transmit Level*/
 	DAA_RELAY_TYPE					Relays[DEVMGR_LAST_RELAY_ENTRY];	/* + Relay Control Parameters*/
 	CntryPulseStructure				Pulse;								/* Pulse Dial Parameters*/
 	CntryRingStructure				Ring;								/* + Ring Detection Parameters*/
-	UINT8							SRegLimits[NUM_LIMITED_SREGS][4];	/* S Register Limiting*/
+	CXT_UINT8							SRegLimits[NUM_LIMITED_SREGS][4];	/* S Register Limiting*/
 	CntryDTMFStructure				DTMF;								/* + DTMF Dial Parameters*/
 	CntryFilterStructure			Filter;								/* + Filter Parameters*/
 	CntryThresholdStructure			Threshold;							/* + Thresholds Parameters*/
@@ -916,9 +916,9 @@
 
 #pragma pack(1)
 typedef struct OEMCadence_Tag {
-    UINT8       ToneCadence_NumberOfPhases;  
+    CXT_UINT8       ToneCadence_NumberOfPhases;  
     CadPrm      FaxCallingParams;		
-    UINT32      FaxCallingToneTimer;  
+    CXT_UINT32      FaxCallingToneTimer;  
 } OEMCadenceStructure;
 #pragma pack()
 
@@ -930,104 +930,104 @@
 typedef struct tagV25Ter_Struct
 {
     /* V.25ter variables */
-    UINT32 dwAutoDetect;        /*+IPR fixed DTE rate */
-    UINT32 dwDTERateReport;     /*+ILRR DTE rate reporting */
-    UINT32 dwModulationReport;  /*+MR modulation reporting */
-    UINT32 dwSelReject;         /*+ESR selective reject */
-    UINT32 dwFCSSelect;         /*+EFCS frame check sequence select */
-    UINT32 dwECReport;          /*+ER error correction reporting */
-    UINT32 dwCompressReport;    /*+DR data compression reporting */
-
-    /*   BOOL  bStringParm;         // String parm for parsing */
-    UINT8  cCFallowed;          /* V.25ter Annex A accepted call functions */
-    UINT8  cV8pf;               /* V.25ter Annex A accepted pr */
+    CXT_UINT32 dwAutoDetect;        /*+IPR fixed DTE rate */
+    CXT_UINT32 dwDTERateReport;     /*+ILRR DTE rate reporting */
+    CXT_UINT32 dwModulationReport;  /*+MR modulation reporting */
+    CXT_UINT32 dwSelReject;         /*+ESR selective reject */
+    CXT_UINT32 dwFCSSelect;         /*+EFCS frame check sequence select */
+    CXT_UINT32 dwECReport;          /*+ER error correction reporting */
+    CXT_UINT32 dwCompressReport;    /*+DR data compression reporting */
+
+    /*   CXT_BOOL  bStringParm;         // String parm for parsing */
+    CXT_UINT8  cCFallowed;          /* V.25ter Annex A accepted call functions */
+    CXT_UINT8  cV8pf;               /* V.25ter Annex A accepted pr */
 
-    /*   UINT32 dwTempo; */
+    /*   CXT_UINT32 dwTempo; */
 
     /* +A8E parms    */
-    UINT32 dwV8o;
-    UINT32 dwV8a;
-    UINT32 dwV8cf;
-    UINT32 dwV8b;
-    UINT8  szCfrange[20];
-    UINT8  szProtrange[20];
+    CXT_UINT32 dwV8o;
+    CXT_UINT32 dwV8a;
+    CXT_UINT32 dwV8cf;
+    CXT_UINT32 dwV8b;
+    CXT_UINT8  szCfrange[20];
+    CXT_UINT8  szProtrange[20];
 
     /* +DS parms */
-    UINT32 dwCompressDir;
-    UINT32 dwCompressNeg;
-    UINT32 dwCompressDict;
-    UINT32 dwCompressStr;
+    CXT_UINT32 dwCompressDir;
+    CXT_UINT32 dwCompressNeg;
+    CXT_UINT32 dwCompressDict;
+    CXT_UINT32 dwCompressStr;
 
     /* +EB parms */
-    UINT32 dwBreakSel;
-    UINT32 dwBreakTimed;
-    UINT32 dwBreakLen;
+    CXT_UINT32 dwBreakSel;
+    CXT_UINT32 dwBreakTimed;
+    CXT_UINT32 dwBreakLen;
 
     /* +ES parms */
-    UINT32 dwOrgReq;                   /* +ES parm 1 */
-    UINT32 dwOrgFbk;                   /* +ES parm 2 */
-    UINT32 dwAnsFbk;                   /* +ES parm 3 */
+    CXT_UINT32 dwOrgReq;                   /* +ES parm 1 */
+    CXT_UINT32 dwOrgFbk;                   /* +ES parm 2 */
+    CXT_UINT32 dwAnsFbk;                   /* +ES parm 3 */
 
 
     /* +ESA parms */
-    UINT32 dwV80TransIdle;             /* +ESA parm 1 -- Transparent sub-Mode Idle Control */
-    UINT32 dwV80FramedIdle;            /* +ESA parm 2 -- Framed sub-Mode Idle Control (Flags or Marks) */
-    UINT32 dwV80FramedUnOv;            /* +ESA parm 3 -- Framed sub-Mode Underrun/Overrun Control (Abort or Flag) */
-    /*UINT32 dwV80HdAuto;                // +ESA parm 4 -- Half Duplex Carrier Control --- NOT IMPLEMENTED */
-    UINT32 dwV80CRCType;               /* +ESA parm 5 -- CRC type (none, LAPM's 16-bit CRC, LAPM's 32-bit CRC) */
-    UINT32 dwV80NRZIEn;                /* +ESA parm 6 -- NRZI Encoding Enable */
-    UINT32 dwV80Syn1;                  /* +ESA parm 7 -- Sync char 1 (used on idle) */
-    /*UINT32 dwV80Syn2;                  // +ESA parm 8 -- Sync char 2 (used on idle) --- NOT IMPLEMENTED */
+    CXT_UINT32 dwV80TransIdle;             /* +ESA parm 1 -- Transparent sub-Mode Idle Control */
+    CXT_UINT32 dwV80FramedIdle;            /* +ESA parm 2 -- Framed sub-Mode Idle Control (Flags or Marks) */
+    CXT_UINT32 dwV80FramedUnOv;            /* +ESA parm 3 -- Framed sub-Mode Underrun/Overrun Control (Abort or Flag) */
+    /*CXT_UINT32 dwV80HdAuto;                // +ESA parm 4 -- Half Duplex Carrier Control --- NOT IMPLEMENTED */
+    CXT_UINT32 dwV80CRCType;               /* +ESA parm 5 -- CRC type (none, LAPM's 16-bit CRC, LAPM's 32-bit CRC) */
+    CXT_UINT32 dwV80NRZIEn;                /* +ESA parm 6 -- NRZI Encoding Enable */
+    CXT_UINT32 dwV80Syn1;                  /* +ESA parm 7 -- Sync char 1 (used on idle) */
+    /*CXT_UINT32 dwV80Syn2;                  // +ESA parm 8 -- Sync char 2 (used on idle) --- NOT IMPLEMENTED */
 
     /* +ETBM parms */
-    UINT32 dwPendingTD;
-    UINT32 dwPendingRD;
-    UINT32 dwPendingTimer;
+    CXT_UINT32 dwPendingTD;
+    CXT_UINT32 dwPendingRD;
+    CXT_UINT32 dwPendingTimer;
 
     /* +FIT parms */
-    UINT32 dwInactiveTmr;
-    UINT32 dwInactiveAction;
+    CXT_UINT32 dwInactiveTmr;
+    CXT_UINT32 dwInactiveAction;
 
     /* +ICF parms */
-    UINT32 dwCharFormat;
-    UINT32 dwCharParity;
+    CXT_UINT32 dwCharFormat;
+    CXT_UINT32 dwCharParity;
 
     /* +IFC parms */
-    UINT32 dwDCEByDTE;
-    UINT32 dwDTEByDCE;
+    CXT_UINT32 dwDCEByDTE;
+    CXT_UINT32 dwDTEByDCE;
 
     /* +ITF parms */
-    UINT32 dwV80XOffThreshold;         /* +ITF parm 1 -- Tx buffer threshold at which XOFF is generated */
-    UINT32 dwV80XOnThreshold;          /* +ITF parm 2 -- Tx buffer threshold at which XON is generated */
-    UINT32 dwV80RptInterval;           /* +ITF parm 3 -- Report # of bytes in TX buffer at defined  */
+    CXT_UINT32 dwV80XOffThreshold;         /* +ITF parm 1 -- Tx buffer threshold at which XOFF is generated */
+    CXT_UINT32 dwV80XOnThreshold;          /* +ITF parm 2 -- Tx buffer threshold at which XON is generated */
+    CXT_UINT32 dwV80RptInterval;           /* +ITF parm 3 -- Report # of bytes in TX buffer at defined  */
 
     /*+PCW, +PMH, and +PQC parms RLC */
-    UINT8  cPCW;						/* Call Waiting Enable */
-    UINT8  cPMH;						/* Modem on Hold Enable */
-    UINT8  cPQC;						/* Quick Connect Enable */
+    CXT_UINT8  cPCW;						/* Call Waiting Enable */
+    CXT_UINT8  cPMH;						/* Modem on Hold Enable */
+    CXT_UINT8  cPQC;						/* Quick Connect Enable */
 
     /* V.25ter/TIA-602 plus Misc.       // 0 1 2   3   4   5 6 7 8     9     10 11 12 13 */
-    /*   UINT8    OtherCmds[14];              // E,Q,V,(P,T),&D,&C,L,M,X,(&T4,&T5),%E,&G,&P,&R */
-    UINT8  OtherCmds[MAX_OTHERCOMMANDS];              /* E,Q,V,(P,T),&D,&C,L,M,X,(&T4,&T5),%E,&G,&P,&R */
+    /*   CXT_UINT8    OtherCmds[14];              // E,Q,V,(P,T),&D,&C,L,M,X,(&T4,&T5),%E,&G,&P,&R */
+    CXT_UINT8  OtherCmds[MAX_OTHERCOMMANDS];              /* E,Q,V,(P,T),&D,&C,L,M,X,(&T4,&T5),%E,&G,&P,&R */
 									    /*JT increased for &A ,&K, &M,X, &Y,&B, &H,&I,&R, Y,Z,&F for USR */
 											
 } V25Ter_Struct;
 #pragma pack()
 
 typedef struct SoftMSParmsStructTAG {
-	UINT32      dwMsMode;
-	UINT32      dwMsAuto;
-	UINT32      dwMsMinTxSp;
-	UINT32      dwMsMaxTxSp;
-	UINT32      dwMsMinRxSp;
-	UINT32      dwMsMaxRxSp;
+	CXT_UINT32      dwMsMode;
+	CXT_UINT32      dwMsAuto;
+	CXT_UINT32      dwMsMinTxSp;
+	CXT_UINT32      dwMsMaxTxSp;
+	CXT_UINT32      dwMsMinRxSp;
+	CXT_UINT32      dwMsMaxRxSp;
 } SoftMSParmsStruct;
 
 typedef struct MiscParms_Struct {
-	UINT32      dwExtResponse;     /*W setting */
-	UINT32      dwFaxAutoAnswer;   /*+FAE setting */
-    BOOL        bV90Enabled;
-    BOOL        bV34FEnabled;
+	CXT_UINT32      dwExtResponse;     /*W setting */
+	CXT_UINT32      dwFaxAutoAnswer;   /*+FAE setting */
+    CXT_BOOL        bV90Enabled;
+    CXT_BOOL        bV34FEnabled;
 } MiscParmsStruct;
 
 typedef struct PACKED_ATTRIB tagOEM_Filter {
@@ -1042,8 +1042,8 @@
 } OEMFilterStructure;
 
 typedef struct PACKED_ATTRIB tagModulation {
-	UINT16		Org;
-	UINT16		Ans;
+	CXT_UINT16		Org;
+	CXT_UINT16		Ans;
 } Modulation;
 
 typedef struct PACKED_ATTRIB tagOEM_Threshold {
@@ -1060,39 +1060,39 @@
 	Modulation		V27;
 	Modulation		V29;
 	Modulation		V17;
-	UINT16			bRx28800Thr;
+	CXT_UINT16			bRx28800Thr;
 } OEMThresholdStruct;
 
 typedef struct PACKED_ATTRIB tagPROFILE_DATA
 {
-    UINT8       Echo;          /* ATE 	CFGMGR_DTE_ECHO*/
-    UINT8       Volume;        /* ATL 	CFGMGR_SPEAKER_VOLUME*/
-    UINT8       Speaker;       /* ATM 	CFGMGR_SPEAKER_CONTROL*/
-    UINT8   	Pulse;         /* ATT/ATD 1-PULSE, 0-TONE 	CFGMGR_DIAL_MODE*/
-
-    UINT8       Quiet;         /* ATQ	CFGMGR_DTE_CONFIG.bQuiet*/
-    UINT8       Verbose;       /* ATV	DTE_USER_CONFIG.bVerbose*/
-    UINT8       Level;         /* ATX	DTE_USER_CONFIG.bLevel*/
-    UINT8       Connect;
-
-    UINT8       AmperC;     /* CFGMGR_RLSD_BEHAVIOR*/
-    UINT8       AmperD;     /* CFGMGR_DTR_BEHAVIOR*/
-
-    UINT8       S0;         /* Sregisters CFGMGR_SREG + <number>*/
-    UINT8       S1;
-    UINT8       S2;
-    UINT8       S3;
-    UINT8       S4;
-    UINT8       S5;
-    UINT8       S6;
-    UINT8       S7;
-    UINT8       S8;
-    UINT8       S10;
-    UINT8       S11;
-    UINT8       S12;
-    UINT8       S16;
-    UINT8       S18;
-    UINT8       S29;
+    CXT_UINT8       Echo;          /* ATE 	CFGMGR_DTE_ECHO*/
+    CXT_UINT8       Volume;        /* ATL 	CFGMGR_SPEAKER_VOLUME*/
+    CXT_UINT8       Speaker;       /* ATM 	CFGMGR_SPEAKER_CONTROL*/
+    CXT_UINT8   	Pulse;         /* ATT/ATD 1-PULSE, 0-TONE 	CFGMGR_DIAL_MODE*/
+
+    CXT_UINT8       Quiet;         /* ATQ	CFGMGR_DTE_CONFIG.bQuiet*/
+    CXT_UINT8       Verbose;       /* ATV	DTE_USER_CONFIG.bVerbose*/
+    CXT_UINT8       Level;         /* ATX	DTE_USER_CONFIG.bLevel*/
+    CXT_UINT8       Connect;
+
+    CXT_UINT8       AmperC;     /* CFGMGR_RLSD_BEHAVIOR*/
+    CXT_UINT8       AmperD;     /* CFGMGR_DTR_BEHAVIOR*/
+
+    CXT_UINT8       S0;         /* Sregisters CFGMGR_SREG + <number>*/
+    CXT_UINT8       S1;
+    CXT_UINT8       S2;
+    CXT_UINT8       S3;
+    CXT_UINT8       S4;
+    CXT_UINT8       S5;
+    CXT_UINT8       S6;
+    CXT_UINT8       S7;
+    CXT_UINT8       S8;
+    CXT_UINT8       S10;
+    CXT_UINT8       S11;
+    CXT_UINT8       S12;
+    CXT_UINT8       S16;
+    CXT_UINT8       S18;
+    CXT_UINT8       S29;
 
 } PROFILE_DATA, *PPROFILE_DATA;
 
@@ -1101,9 +1101,9 @@
 
 typedef struct tagDownloadFailure
 {
-    UINT8   bCode;
-    UINT8   bDesiredCRC;
-    UINT8   bActualCRC;
+    CXT_UINT8   bCode;
+    CXT_UINT8   bDesiredCRC;
+    CXT_UINT8   bActualCRC;
 } DOWNLOAD_FAILURE, *PDOWNLOAD_FAILURE;
 
 #define MAX_DOWNLOAD_FAILURE    10
@@ -1111,120 +1111,120 @@
 typedef struct PACKED_ATTRIB tagPOUND_UD_DATA
 {
     UD_DISPLAY          cUDDisplay;         /*Flag used to detemine if to display #UD/#UG   Done*/
-	UINT8				cUDCallSetup;		/*0x1, Table 2                                  Done*/
-	UINT8		        cUDMultMediaMode;   /*0x2, Table 3                                  Done*/
-	UINT8			    cUDDTEDCEmode;      /*0x3, Table 4*/
+	CXT_UINT8				cUDCallSetup;		/*0x1, Table 2                                  Done*/
+	CXT_UINT8		        cUDMultMediaMode;   /*0x2, Table 3                                  Done*/
+	CXT_UINT8			    cUDDTEDCEmode;      /*0x3, Table 4*/
 
 	char    sUDV8CM[20];					/* 0x4 V8_CM                                    Done*/
 	char    sUDV8JM[20];					/* 0x5 V8_JM                                    Done*/
 
-	UINT8   cUDRXdb;						/*0x10, 2 Digits in Hex                         Done*/
-	UINT8   cUDTXdb;						/*0x11, 2 Digits in Hex                         Done*/
-	UINT8   cUDSNratio;						/*0x12, 2 Digits in Hex                         Done*/
-	UINT8   cUDMSE;							/*0x13 Normalized Mean Squared error*/
-	UINT8   cUDNearEchoLoss;				/*0x14 near echo loss*/
-	UINT8   cUDFarEchoLoss;					/*0x15 far echo loss*/
-	UINT16  wUDFarEchoDelay;				/*0x16 far echo delay*/
-	UINT16  wUDRoundTripDelay;				/*0x17 round trip delay*/
-    UINT32  cV34InfoBits;                   /*0x18 status */
+	CXT_UINT8   cUDRXdb;						/*0x10, 2 Digits in Hex                         Done*/
+	CXT_UINT8   cUDTXdb;						/*0x11, 2 Digits in Hex                         Done*/
+	CXT_UINT8   cUDSNratio;						/*0x12, 2 Digits in Hex                         Done*/
+	CXT_UINT8   cUDMSE;							/*0x13 Normalized Mean Squared error*/
+	CXT_UINT8   cUDNearEchoLoss;				/*0x14 near echo loss*/
+	CXT_UINT8   cUDFarEchoLoss;					/*0x15 far echo loss*/
+	CXT_UINT16  wUDFarEchoDelay;				/*0x16 far echo delay*/
+	CXT_UINT16  wUDRoundTripDelay;				/*0x17 round trip delay*/
+    CXT_UINT32  cV34InfoBits;                   /*0x18 status */
    
-	UINT8   cUDTXCarrierNegotiation;		/*0x20, Table 6                                 Done*/
-	UINT8   cUDRXCarrierNegotiation;		/*0x21, Table 6                                 Done*/
-	UINT16  wUDTXSymbol;					/*0x22, 4 Digits in Hex                         Done*/
-	UINT16  wUDRXSymbol;					/*0x23, 4 Digits in Hex                         Done*/
-	UINT16  wUDTXCarrierFreq;				/*0x24, 4 Digits in Hex                         Done*/
-	UINT16  wUDRXCarrierFreq;				/*0x25, 4 Digits in Hex                         Done*/
-	UINT16  wUDFirstTXrate;					/*0x26, 4 Digits in Hex                         Done*/
-	UINT16  wUDFirstRXrate;					/*0x27, 4 Digits in Hex                         Done*/
-
-	UINT8   cUDCarrierLossCount;			/*0x30, 2 Digits in Hex                         Done*/
-    UINT8   cUDRateRenegReqCount;           /*0x31, 2 Digits in Hex, (half)                 Done*/
-    UINT8   cUDRateRenegDetCount;           /*0x31, 2 Digits in Hex, (half)                 Done*/
-    UINT8   cUDRetrainReqCount;             /*0x32, 2 digits in Hex                         Done*/
-
-    UINT32  dwEqmAboveRtrnThreshold;
-    UINT32  dwEqmAboveRenegThreshold;
-    UINT32  dwEqmBelowRenegThreshold;
-    UINT32  dwBlockErrors;
-    UINT32  dwRtrnCounterExceeded;
-    UINT32  dwRtrnAsThirdReneg;
-	UINT32	dwInvalidSymbolRate;
-	UINT32	dwInvalidMsIndex;
-    UINT8   cUDRetrainDetCount;             /*0x33  2 digits, Retrains granted              Done*/
-    UINT16  wUDLastTXrate;                  /*0x34, 4 digits in Hex                         Done*/
-    UINT16  wUDLastRXrate;                  /*0x35, 4 digits in Hex                         Done*/
-
-    UINT8   cUDProtocolNegotiation;     /*0x40, table 4                             Done*/
-    UINT16  wUDMaxFrameSize;                    /*0x41, 3 digits*/
-    UINT8   cUDECLinkTimeout;                   /*0x42, 1 digits*/
-    UINT8   cUDECLinkNAK;                       /*0x43, 1 digits*/
-    UINT8   cUDCompressionNegotiation;  /*0x44, table 5                             Done*/
-    UINT16  cUDCompressionDictSize;             /*0x45, 4 digits                            Done*/
-
-    UINT8   cUDTXFlowControl;               /*0x50, 1 digits                                Done*/
-    UINT8   cUDRXFlowControl;               /*0x51, 1 digits                                Done*/
-    UINT32  lUDTXCharFromDTE;               /*0x52, 8 digits                                Done*/
-    UINT32  lUDRXCharToDTE;                 /*0x53, 8 digits                                Done*/
-    UINT16  wUDTXCharLost;                  /*0x54, 4 digits                                ---*/
-    UINT16  wUDRXCharLost;                  /*0x55, 4 digits                                ---*/
-    UINT32  lUDTXFrameCount;                /*0x56, 8 digits                                Done ?*/
-    UINT32  lUDRXFrameCount;                /*0x57, 8 digits                                Done ?*/
-    UINT32  lUDTXFrameErrorCount;           /*0x58, 8 digits                                Done ?*/
-    UINT32  lUDRXFrameErrorCount;           /*0x59, 8 digits                                Done ?*/
+	CXT_UINT8   cUDTXCarrierNegotiation;		/*0x20, Table 6                                 Done*/
+	CXT_UINT8   cUDRXCarrierNegotiation;		/*0x21, Table 6                                 Done*/
+	CXT_UINT16  wUDTXSymbol;					/*0x22, 4 Digits in Hex                         Done*/
+	CXT_UINT16  wUDRXSymbol;					/*0x23, 4 Digits in Hex                         Done*/
+	CXT_UINT16  wUDTXCarrierFreq;				/*0x24, 4 Digits in Hex                         Done*/
+	CXT_UINT16  wUDRXCarrierFreq;				/*0x25, 4 Digits in Hex                         Done*/
+	CXT_UINT16  wUDFirstTXrate;					/*0x26, 4 Digits in Hex                         Done*/
+	CXT_UINT16  wUDFirstRXrate;					/*0x27, 4 Digits in Hex                         Done*/
+
+	CXT_UINT8   cUDCarrierLossCount;			/*0x30, 2 Digits in Hex                         Done*/
+    CXT_UINT8   cUDRateRenegReqCount;           /*0x31, 2 Digits in Hex, (half)                 Done*/
+    CXT_UINT8   cUDRateRenegDetCount;           /*0x31, 2 Digits in Hex, (half)                 Done*/
+    CXT_UINT8   cUDRetrainReqCount;             /*0x32, 2 digits in Hex                         Done*/
+
+    CXT_UINT32  dwEqmAboveRtrnThreshold;
+    CXT_UINT32  dwEqmAboveRenegThreshold;
+    CXT_UINT32  dwEqmBelowRenegThreshold;
+    CXT_UINT32  dwBlockErrors;
+    CXT_UINT32  dwRtrnCounterExceeded;
+    CXT_UINT32  dwRtrnAsThirdReneg;
+	CXT_UINT32	dwInvalidSymbolRate;
+	CXT_UINT32	dwInvalidMsIndex;
+    CXT_UINT8   cUDRetrainDetCount;             /*0x33  2 digits, Retrains granted              Done*/
+    CXT_UINT16  wUDLastTXrate;                  /*0x34, 4 digits in Hex                         Done*/
+    CXT_UINT16  wUDLastRXrate;                  /*0x35, 4 digits in Hex                         Done*/
+
+    CXT_UINT8   cUDProtocolNegotiation;     /*0x40, table 4                             Done*/
+    CXT_UINT16  wUDMaxFrameSize;                    /*0x41, 3 digits*/
+    CXT_UINT8   cUDECLinkTimeout;                   /*0x42, 1 digits*/
+    CXT_UINT8   cUDECLinkNAK;                       /*0x43, 1 digits*/
+    CXT_UINT8   cUDCompressionNegotiation;  /*0x44, table 5                             Done*/
+    CXT_UINT16  cUDCompressionDictSize;             /*0x45, 4 digits                            Done*/
+
+    CXT_UINT8   cUDTXFlowControl;               /*0x50, 1 digits                                Done*/
+    CXT_UINT8   cUDRXFlowControl;               /*0x51, 1 digits                                Done*/
+    CXT_UINT32  lUDTXCharFromDTE;               /*0x52, 8 digits                                Done*/
+    CXT_UINT32  lUDRXCharToDTE;                 /*0x53, 8 digits                                Done*/
+    CXT_UINT16  wUDTXCharLost;                  /*0x54, 4 digits                                ---*/
+    CXT_UINT16  wUDRXCharLost;                  /*0x55, 4 digits                                ---*/
+    CXT_UINT32  lUDTXFrameCount;                /*0x56, 8 digits                                Done ?*/
+    CXT_UINT32  lUDRXFrameCount;                /*0x57, 8 digits                                Done ?*/
+    CXT_UINT32  lUDTXFrameErrorCount;           /*0x58, 8 digits                                Done ?*/
+    CXT_UINT32  lUDRXFrameErrorCount;           /*0x59, 8 digits                                Done ?*/
 
     CALL_TERMINATION_CAUSE cUDTermination;  /*0x60 Tables 8-9                               In process*/
 
-    UINT8   bHighPassDpFilterOn;            /*                                              Done*/
-    UINT8   bRBSpattern;                    /*                                              Done*/
-    UINT8   bPadDetected;                   /*                                              Done*/
-    UINT16  wDigitalLossEstimate;           /*                                              Done*/
-    UINT8   bDualPCMDetected;               /*                                              Done*/
-    UINT32  wTrainingCount;                 /*                                              Done*/
-    UINT32  dwTrainingEqmSum;               /*                                              Done*/
+    CXT_UINT8   bHighPassDpFilterOn;            /*                                              Done*/
+    CXT_UINT8   bRBSpattern;                    /*                                              Done*/
+    CXT_UINT8   bPadDetected;                   /*                                              Done*/
+    CXT_UINT16  wDigitalLossEstimate;           /*                                              Done*/
+    CXT_UINT8   bDualPCMDetected;               /*                                              Done*/
+    CXT_UINT32  wTrainingCount;                 /*                                              Done*/
+    CXT_UINT32  dwTrainingEqmSum;               /*                                              Done*/
     short   EqmValue;                       /*                                              Done*/
-    UINT8   cUDV34FBCause;                  /*                                              Done*/
+    CXT_UINT8   cUDV34FBCause;                  /*                                              Done*/
 
-	UINT32	lCallWaitingCounter;
-	UINT8	cSaveProfileResult;
-	UINT16  wIMDRatio;
-	UINT16  wA63Val;
-	UINT8	bAltRBS; 
-	UINT8   bSpeedDrop;
-	UINT32	dwHandshakeTime;
-	UINT32	dwHandshakeStarted,
+	CXT_UINT32	lCallWaitingCounter;
+	CXT_UINT8	cSaveProfileResult;
+	CXT_UINT16  wIMDRatio;
+	CXT_UINT16  wA63Val;
+	CXT_UINT8	bAltRBS; 
+	CXT_UINT8   bSpeedDrop;
+	CXT_UINT32	dwHandshakeTime;
+	CXT_UINT32	dwHandshakeStarted,
 			dwTrainingDone,
 			dwNegotiatingDone,
 			dwSessionEnded;
 
-	UINT8	nLAPMNeg;						/*	holds result of LAPM neg in v.8(bis)	*/
+	CXT_UINT8	nLAPMNeg;						/*	holds result of LAPM neg in v.8(bis)	*/
 
 #ifdef SAVE_TXRX_STATES
 	struct TxRxStateRecord
 	{
-		UINT32 Time;
-		UINT8 TxState, RxState, Conf;
+		CXT_UINT32 Time;
+		CXT_UINT8 TxState, RxState, Conf;
 	} TxRxStates[MAX_STATES];
     unsigned   cTxRxIndex;
-	UINT8 cDpSpeed, cOurSpeed;
+	CXT_UINT8 cDpSpeed, cOurSpeed;
 #endif
 #ifdef SAVE_MOH_STATES
 #define MAX_MOH_STATES  30
     struct MohStateRecord
     {
-		UINT32  dwTime;
-		UINT8   bTxState, bRxState;
-        UINT8   bAbCode, bDpState;
+		CXT_UINT32  dwTime;
+		CXT_UINT8   bTxState, bRxState;
+        CXT_UINT8   bAbCode, bDpState;
     } MohStates[MAX_MOH_STATES];
     unsigned   cMohIndex;
 #endif
 
 #ifdef CADMUS2
-	UINT8	nScriptReturnedWrongSize,
+	CXT_UINT8	nScriptReturnedWrongSize,
 			nScriptTimeout;
-	UINT16	wSpdCnt;
+	CXT_UINT16	wSpdCnt;
 #endif
 
-    UINT8   nDownloadFailureIndex;
+    CXT_UINT8   nDownloadFailureIndex;
     DOWNLOAD_FAILURE    DownloadFailure[MAX_DOWNLOAD_FAILURE];
 
 #ifdef LAPM_NEG_STATS
@@ -1232,37 +1232,37 @@
 #define LAPM_MAX_EQM_INDEX				50
 #define	LAPM_MAX_EQM_INDEX_DECIMATOR	50
 
-	UINT32	dwXidReceived;
-	UINT32	dwValidXidReceived;
-	UINT32	dwXidSent;
-	UINT32	dwSabmeSent;
-	UINT32  dwTimeWaitingForXID;
-	UINT32  dwTimeWaitingForUA;
-	UINT32  dwInvalidXidFormatId;
-	UINT32  dwInvalidXidLength;
-	UINT16	wEQM[LAPM_MAX_EQM_INDEX];
-	UINT16	wEqmIndex;
-	UINT16	wHDLC_abort;
-	UINT16	wHDLC_badcrc;
-	UINT16	wHDLC_noteof;
-	UINT16	wHDLC_overrun;
-	UINT16	wHDLC_goodeof;
+	CXT_UINT32	dwXidReceived;
+	CXT_UINT32	dwValidXidReceived;
+	CXT_UINT32	dwXidSent;
+	CXT_UINT32	dwSabmeSent;
+	CXT_UINT32  dwTimeWaitingForXID;
+	CXT_UINT32  dwTimeWaitingForUA;
+	CXT_UINT32  dwInvalidXidFormatId;
+	CXT_UINT32  dwInvalidXidLength;
+	CXT_UINT16	wEQM[LAPM_MAX_EQM_INDEX];
+	CXT_UINT16	wEqmIndex;
+	CXT_UINT16	wHDLC_abort;
+	CXT_UINT16	wHDLC_badcrc;
+	CXT_UINT16	wHDLC_noteof;
+	CXT_UINT16	wHDLC_overrun;
+	CXT_UINT16	wHDLC_goodeof;
 #endif
 #ifdef LOOPBACK_RETRAIN
 
 #define	LOOPBACK_MAX_EQM_NUMBER	64
 
-	UINT16	wLoopbackEqm[LOOPBACK_MAX_EQM_NUMBER];
-	UINT32	dwLoopbackEqmIndex;
-	UINT32	dwTotalLoopbackRetrains;
+	CXT_UINT16	wLoopbackEqm[LOOPBACK_MAX_EQM_NUMBER];
+	CXT_UINT32	dwLoopbackEqmIndex;
+	CXT_UINT32	dwTotalLoopbackRetrains;
 #endif
 
 #if defined(USE_LOOPBACK_RESTART) && defined(_DEBUG)
-	UINT32	dwLalSetupFailure;
+	CXT_UINT32	dwLalSetupFailure;
 #endif
 
 #ifdef DP_CLOCK_WA_STAT
-	UINT32	dwWa3333[4];
+	CXT_UINT32	dwWa3333[4];
 #endif
     } POUND_UD_DATA, *PPOUND_UD_DATA;
 
@@ -1292,9 +1292,9 @@
 typedef struct PACKED_ATTRIB tagPercTT_Parms
 {
     PERCTT_TYPE eType;
-    UINT32      x;
-    UINT32      y;
-    UINT32      z;
+    CXT_UINT32      x;
+    CXT_UINT32      y;
+    CXT_UINT32      z;
 } PERCTT_PARAMS, *PPERCTT_PARAMS;
 
 
@@ -1358,36 +1358,36 @@
 typedef struct tagMtParams
 {
 	MT_TYPE			Type;
-	UINT32			Timeout;
+	CXT_UINT32			Timeout;
 	DIAL_MODE		DialMode;
 	MT_STATUS		Status;
 	union {
-		UINT32		Value;
+		CXT_UINT32		Value;
 		struct		
 		{
-			UINT32	NoDialtoneTimeout;
-			UINT32	PostDelayTimeout;
+			CXT_UINT32	NoDialtoneTimeout;
+			CXT_UINT32	PostDelayTimeout;
 		} DialtoneDetection;
 		struct 
 		{
-			UINT32	NoiseLevel;
-			UINT32	MaxNoiseLevel;
+			CXT_UINT32	NoiseLevel;
+			CXT_UINT32	MaxNoiseLevel;
 		} BackgroundNoise;
 		struct
 		{
-			UINT32	MinRings;
-			UINT32	Rings;
+			CXT_UINT32	MinRings;
+			CXT_UINT32	Rings;
 		} RingDetection;
 		struct
 		{
-			UINT32			ConnectionTimeout;
-			UINT32			ConnectionTime;
+			CXT_UINT32			ConnectionTimeout;
+			CXT_UINT32			ConnectionTime;
 			CARRIER_REPORT	CarrierInfo;
 		} DataConnection;
 	};
-//	UINT32			Param1;	
-//	UINT32			Param2;
-//	UINT32			Param3;
+//	CXT_UINT32			Param1;	
+//	CXT_UINT32			Param2;
+//	CXT_UINT32			Param3;
 	char			DialString[MAX_MT_DIAL_STRING];
 } MT_PARAMS, *PMT_PARAMS;
 
@@ -1418,8 +1418,8 @@
 #define MAX_MIC_STEPS        6
 
 typedef struct tagVoiceEvent {
-    UINT32  dwEvent;
-    BOOL    bPostfix;
+    CXT_UINT32  dwEvent;
+    CXT_BOOL    bPostfix;
     } VOICE_EVENT;
 
 /* Voice Event code reporting from DCE */
@@ -1571,79 +1571,79 @@
 
 /* CFGMGR_VOICE_FDSP_PARAMS, CFGMGR_VOICE_FDSP_PREV_PARAMS */
 typedef struct tagVoiceFDSPParams {
-    UINT32  dwEnable;
-    UINT32  dwDuplexMode;
-    UINT32  dwMicGain;
-    UINT32  dwSpeakerGain;
-    UINT32  dwSpeakerStep;
-    UINT32  dwMicControl;
+    CXT_UINT32  dwEnable;
+    CXT_UINT32  dwDuplexMode;
+    CXT_UINT32  dwMicGain;
+    CXT_UINT32  dwSpeakerGain;
+    CXT_UINT32  dwSpeakerStep;
+    CXT_UINT32  dwMicControl;
     } VOICE_FDSP_PARAMS, *PVOICE_FDSP_PARAMS;
 
 /* CFGMGR_VOICE_VBT_PARAMS */
 typedef struct tagVoiceVBTParams {
-    UINT32  dwTxXONMark;
-    UINT32  dwTxXOFFMark;
+    CXT_UINT32  dwTxXONMark;
+    CXT_UINT32  dwTxXOFFMark;
     } VOICE_VBT_PARAMS, *PVOICE_VBT_PARAMS;
 
 /* CFGMGR_VOICE_VDID_PARAMS */
 typedef struct tagVoiceVDIDParams {
-    UINT32  dwSetting;
-    UINT32  dwDigits;
-    UINT32  dwTimeOut;
+    CXT_UINT32  dwSetting;
+    CXT_UINT32  dwDigits;
+    CXT_UINT32  dwTimeOut;
     } VOICE_VDID_PARAMS, *PVOICE_VDID_PARAMS;
 
 /* CFGMGR_VOICE_VDT_PARAMS */
 typedef struct tagVoiceVDTParams {
-    UINT32  dwToneReportEnable;
-    UINT32  dwToneReportType;
+    CXT_UINT32  dwToneReportEnable;
+    CXT_UINT32  dwToneReportType;
     } VOICE_VDT_PARAMS, *PVOICE_VDT_PARAMS;
 
 /* CFGMGR_VOICE_VGR_PARAMS */
 typedef struct tagVoiceVGRParams {
-    UINT32  dwVRxGain;
-    UINT8   cVolumeRxLevel;
-    UINT8   cMaxRxLevel;
-    UINT8   cMinRxLevel;
+    CXT_UINT32  dwVRxGain;
+    CXT_UINT8   cVolumeRxLevel;
+    CXT_UINT8   cMaxRxLevel;
+    CXT_UINT8   cMinRxLevel;
     } VOICE_VGR_PARAMS, *PVOICE_VGR_PARAMS;
 
 /* CFGMGR_VOICE_VGT_PARAMS */
 typedef struct tagVoiceVGTParams {
-    UINT32  dwVTxGain;
-    UINT8   cVolumeTxLevel;
+    CXT_UINT32  dwVTxGain;
+    CXT_UINT8   cVolumeTxLevel;
     } VOICE_VGT_PARAMS, *PVOICE_VGT_PARAMS;
 
 /* CFGMGR_VOICE_VLS_PARAMS */
 typedef struct tagVoiceVLSParams {
-    UINT32  bVoiceLocalMode;
-    UINT32  bVoicePhoneToDCE;
-    UINT32  bMicSpeakerToLine;
-    UINT32  bMicSpeakerToDCE;
-    UINT32  bMicSpeakerCtl;
-    UINT32  dwPreviousRelayConfig;
-    UINT32  bVLSOffHook;
+    CXT_UINT32  bVoiceLocalMode;
+    CXT_UINT32  bVoicePhoneToDCE;
+    CXT_UINT32  bMicSpeakerToLine;
+    CXT_UINT32  bMicSpeakerToDCE;
+    CXT_UINT32  bMicSpeakerCtl;
+    CXT_UINT32  dwPreviousRelayConfig;
+    CXT_UINT32  bVLSOffHook;
     } VOICE_VLS_PARAMS, *PVOICE_VLS_PARAMS;
 
 /* CFGMGR_VOICE_VSD_PARAMS */
 typedef struct tagVoiceVSDParams {
-    UINT32  dwSilenceTune;
-    UINT32  dwSilencePeriod;
+    CXT_UINT32  dwSilenceTune;
+    CXT_UINT32  dwSilencePeriod;
     } VOICE_VSD_PARAMS, *PVOICE_VSD_PARAMS;
 
 /* CFGMGR_VOICE_VSM_PARAMS */
 typedef struct tagVoiceVSMParams {
-    UINT32  dwCompressionMethod;
-    UINT32  dwSampleRate;
-    UINT32  dwSilenceCompression;
-    UINT32  dwSilenceExpansion;
+    CXT_UINT32  dwCompressionMethod;
+    CXT_UINT32  dwSampleRate;
+    CXT_UINT32  dwSilenceCompression;
+    CXT_UINT32  dwSilenceExpansion;
     } VOICE_VSM_PARAMS, *PVOICE_VSM_PARAMS;
 
 /* CFGMGR_VOICE_VTS_PARAMS */
 typedef struct tagVoiceVTSParams {
-    UINT32  dwFreqTone1;
-    UINT32  dwFreqTone2;
-    UINT32  dwDTMFDigit;
-    UINT32  dwDuration;
-    UINT32  dwToneType;
+    CXT_UINT32  dwFreqTone1;
+    CXT_UINT32  dwFreqTone2;
+    CXT_UINT32  dwDTMFDigit;
+    CXT_UINT32  dwDuration;
+    CXT_UINT32  dwToneType;
     } VOICE_VTS_PARAMS, *PVOICE_VTS_PARAMS;
 
 typedef enum tagVTSType {
@@ -1664,47 +1664,47 @@
 /* CFGMGR_VOICE_MISC_PARAMS */
 #pragma pack(1)
 typedef struct PACKED_ATTRIB tagVoiceMiscParams {
-   UINT32 dwDSVD_VGS_MIN;    /* dummy */
-   UINT32 dwDSVD_VGS_MAX;    /* dummy */
-   UINT32 dwDSVD_VGS;        /* dummy */
-   UINT32 dwDSVD_VGM_MIN;    /* dummy */
-   UINT32 dwDSVD_VGM_MAX;    /* dummy */
-   UINT32 dwDSVD_VGM;        /* dummy */
-   UINT32 dwFDSP_VGS_MIN;    
-   UINT32 dwFDSP_VGS_MAX;    
-   UINT32 dwFDSP_VGS;    
-   UINT32 dwFDSP_VGM_MIN;
-   UINT32 dwFDSP_VGM_MAX;
-   UINT32 dwFDSP_VGM;
-   UINT8  cFDSP_VGR_MIN;
-   UINT8  cFDSP_VGR_MAX;
-   UINT8  cFDSP_VGR;
-   UINT8  cTAM_VGR_MIN;
-   UINT8  cTAM_VGR_MAX;
-   UINT8  cTAM_VGR;
-   UINT8  cVoiceTxLimiter;
-   UINT8  cVoiceTeloutLimiter;
-   UINT8  cVIAMicGain;
-   UINT8  cVIA4DBDrop;
-   UINT8  cVIASpeakerGain;
-   UINT16 dwVoiceInputScale;
-   UINT16 wVoiceLineScale[6];
-   UINT16 wFDSPTAGCGAIN;
-   UINT16 wFDSPRAGCGAIN;
-   UINT16 wVoiceRxLineScale;
-   UINT16 wMicAGCAdd;
-   UINT16 LECLeakageCtl;
-   UINT16 wMinMicGain;
-   UINT16 wMaxMicGain;
-   UINT16 wMaxMicLvl;
-   UINT16 wTxSatAtt;
-   UINT8  cFDSPTxLimiter;
-   UINT8  cMinVRNAllowed;
-   UINT16 wMicGainConcurrent; 
-   UINT16 wSpkGainConcurrent;
-   UINT8  cLineSilenceDetectMin;
-   UINT8  cLineSilenceDetectMed;
-   UINT8  cLineSilenceDetectMax;
+   CXT_UINT32 dwDSVD_VGS_MIN;    /* dummy */
+   CXT_UINT32 dwDSVD_VGS_MAX;    /* dummy */
+   CXT_UINT32 dwDSVD_VGS;        /* dummy */
+   CXT_UINT32 dwDSVD_VGM_MIN;    /* dummy */
+   CXT_UINT32 dwDSVD_VGM_MAX;    /* dummy */
+   CXT_UINT32 dwDSVD_VGM;        /* dummy */
+   CXT_UINT32 dwFDSP_VGS_MIN;    
+   CXT_UINT32 dwFDSP_VGS_MAX;    
+   CXT_UINT32 dwFDSP_VGS;    
+   CXT_UINT32 dwFDSP_VGM_MIN;
+   CXT_UINT32 dwFDSP_VGM_MAX;
+   CXT_UINT32 dwFDSP_VGM;
+   CXT_UINT8  cFDSP_VGR_MIN;
+   CXT_UINT8  cFDSP_VGR_MAX;
+   CXT_UINT8  cFDSP_VGR;
+   CXT_UINT8  cTAM_VGR_MIN;
+   CXT_UINT8  cTAM_VGR_MAX;
+   CXT_UINT8  cTAM_VGR;
+   CXT_UINT8  cVoiceTxLimiter;
+   CXT_UINT8  cVoiceTeloutLimiter;
+   CXT_UINT8  cVIAMicGain;
+   CXT_UINT8  cVIA4DBDrop;
+   CXT_UINT8  cVIASpeakerGain;
+   CXT_UINT16 dwVoiceInputScale;
+   CXT_UINT16 wVoiceLineScale[6];
+   CXT_UINT16 wFDSPTAGCGAIN;
+   CXT_UINT16 wFDSPRAGCGAIN;
+   CXT_UINT16 wVoiceRxLineScale;
+   CXT_UINT16 wMicAGCAdd;
+   CXT_UINT16 LECLeakageCtl;
+   CXT_UINT16 wMinMicGain;
+   CXT_UINT16 wMaxMicGain;
+   CXT_UINT16 wMaxMicLvl;
+   CXT_UINT16 wTxSatAtt;
+   CXT_UINT8  cFDSPTxLimiter;
+   CXT_UINT8  cMinVRNAllowed;
+   CXT_UINT16 wMicGainConcurrent; 
+   CXT_UINT16 wSpkGainConcurrent;
+   CXT_UINT8  cLineSilenceDetectMin;
+   CXT_UINT8  cLineSilenceDetectMed;
+   CXT_UINT8  cLineSilenceDetectMax;
     } VOICE_MISC_PARAMS, *PVOICE_MISC_PARAMS;
 #pragma pack()
 
diff -U3 -r hsfmodem-old/modules/imported/include/dbgfuncs.h hsfmodem/modules/imported/include/dbgfuncs.h
--- hsfmodem-old/modules/imported/include/dbgfuncs.h	2006-02-07 16:43:56.000000000 +0000
+++ hsfmodem/modules/imported/include/dbgfuncs.h	2006-02-12 08:08:38.000000000 +0000
@@ -107,7 +107,7 @@
 
 #if ( (OS_TYPE == OS_LINUX) && (UK_MODE == UK_KERNEL) )
 #define DPRINTF(ARGS)	{					\
-						  UINT32 dwTime = OsGetSystemTime();	\
+						  CXT_UINT32 dwTime = OsGetSystemTime();	\
 						  OsDebugPrintf ("%07lu.%03lu: ", dwTime/1000, dwTime%1000);	\
 						  OsDebugPrintf ARGS;	\
 						  OsDebugPrintf ("\n");	\
diff -U3 -r hsfmodem-old/modules/imported/include/dcp.h hsfmodem/modules/imported/include/dcp.h
--- hsfmodem-old/modules/imported/include/dcp.h	2004-01-18 05:38:28.000000000 +0000
+++ hsfmodem/modules/imported/include/dcp.h	2006-02-12 08:08:39.000000000 +0000
@@ -105,7 +105,7 @@
 __shimcall__
 VOID DcpSetVolume(HANDLE hDcp, int nVolume);
 __shimcall__
-VOID DcpCallback(HANDLE hDcp, PVOID pData, UINT32 dwSize);
+VOID DcpCallback(HANDLE hDcp, PVOID pData, CXT_UINT32 dwSize);
 #endif  /* !defined NO_DCP_SUPPORT */
 
 #ifdef __cplusplus
diff -U3 -r hsfmodem-old/modules/imported/include/diagmgr_ex.h hsfmodem/modules/imported/include/diagmgr_ex.h
--- hsfmodem-old/modules/imported/include/diagmgr_ex.h	2006-02-07 16:43:56.000000000 +0000
+++ hsfmodem/modules/imported/include/diagmgr_ex.h	2006-02-12 08:08:40.000000000 +0000
@@ -126,7 +126,7 @@
 PVOID		DiagMgrGetInterface				(void);
 
 __shimcall__
-UINT32		DiagMgrGetInterfaceVersion		(void);
+CXT_UINT32		DiagMgrGetInterfaceVersion		(void);
 
 __shimcall__
 HDIAGMGR	DiagMgrCreate					(IN		PSYSTEM_INSTANCES_T pSys);			
@@ -150,13 +150,13 @@
 COM_STATUS	DiagMgrConfigure				(IN		HDIAGMGR			hInstance,
 											 IN		CNXT_DIAG_CFG_CODES	ConfigureCode,
 											 IN		PVOID				pInBuffer,
-											 IN		UINT32				dwBufferSize);
+											 IN		CXT_UINT32				dwBufferSize);
 
 __shimcall__
 COM_STATUS	DiagMgrControl					(IN		HDIAGMGR			hInstance,
 											 IN		CNXT_DIAG_CTRL_CODES ControlCode,
 											 IN		PVOID				pInBuffer,
-											 IN		UINT32				dwBufferSize);
+											 IN		CXT_UINT32				dwBufferSize);
 
 
 typedef struct I_DIAG_MGR_TAG{
@@ -177,7 +177,7 @@
 	Return Value: The interface compilation version.
 
 	********************************************************************************/
-	UINT32		(*GetInterfaceVersion)(void);
+	CXT_UINT32		(*GetInterfaceVersion)(void);
 
 
 	/********************************************************************************
@@ -281,7 +281,7 @@
 	COM_STATUS	(*Configure)(	IN	HDIAGMGR			hBlock,
 								IN	CNXT_DIAG_CFG_CODES	ConfigCode,
 								IN	PVOID				pInBuffer,
-								IN	UINT32				nInBufferSize);
+								IN	CXT_UINT32				nInBufferSize);
 
 	/********************************************************************************
 
@@ -301,7 +301,7 @@
 	COM_STATUS	(*Control)(	IN	HDIAGMGR				hBlock,
 							IN	CNXT_DIAG_CTRL_CODES	ControlCode,
 							IN	PVOID					pInBuffer,
-							IN	UINT32					nInBufferSize);
+							IN	CXT_UINT32					nInBufferSize);
 
 } I_DIAG_MGR_T, *PI_DIAG_MGR_T;
 
diff -U3 -r hsfmodem-old/modules/imported/include/dpaloem.h hsfmodem/modules/imported/include/dpaloem.h
--- hsfmodem-old/modules/imported/include/dpaloem.h	2006-02-07 16:43:56.000000000 +0000
+++ hsfmodem/modules/imported/include/dpaloem.h	2006-02-12 08:04:05.000000000 +0000
@@ -222,9 +222,9 @@
 /*                                         */
 typedef struct PACKED_ATTRIB BOARD_PARAMS_TAG
 {
-	BOOL			f3VoltsIA;			/* TRUE when it's 3.3 volt (should add 4 dB) */
-	BOOL			fSpkMuteHWPresent;	/* speaker can be muted */
-	BOOL			fSpkMuteHWPolarity;	/* spekar mute polarity. */
+	CXT_BOOL			f3VoltsIA;			/* TRUE when it's 3.3 volt (should add 4 dB) */
+	CXT_BOOL			fSpkMuteHWPresent;	/* speaker can be muted */
+	CXT_BOOL			fSpkMuteHWPolarity;	/* spekar mute polarity. */
 										/* when true - we should set a GPIO to mute */
 	DWORD			OEMSpkrMuteDelay;	/* in ms */
  
@@ -232,9 +232,9 @@
 	CAESAR_PARAMS	CaesarParams;		/* Specific parameters for Caesar */
 	CAESAR_PARAMS	CaesarParamsK3;		/* Specific parameters for Caesar on Kublai3 (Endurance) */
 	CAESAR_PARAMS	HalParams;			/* Specific parameters Hal */
-	BOOL			fPmeWithInt;		/* Generate PME with/without interrupt. */
+	CXT_BOOL			fPmeWithInt;		/* Generate PME with/without interrupt. */
 	BYTE			VoiceCodecMicGain;
-	BOOL			fClearPME;			/* Always clear PME status bit. */
+	CXT_BOOL			fClearPME;			/* Always clear PME status bit. */
 	
 	HW_DATA			HwData;
 
@@ -246,7 +246,7 @@
 	DWORD			VendorId;
 	DWORD			HwType;
 #endif
-	BOOL			fLookForExternalAudioStreams;	/* Specifies to CSampler whether it needs to evan try external source for audiostreams.																		*/
+	CXT_BOOL			fLookForExternalAudioStreams;	/* Specifies to CSampler whether it needs to evan try external source for audiostreams.																		*/
 
 	VIA_CORELOGIC_PARAMS ViaParams;
 	DWORD			PllStartupDelay;
diff -U3 -r hsfmodem-old/modules/imported/include/intfctrl_ex.h hsfmodem/modules/imported/include/intfctrl_ex.h
--- hsfmodem-old/modules/imported/include/intfctrl_ex.h	2006-02-07 16:43:56.000000000 +0000
+++ hsfmodem/modules/imported/include/intfctrl_ex.h	2006-02-12 08:08:41.000000000 +0000
@@ -236,7 +236,7 @@
 {
 #endif
 
-PVOID       CreateInterface     (IN BLOCK_TYPE BlockType, IN UINT32 BlockID);
+PVOID       CreateInterface     (IN BLOCK_TYPE BlockType, IN CXT_UINT32 BlockID);
 COM_STATUS  DestroyInterface    (IN PVOID Interface);
 
 #ifdef __cplusplus
@@ -249,7 +249,7 @@
 typedef struct I_INTF_CTRL_TAG
 {
     
-    PVOID       (*CreateInterface)   (BLOCK_TYPE BlockType, UINT32 BlockID);
+    PVOID       (*CreateInterface)   (BLOCK_TYPE BlockType, CXT_UINT32 BlockID);
     COM_STATUS  (*DestroyInterface)  (PVOID Interface);
 
 } I_INTF_CTRL_T, *PI_INTF_CTRL_T;
diff -U3 -r hsfmodem-old/modules/imported/include/memmgr_ex.h hsfmodem/modules/imported/include/memmgr_ex.h
--- hsfmodem-old/modules/imported/include/memmgr_ex.h	2006-02-07 16:43:56.000000000 +0000
+++ hsfmodem/modules/imported/include/memmgr_ex.h	2006-02-12 08:08:42.000000000 +0000
@@ -122,11 +122,11 @@
 #endif
 
 
-UINT32		MemMgrGetInterfaceVersion   (void);
+CXT_UINT32		MemMgrGetInterfaceVersion   (void);
 HMEMMGR     MemMgrCreate                (void);
 COM_STATUS  MemMgrDestroy               (IN HMEMMGR hMemMgr);
 #ifndef USE_INLINE_OS_MEMMGR
-PVOID	    MemMgrAlloc                 (IN HMEMMGR hMemMgr, IN UINT32 dwSize);
+PVOID	    MemMgrAlloc                 (IN HMEMMGR hMemMgr, IN CXT_UINT32 dwSize);
 COM_STATUS	MemMgrFree                  (IN HMEMMGR hMemMgr, PVOID	pMem);
 #else
 
@@ -136,7 +136,7 @@
 #include "osmemory_ex.h"
 
 #if ( USE_MEM_MGR == 1 )
-static inline PVOID       MemMgrAlloc    (HMEMMGR hMemMgr, UINT32 dwSize)
+static inline PVOID       MemMgrAlloc    (HMEMMGR hMemMgr, CXT_UINT32 dwSize)
 {
     return OsHeapAllocate(dwSize, OS_NON_PAGED);
 }
@@ -166,11 +166,11 @@
 
 typedef struct I_MEM_MGR_TAG
 {
-	UINT32		(*GetInterfaceVersion)(void);
+	CXT_UINT32		(*GetInterfaceVersion)(void);
 
 	HMEMMGR		(*Create)    (void);
 	COM_STATUS	(*Destroy)   (IN HMEMMGR	hMemMgr);
-	PVOID	    (*Alloc)     (IN	HMEMMGR	hMemMgr, IN UINT32 dwSizeSize);
+	PVOID	    (*Alloc)     (IN	HMEMMGR	hMemMgr, IN CXT_UINT32 dwSizeSize);
 	COM_STATUS	(*Free)      (IN	HMEMMGR	hMemMgr, IN PVOID pMem);
 
     #ifdef _DEBUG
diff -U3 -r hsfmodem-old/modules/imported/include/osdiag.h hsfmodem/modules/imported/include/osdiag.h
--- hsfmodem-old/modules/imported/include/osdiag.h	2006-02-07 16:43:56.000000000 +0000
+++ hsfmodem/modules/imported/include/osdiag.h	2006-02-12 08:08:42.000000000 +0000
@@ -173,7 +173,7 @@
 __shimcall__
 COM_STATUS OsDiagMgrNotify(	IN HANDLE			hOsDiagMgr,						 
 							CNXT_DIAG_CODES		Code,
-							UINT32				dwData		);
+							CXT_UINT32				dwData		);
 
 
 #if !defined NO_DUMPMGR_SUPPORT
diff -U3 -r hsfmodem-old/modules/imported/include/osmemory_ex.h hsfmodem/modules/imported/include/osmemory_ex.h
--- hsfmodem-old/modules/imported/include/osmemory_ex.h	2006-02-07 16:43:56.000000000 +0000
+++ hsfmodem/modules/imported/include/osmemory_ex.h	2006-02-12 08:08:43.000000000 +0000
@@ -85,7 +85,7 @@
 
 #define OS_HEAPSWAP			0x00000200 
 
-#define OS_NON_PAGED		(UINT32)0
+#define OS_NON_PAGED		(CXT_UINT32)0
 #define OS_FIXED			0x00000008
 
 #define OS_ZEROINIT			0x00000001	
@@ -117,13 +117,13 @@
 	Arguments: iPage - the base address of the memory space.
 			   nPages - number of pages to be commited.
 	
-	Return Value: BOOL.
+	Return Value: CXT_BOOL.
 
 	********************************************************************************/
 #if ((OS_TYPE == OS_LINUX) || (OS_TYPE == OS_MACOSX))
 #define OsPageCommit(iPage, nPages, PageData, flags) TRUE
 #else
-	StdCall(BOOL, OsPageCommit(UINT32 iPage, UINT32 nPages, UINT32 PageData, UINT32 flags));
+	StdCall(CXT_BOOL, OsPageCommit(CXT_UINT32 iPage, CXT_UINT32 nPages, CXT_UINT32 PageData, CXT_UINT32 flags));
 #endif
 
 	/********************************************************************************
@@ -135,13 +135,13 @@
 	Arguments: iPage - the base address of the memory space.
 			   nPages - number of pages to be commited.
 	
-	Return Value: BOOL.
+	Return Value: CXT_BOOL.
 
 	********************************************************************************/
 #if ((OS_TYPE == OS_LINUX) || (OS_TYPE == OS_MACOSX))
 #define OsPageDecommit(iPage, nPages) TRUE
 #else
-	StdCall(BOOL,OsPageDecommit(UINT32 iPage, UINT32 nPages)) ;
+	StdCall(CXT_BOOL,OsPageDecommit(CXT_UINT32 iPage, CXT_UINT32 nPages)) ;
 #endif
 
 	/********************************************************************************
@@ -153,11 +153,11 @@
 	Arguments: Size - the size of memory space to br reserved.
 			   Flags - the flags that should be send to the reserve funcyion.
 	
-	Return Value: BOOL.
+	Return Value: CXT_BOOL.
 
 	********************************************************************************/
 __shimcall__
-	StdCall(PVOID, OsPageReserve(UINT32 Size, UINT32 Flags));
+	StdCall(PVOID, OsPageReserve(CXT_UINT32 Size, CXT_UINT32 Flags));
 
 	/********************************************************************************
 	
@@ -169,10 +169,10 @@
 			   nPages - number of pages to free.
 	
 
-	Return Value: BOOL.
+	Return Value: CXT_BOOL.
 	********************************************************************************/
 __shimcall__
-	StdCall(BOOL, OsPageFree(PVOID	pMem, UINT32 nPages));
+	StdCall(CXT_BOOL, OsPageFree(PVOID	pMem, CXT_UINT32 nPages));
 
 	/********************************************************************************
 	
@@ -191,7 +191,7 @@
 #define OsHeapAllocate(size, flags) OsAllocate(size)
 #define OsHeapFree(ptr) OsFree(ptr)
 #else
-	StdCall(PVOID, OsHeapAllocate(UINT32 Size, int flags));
+	StdCall(PVOID, OsHeapAllocate(CXT_UINT32 Size, int flags));
 
 	/********************************************************************************
 	
@@ -219,7 +219,7 @@
 
 	********************************************************************************/
 __shimcall__
-	StdCall(UINT32, OsGetPageSize(void));
+	StdCall(CXT_UINT32, OsGetPageSize(void));
 
 	/********************************************************************************
 	
@@ -237,9 +237,9 @@
 	********************************************************************************/
 __shimcall__
 #if (PROJECT == PRJ_SDSL)
-	StdCall(BOOL, OsMemDMAAllocate(UINT32 nPages,UINT16 **ppPhysAddr, HANDLE *pMemHandle, UINT16 **ppBuffer, PVOID pResources));
+	StdCall(CXT_BOOL, OsMemDMAAllocate(CXT_UINT32 nPages,CXT_UINT16 **ppPhysAddr, HANDLE *pMemHandle, CXT_UINT16 **ppBuffer, PVOID pResources));
 #else	
-	StdCall(BOOL,OsMemDMAAllocate(UINT32 nPages,PUINT16* ppPhysAddr, HANDLE *pMemHandle, PUINT16* ppBuffer));
+	StdCall(CXT_BOOL,OsMemDMAAllocate(CXT_UINT32 nPages,PCXT_UINT16* ppPhysAddr, HANDLE *pMemHandle, PCXT_UINT16* ppBuffer));
 #endif
 
 	/********************************************************************************
@@ -255,7 +255,7 @@
 
 	********************************************************************************/
 __shimcall__
-	StdCall(BOOL, OsMemDMAFree(HANDLE MemHandle, UINT32 nPages));
+	StdCall(CXT_BOOL, OsMemDMAFree(HANDLE MemHandle, CXT_UINT32 nPages));
 	/********************************************************************************
 	
 	Function Name: OsAllignmentAlloc.
diff -U3 -r hsfmodem-old/modules/imported/include/osservices.h hsfmodem/modules/imported/include/osservices.h
--- hsfmodem-old/modules/imported/include/osservices.h	2006-02-07 16:43:56.000000000 +0000
+++ hsfmodem/modules/imported/include/osservices.h	2006-02-12 08:09:23.000000000 +0000
@@ -121,7 +121,7 @@
 ****************************************************************************************/
 #define OsAtomicCompareAndSwap(o, n, ptr) OsAtomicCompareAndSwapEx((PVOID)(o), (PVOID)(n), (PVOID*)(ptr), sizeof(*(ptr)))
 __shimcall__
-BOOL OsAtomicCompareAndSwapEx (PVOID oldValue, PVOID newValue, PVOID* address, INT size);
+CXT_BOOL OsAtomicCompareAndSwapEx (PVOID oldValue, PVOID newValue, PVOID* address, INT size);
 
 
 /****************************************************************************************
@@ -135,7 +135,7 @@
     Result: The result of the addition.
 ****************************************************************************************/
 __shimcall__
-INT32	OsAtomicAdd   (INT32 amount, INT32* address);
+CXT_INT32	OsAtomicAdd   (CXT_INT32 amount, CXT_INT32* address);
 
 
 /****************************************************************************************
@@ -145,7 +145,7 @@
     Result: The result of the increment.
 ****************************************************************************************/
 __shimcall__
-INT32	OsAtomicIncrement (INT32* address);
+CXT_INT32	OsAtomicIncrement (CXT_INT32* address);
 
 
 /****************************************************************************************
@@ -155,7 +155,7 @@
     Result: The result of the increment. 
 ****************************************************************************************/
 __shimcall__
-INT32	OsAtomicDecrement (INT32* address);
+CXT_INT32	OsAtomicDecrement (CXT_INT32* address);
 
 
 /****************************************************************************************
@@ -280,7 +280,7 @@
 Interrupt safe: no
 ****************************************************************************************/
 __shimcall__
-BOOL OsLockTry(HLOCK hLock);
+CXT_BOOL OsLockTry(HLOCK hLock);
 
 
 /****************************************************************************************
@@ -379,13 +379,13 @@
 #define OsStrLen strlen
 #else
 __shimcall__
-PVOID   OsMemSet    (PVOID pBuf, UINT8 c, UINT32 Count);
+PVOID   OsMemSet    (PVOID pBuf, CXT_UINT8 c, CXT_UINT32 Count);
 __shimcall__
-PVOID	OsMemCpy    (PVOID pDest, PVOID pSrc, UINT32 Count);
+PVOID	OsMemCpy    (PVOID pDest, PVOID pSrc, CXT_UINT32 Count);
 __shimcall__
-PVOID	OsMemMove   (PVOID pDest, PVOID pSrc, UINT32 Count);
+PVOID	OsMemMove   (PVOID pDest, PVOID pSrc, CXT_UINT32 Count);
 __shimcall__
-int		OsMemCmp    (PVOID pBuff1, PVOID pBuff2, UINT32 Count);
+int		OsMemCmp    (PVOID pBuff1, PVOID pBuff2, CXT_UINT32 Count);
 __shimcall__
 
 __shimcall__
@@ -399,7 +399,7 @@
 __shimcall__
 int     OsStrCmp    (LPCSTR szStr1, LPCSTR szStr2);
 __shimcall__
-int     OsStrnCmp   (LPCSTR szStr1, LPCSTR szStr2, UINT32 Count);
+int     OsStrnCmp   (LPCSTR szStr1, LPCSTR szStr2, CXT_UINT32 Count);
 __shimcall__
 int	    OsStrLen    (LPCSTR szStr);
 #endif
@@ -446,7 +446,7 @@
 Interrupt safe: yes
 **********************************************************************************/
 __shimcall__
-UINT32	OsGetSystemTime(void);
+CXT_UINT32	OsGetSystemTime(void);
 
 
 /**********************************************************************************
@@ -457,7 +457,7 @@
 Interrupt safe: no
 **********************************************************************************/
 __shimcall__
-void	OsSleep (UINT32 sleepTime);
+void	OsSleep (CXT_UINT32 sleepTime);
 
 
 /**********************************************************************************
@@ -494,9 +494,9 @@
 **********************************************************************************/
 #if (OS_TYPE != OS_LINUX)
 void	OsCallOnMyStack	(	IN	PCBFUNC	pFunc, 
-							IN	UINT32	lParam, 
+							IN	CXT_UINT32	lParam, 
 							IN	PUINT32	pTopOfStack, 
-							IN	UINT32	StackSizeBytes);
+							IN	CXT_UINT32	StackSizeBytes);
 #else
 #define OsCallOnMyStack(pFunc, lParam, pTopOfStack, StackSizeBytes) (pFunc)((PVOID)(lParam))
 #endif
@@ -530,7 +530,7 @@
 Interrupt safe: no
 **********************************************************************************/
 __shimcall__
-HOSTIMER	OsCreatePeriodicTimer	(	IN	UINT32			InitialTimeOut,
+HOSTIMER	OsCreatePeriodicTimer	(	IN	CXT_UINT32			InitialTimeOut,
 										IN	PCBFUNC			pTimeOutCallBack,
 										IN	PALLOC_FUNC		pFuncAlloc,
 										IN	PFREE_FUNC		pFuncFree,
@@ -560,8 +560,8 @@
 Interrupt safe: no
 **********************************************************************************/
 __shimcall__
-BOOL	OsSetPeriodicTimer	(	IN	HOSTIMER	hTimeOut,
-								IN	UINT32		NewTimeOut);
+CXT_BOOL	OsSetPeriodicTimer	(	IN	HOSTIMER	hTimeOut,
+								IN	CXT_UINT32		NewTimeOut);
 
 
 /**********************************************************************************
@@ -587,7 +587,7 @@
 
 
 __shimcall__
-void    OsRawVPrintf       (LPCSTR szFormat, PVOID args, BOOL addnl);
+void    OsRawVPrintf       (LPCSTR szFormat, PVOID args, CXT_BOOL addnl);
 
 __shimcall__
 void    OsRawNLPrintf       (LPCSTR szFormat, ...)
@@ -626,11 +626,11 @@
 __shimcall__
 void    OsDebugBreakpoint   (LPCSTR szMsg );
 
-/*void    OsDebugDumpData(PUINT8 data, UINT32 len);*/
+/*void    OsDebugDumpData(PCXT_UINT8 data, CXT_UINT32 len);*/
 
 
-#define OsSwapUINT16(x) ((((x) & 0xFF00) >> 8) | (((x) & 0x00FF) << 8))
-#define OsSwapUINT32(x) ((OsSwapUINT16(x) << 16) | (OsSwapUINT16((x) >> 16)))
+#define OsSwapCXT_UINT16(x) ((((x) & 0xFF00) >> 8) | (((x) & 0x00FF) << 8))
+#define OsSwapUINT32(x) ((OsSwapCXT_UINT16(x) << 16) | (OsSwapCXT_UINT16((x) >> 16)))
 
 //Event handling functions
 typedef struct tagHOSEVENT
@@ -653,7 +653,7 @@
 __shimcall__ long OsEventClear(HOSEVENT hEvent);
 __shimcall__ long OsEventState(HOSEVENT hEvent);
 __shimcall__ void OsEventWait(HOSEVENT hEvent);
-__shimcall__ OSEVENT_WAIT_RESULT OsEventWaitTime(HOSEVENT hEvent, UINT32 timeout);
+__shimcall__ OSEVENT_WAIT_RESULT OsEventWaitTime(HOSEVENT hEvent, CXT_UINT32 timeout);
 
 __shimcall__
 void    OsErrorPrintf       ( LPCSTR szFormat, ...);
@@ -675,18 +675,18 @@
 functionality :	Restores the FPU after float operations.
 **********************************************************************************/
 __shimcall__
-GLOBAL	BOOL  OsFloatSuffix(int Id);
+GLOBAL	CXT_BOOL  OsFloatSuffix(int Id);
 
 
 
 __shimcall__
-HANDLE OsCreateTimer(UINT32 msec, PVOID pCBFunc, PVOID pRefData);
+HANDLE OsCreateTimer(CXT_UINT32 msec, PVOID pCBFunc, PVOID pRefData);
 __shimcall__
 void OsSetTimer(PVOID pTimer);
 __shimcall__
 void OsCancelTimer(PVOID Timer);
 __shimcall__
-void OsChangeTimerTimeOut(PVOID Timer, UINT32 msec);
+void OsChangeTimerTimeOut(PVOID Timer, CXT_UINT32 msec);
 __shimcall__
 void OsDestroyTimer(PVOID pTimer);
 
@@ -696,12 +696,12 @@
 #define GlobalProcessorFreq OsGetProcessorFreq()
 
 __shimcall__
-UINT32 OsReadCpuCnt(void);
+CXT_UINT32 OsReadCpuCnt(void);
 
 typedef struct _OSTHRD OSTHRD, *POSTHRD;
 
 __shimcall__
-POSTHRD OsThreadCreate(const char *name, BOOLEAN highestprio, int *pid);
+POSTHRD OsThreadCreate(const char *name, CXT_BOOLEAN highestprio, int *pid);
 
 __shimcall__
 void OsThreadDestroy(POSTHRD osthrd);
@@ -727,7 +727,7 @@
 OsForkWait(char *program_path, char *argv[], char *envp[]);
 
 __shimcall__
-BOOL
+CXT_BOOL
 OsKernelUsesRegParm(void);
 
 extern POSTHRD OsMdmThread;
diff -U3 -r hsfmodem-old/modules/imported/include/ostime_ex.h hsfmodem/modules/imported/include/ostime_ex.h
--- hsfmodem-old/modules/imported/include/ostime_ex.h	2006-02-07 16:43:56.000000000 +0000
+++ hsfmodem/modules/imported/include/ostime_ex.h	2006-02-12 08:09:26.000000000 +0000
@@ -129,7 +129,7 @@
 functionality :	Creates a periodic timeout of InitialTimeOut interval. pTimeOutCallBack
 				function will be called on each timer interval. 
 **********************************************************************************/
-HANDLE	OsCreatePeriodicTimer	(	IN	UINT32			InitialTimeOut,
+HANDLE	OsCreatePeriodicTimer	(	IN	CXT_UINT32			InitialTimeOut,
 										IN	PCBFUNC			pTimeOutCallBack,
 										IN	PALLOC_FUNC		pFuncAlloc,
 										IN	PFREE_FUNC		pFuncFree,
@@ -153,8 +153,8 @@
 				NewTimeOut
 functionality : resets the timeout inteval to a new value.
 **********************************************************************************/
-GLOBAL	BOOL	OSSetPeriodicTimer	(	IN	HANDLE			hTimeOut,
-											IN	UINT32			NewTimeOut);
+GLOBAL	CXT_BOOL	OSSetPeriodicTimer	(	IN	HANDLE			hTimeOut,
+											IN	CXT_UINT32			NewTimeOut);
 
 
 #if (OS_TYPE != OS_LINUX)
@@ -168,9 +168,9 @@
 functionality :	Temporarily switches a stack to a different locked block of memory.
 **********************************************************************************/
 GLOBAL	VOID	OSCallOnMyStack(			IN	PCBFUNC			pFunc, 
-											IN	UINT32			lParam, 
+											IN	CXT_UINT32			lParam, 
 											IN	PUINT32			pTopOfStack, 
-											IN	UINT32			StackSizeBytes);
+											IN	CXT_UINT32			StackSizeBytes);
 #else
 #define OsCallOnMyStack(pFunc, lParam, pTopOfStack, StackSizeBytes) (pFunc)((PVOID)(lParam))
 #endif
@@ -182,7 +182,7 @@
 functionality	The function returnes a milliseconds timestamp.
 **********************************************************************************/
 /* returns time stamp in milli-seconds					*/
-GLOBAL	UINT32	OSGetSystemTime(			VOID	);
+GLOBAL	CXT_UINT32	OSGetSystemTime(			VOID	);
 
 /* initialize epoch to reduce wrap around risk; all values returned by
  * OSGetSystemTime() will be relative to the time OSInitTime() was called */
@@ -296,7 +296,7 @@
 				should be a matching call to OSRestoreTimeSensitivity with same Interval 
 				value
 **********************************************************************************/
-GLOBAL	VOID	OSSetTimeSensitivity(	IN	UINT32				Interval);				
+GLOBAL	VOID	OSSetTimeSensitivity(	IN	CXT_UINT32				Interval);				
 
 /**********************************************************************************
 Function name :	OSRestoreTimeSensitivity
@@ -305,7 +305,7 @@
 functionality :	Restores the timer interrupt to the value before OSSetTimeSensitivity
 				was called
 **********************************************************************************/
-GLOBAL	VOID	OSRestoreTimeSensitivity(		IN	UINT32				Interval);				
+GLOBAL	VOID	OSRestoreTimeSensitivity(		IN	CXT_UINT32				Interval);				
 
 /**********************************************************************************
 Function name :	OSDisableInterrupt
@@ -339,13 +339,13 @@
 Return value :	None
 functionality :	Restores the FPU after float operations.
 **********************************************************************************/
-GLOBAL	BOOL  OsFloatSuffix(int Id);
+GLOBAL	CXT_BOOL  OsFloatSuffix(int Id);
 
 #if OS_ONE_OF( OS_LINUX | OS_VXWORKS | OS_MACOSX | OS_STB )
-HANDLE OSCreateTimer(UINT32 msec, PVOID pCBFunc, PVOID pRefData);
+HANDLE OSCreateTimer(CXT_UINT32 msec, PVOID pCBFunc, PVOID pRefData);
 void OSSetTimer(PVOID pTimer);
 void OSCancelTimer(PVOID Timer);
-void OSChangeTimerTimeOut(PVOID Timer, UINT32 msec);
+void OSChangeTimerTimeOut(PVOID Timer, CXT_UINT32 msec);
 void OSDestroyTimer(PVOID pTimer);
 
 #endif
@@ -359,10 +359,10 @@
 #define OsLockUnlock OSSemaphoreSignal
 #define OsGetSystemTime OSGetSystemTime
 #else
-UINT32	OsGetSystemTime(VOID);
+CXT_UINT32	OsGetSystemTime(VOID);
 #define OSGetSystemTime OsGetSystemTime
-BOOL    OsHookInterrupt     ( HANDLE hDevice, VOID (*InterruptHandler)(VOID*), VOID* pRef);
-BOOL    OsUnhookInterrupt   ( HANDLE hDevice);
+CXT_BOOL    OsHookInterrupt     ( HANDLE hDevice, VOID (*InterruptHandler)(VOID*), VOID* pRef);
+CXT_BOOL    OsUnhookInterrupt   ( HANDLE hDevice);
 #endif
 
 GLOBAL  VOID    OSImmediateTimeOut      (	IN	HANDLE			hTimeOut);
@@ -398,9 +398,9 @@
 /* Utilities                                                        */
 /********************************************************************/
 
-BOOL OsAtomicCompareAndSwap (PVOID oldValue, PVOID newValue, PVOID* address);
-INT32	OsAtomicAdd   (INT32 amount, INT32* address);
-void OsSleep(UINT32 SleepTime);
+CXT_BOOL OsAtomicCompareAndSwap (PVOID oldValue, PVOID newValue, PVOID* address);
+CXT_INT32	OsAtomicAdd   (CXT_INT32 amount, CXT_INT32* address);
+void OsSleep(CXT_UINT32 SleepTime);
 
 #if (OS_TYPE == OS_WIN_9X)
 #define __FUNCTION__
@@ -422,7 +422,7 @@
 				int     arg8,
 				int     arg9,
 				int     arg10);
-BOOL OsTaskDelete(int TaskId);
+CXT_BOOL OsTaskDelete(int TaskId);
 #endif
 
 #if (OS_TYPE == OS_LINUX)
diff -U3 -r hsfmodem-old/modules/imported/include/rtmgr_ex.h hsfmodem/modules/imported/include/rtmgr_ex.h
--- hsfmodem-old/modules/imported/include/rtmgr_ex.h	2006-02-07 16:43:56.000000000 +0000
+++ hsfmodem/modules/imported/include/rtmgr_ex.h	2006-02-12 08:08:46.000000000 +0000
@@ -101,10 +101,10 @@
 
 /*********************** Run time Manager Exported types :********************/
 
-#define	RT_MGR_MAJOR_VERSION	((UINT32)0)
-#define	RT_MGR_MINOR_VERSION	((UINT32)2)
+#define	RT_MGR_MAJOR_VERSION	((CXT_UINT32)0)
+#define	RT_MGR_MINOR_VERSION	((CXT_UINT32)2)
 
-#define RT_MGR_VERSION ((UINT32)(((RT_MGR_MAJOR_VERSION) << 16) | (RT_MGR_MINOR_VERSION)))
+#define RT_MGR_VERSION ((CXT_UINT32)(((RT_MGR_MAJOR_VERSION) << 16) | (RT_MGR_MINOR_VERSION)))
 
 
 typedef enum ASYNC_CALL_TYPE_ENUM
@@ -118,7 +118,7 @@
 	ASYNC_CALL_TYPE		Type;
 	unsigned			TimeOut;
 	PUINT32				pStack;				
-	UINT32				StackSize;		
+	CXT_UINT32				StackSize;		
 	PCBFUNC     		pFuncAsyncCall;
 	PVOID				pParam;
 }ASYNC_CALL_CONFIG, *PASYNC_CALL_CONFIG;
@@ -150,7 +150,7 @@
 
 /* Direct API */
 
-GLOBAL	UINT32 RTMgrGetInterfaceVersion(void);
+GLOBAL	CXT_UINT32 RTMgrGetInterfaceVersion(void);
 
 
 /********************************************************************************
@@ -375,7 +375,7 @@
 Return Value: TRUE if execution context is in timer thread, otherwise - FALSE
 
 ********************************************************************************/
-BOOL RTMgrCalledFromTimer	(IN	HRTMGR	hRtMgr);
+CXT_BOOL RTMgrCalledFromTimer	(IN	HRTMGR	hRtMgr);
 #endif
 
 
@@ -386,7 +386,7 @@
 typedef struct I_RT_MGR_TAG
 {
 	
-	UINT32		(*GetInterfaceVersion)  (	void);
+	CXT_UINT32		(*GetInterfaceVersion)  (	void);
 	HRTMGR		(*Create)               (PSYSTEM_INSTANCES_T pSys);
 	COM_STATUS	(*Destroy)              (IN HRTMGR hBlock);
 	COM_STATUS	(*Open)                 (IN	HRTMGR hBlock);
diff -U3 -r hsfmodem-old/modules/imported/include/std_defines.h hsfmodem/modules/imported/include/std_defines.h
--- hsfmodem-old/modules/imported/include/std_defines.h	2006-02-07 16:43:56.000000000 +0000
+++ hsfmodem/modules/imported/include/std_defines.h	2006-02-11 22:19:26.000000000 +0000
@@ -119,8 +119,8 @@
 #define INT16_MAX     32767
 #endif
 
-#ifndef UINT16_MAX
-#define UINT16_MAX    0xffff
+#ifndef CXT_UINT16_MAX
+#define CXT_UINT16_MAX    0xffff
 #endif
 
 #ifndef INT32_MIN
diff -U3 -r hsfmodem-old/modules/imported/include/sysenv.h hsfmodem/modules/imported/include/sysenv.h
--- hsfmodem-old/modules/imported/include/sysenv.h	2006-02-11 22:17:06.000000000 +0000
+++ hsfmodem/modules/imported/include/sysenv.h	2006-02-12 08:15:22.000000000 +0000
@@ -200,9 +200,9 @@
     KIRQL           Irql;
     KIRQL           SynchronizeIrql;
     KINTERRUPT_MODE InterruptMode;
-    BOOLEAN         ShareVector;
+    CXT_BOOLEAN         ShareVector;
     KAFFINITY       ProcessorEnableMask;
-    BOOLEAN         FloatingSave;
+    CXT_BOOLEAN         FloatingSave;
 	PDEVICE_OBJECT	pDevObj;
 	struct _IRP *   Irp;
 }WDM_RESOURCES_T;
@@ -261,12 +261,12 @@
  
 typedef unsigned long			DWORD,  *PDWORD;
 typedef void					VOID  , *PVOID, **PPVOID;
-typedef unsigned short			UINT16, *PUINT16;
-typedef unsigned long			UINT32, *PUINT32;
-typedef long					INT32;
+typedef unsigned short			CXT_UINT16, *PCXT_UINT16;
+typedef unsigned long			CXT_UINT32, *PUINT32;
+typedef long					CXT_INT32;
 typedef char*					HANDLE;
 typedef unsigned char			BYTE,   *PBYTE;
-typedef int						BOOL;
+typedef int						CXT_BOOL;
 typedef char					HAR,   *PCHAR, **PPCHAR;
 typedef unsigned short			WORD,   *PWORD;
 typedef unsigned int volatile   VOL32, *PVOL32;
@@ -429,21 +429,21 @@
 #define TRUE    1
 #define FALSE   0
 #if (PROJECT  !=  PRJ_AMD64_WIN_R3 )
-typedef int BOOL;
+typedef int CXT_BOOL;
 #endif
 typedef int *PBOOL;        /* On NT or WDM we allways need the typedef of PBOOL */
 
 #elif ( OS_ONE_OF(OS_WIN_NT4 | OS_WIN_WDM) )
 
-typedef int BOOL;        /* On NT or WDM we allways need the typedef of BOOL */
+typedef int CXT_BOOL;        /* On NT or WDM we allways need the typedef of CXT_BOOL */
 typedef int *PBOOL;        /* On NT or WDM we allways need the typedef of PBOOL */
 
 #endif
 
 #if ( OS_TYPE == OS_LINUX ) || ((PROJECT != PRJ_HSF) && (PROJECT != PRJ_AMD64_WIN_R3))
 /* This definition was added for the Nile. It seems to be very problematic, since DDK  & VisualC define
-   BOOLEAN as unsigned char and BOOL as int, so they can't match each other. Must check it again!!!! */
-#define BOOLEAN BOOL
+   CXT_BOOLEAN as unsigned char and CXT_BOOL as int, so they can't match each other. Must check it again!!!! */
+#define CXT_BOOLEAN CXT_BOOL
 #endif
 
 
@@ -649,9 +649,9 @@
 /* New typedefs that should be used: */
 
 #if (OS_TYPE != OS_VXWORKS) || (OS_DEPENDENT == 0)
-typedef unsigned short      UINT16;
+typedef unsigned short      CXT_UINT16;
  
-typedef unsigned char       UINT8;
+typedef unsigned char       CXT_UINT8;
  
 typedef signed short       	INT16;
  
@@ -660,8 +660,8 @@
 #endif
 #endif
 
-typedef unsigned short     *PUINT16;
-typedef unsigned char      *PUINT8;
+typedef unsigned short     *PCXT_UINT16;
+typedef unsigned char      *PCXT_UINT8;
 
 typedef signed short       *PINT16;
  
@@ -671,24 +671,24 @@
 
 #if (OS_TYPE == OS_LINUX)
 
-typedef unsigned int       UINT32;
+typedef unsigned int       CXT_UINT32;
  
 typedef unsigned int           *PUINT32;
 typedef volatile unsigned int *PVUINT32;
 
-typedef int        INT32;
+typedef int        CXT_INT32;
  
 typedef int        *PINT32;
 
 typedef char * STRING;
 
 #elif ( (OS_DEPENDENT == 0) ||  ((OS_TYPE == OS_WIN_9X) && (UK_MODE == UK_KERNEL) ) || (OS_TYPE == OS_DOS)  ) 
-typedef unsigned long       UINT32;
+typedef unsigned long       CXT_UINT32;
  
 typedef unsigned long           *PUINT32;
 typedef volatile unsigned long *PVUINT32;
 
-typedef long        INT32;
+typedef long        CXT_INT32;
  
 typedef long        *PINT32;
 
@@ -697,10 +697,10 @@
 #endif
 
 #if   ((OS_TYPE == OS_WIN_NT4) && (UK_MODE == UK_KERNEL) )
-typedef unsigned long       UINT32;
+typedef unsigned long       CXT_UINT32;
 typedef unsigned long       *PUINT32;
 
-typedef long        INT32;
+typedef long        CXT_INT32;
 typedef long        *PINT32;
 
 #endif
@@ -714,7 +714,7 @@
 #endif /** OS_VXWORKS **/
 
 
-#define INT64               __int64
+#define CXT_INT64               __int64
 
 
 typedef enum OBJECT_INIT_STATE_TAG
@@ -771,7 +771,7 @@
 #define ASSERT(assert)						\
 do {										\
 	if (!(assert)) {						\
-	    UINT32 dwTime = OsGetSystemTime();	\
+	    CXT_UINT32 dwTime = OsGetSystemTime();	\
 		OsDebugPrintf (						\
 			"%07lu.%03lu: Assertion failure in %s() at %s:%d: \"%s\"\n",	\
 			 dwTime/1000, dwTime%1000, __FUNCTION__, __FILE__, __LINE__, # assert);	\
diff -U3 -r hsfmodem-old/modules/imported/include/targetconfigtypes.h hsfmodem/modules/imported/include/targetconfigtypes.h
--- hsfmodem-old/modules/imported/include/targetconfigtypes.h	2006-02-07 16:43:56.000000000 +0000
+++ hsfmodem/modules/imported/include/targetconfigtypes.h	2006-02-12 08:08:35.000000000 +0000
@@ -91,24 +91,24 @@
 #include "tonetype.h"
 
 #if OS_TYPE == OS_LINUX
-#define DAA_RELAY_TYPE  UINT32 /* for consistency with HCF */
+#define DAA_RELAY_TYPE  CXT_UINT32 /* for consistency with HCF */
 #else
-#define DAA_RELAY_TYPE  UINT16
+#define DAA_RELAY_TYPE  CXT_UINT16
 #endif
 #define QC_PROFILE_MAX_SIZE 3500
 #pragma pack(1)
 
 typedef struct QCProfileStructTag
 {
-	UINT8	ProfileValid;
-	UINT8	Data [QC_PROFILE_MAX_SIZE];
+	CXT_UINT8	ProfileValid;
+	CXT_UINT8	Data [QC_PROFILE_MAX_SIZE];
 } QCProfileStruct;
  
 
 /* Structure passed with CFGMGR_DTMF_GENERATOR */
 typedef struct tagDTMFGenParams {
-	UINT16  m_wDigitDuration;		/* in ms */
-	UINT16  m_wPauseDuration;		/* in ms */
+	CXT_UINT16  m_wDigitDuration;		/* in ms */
+	CXT_UINT16  m_wPauseDuration;		/* in ms */
 	INT16	m_nHighBandAmplitude;	/* normed to 32768 */
 	INT16	m_nLowBandAmplitude;	/* normed to 32768 */
 } DTMF_GEN_PARAMS, *PDTMF_GEN_PARAMS;
@@ -118,11 +118,11 @@
 typedef struct 
 {
 
-	UINT16  Segment1freq1;	/* Hz */
-	UINT16  Segment1freq2;	/* Hz */
-	UINT16  Segment2freq;	/* Hz */
-	UINT32	Segment1Duration;  /* millisec */
-	UINT32	Segment2Duration;  /* millisec */
+	CXT_UINT16  Segment1freq1;	/* Hz */
+	CXT_UINT16  Segment1freq2;	/* Hz */
+	CXT_UINT16  Segment2freq;	/* Hz */
+	CXT_UINT32	Segment1Duration;  /* millisec */
+	CXT_UINT32	Segment2Duration;  /* millisec */
 } CR_TONE_PARAMS, *PCR_TONE_PARAMS;
  
 typedef struct CNTRY_TONEPARAMS_TAG 
@@ -162,11 +162,11 @@
 /* Dual/Single Tone generator struct */
 typedef struct
 {
-	UINT16 freq1; /* Hz */
-	UINT16 freq2;
-	UINT32 OnTime;
-	UINT32 OffTime;
-    BOOL  bRepeatedTone;
+	CXT_UINT16 freq1; /* Hz */
+	CXT_UINT16 freq2;
+	CXT_UINT32 OnTime;
+	CXT_UINT32 OffTime;
+    CXT_BOOL  bRepeatedTone;
 } TONEGEN_PARAMS, *PTONEGEN_PARAMS;
  
 typedef struct CONSTTONEGENPARAMS_TAG
@@ -178,16 +178,16 @@
 } CONSTTONEGENPARAMS_T, *PCONSTTONEGENPARAMS_T;
 
 typedef struct PACKED_ATTRIB tagThreshold {
-	UINT16		DialThresh;
-	UINT16		AltDialThresh;
-	UINT16		WDialThresh;
-	UINT16		AltWDialThresh;
-	UINT16		ProgThresh;
-	UINT16		AltProgThresh;
-	UINT16		DTMFRxThresh;
-	UINT16		RingThreshold;			/* Add soft ring threshold set to 0 if not use */
+	CXT_UINT16		DialThresh;
+	CXT_UINT16		AltDialThresh;
+	CXT_UINT16		WDialThresh;
+	CXT_UINT16		AltWDialThresh;
+	CXT_UINT16		ProgThresh;
+	CXT_UINT16		AltProgThresh;
+	CXT_UINT16		DTMFRxThresh;
+	CXT_UINT16		RingThreshold;			/* Add soft ring threshold set to 0 if not use */
 	INT16		RingBalance;			/* Add soft ring threshold compensation slope, set to 0 if not use*/
-	UINT16      CIDThresh;
+	CXT_UINT16      CIDThresh;
 } CntryThresholdStructure;
 
 #define DEFAULT_DC_LOOP_POINTS	5
diff -U3 -r hsfmodem-old/modules/imported/include/testdebug.h hsfmodem/modules/imported/include/testdebug.h
--- hsfmodem-old/modules/imported/include/testdebug.h	2006-02-07 16:43:56.000000000 +0000
+++ hsfmodem/modules/imported/include/testdebug.h	2006-02-12 08:08:47.000000000 +0000
@@ -1773,60 +1773,60 @@
     #define RTRACE0(TypeAndSeverity, unusedLoggingThread, str)  RPT_Write(                      \
 					(TypeAndSeverity),        \
 					((__LINE__) & LINE_NUM_MASK) | (FILEIDNUM << 13), \
-					(UINT32)0)
+					(CXT_UINT32)0)
 
 
 	#define RTRACE1(TypeAndSeverity, unusedLoggingThread, str, arg1)  RPT_Write(                         \
 					(TypeAndSeverity),                     \
 					(((__LINE__) & LINE_NUM_MASK) | (FILEIDNUM << 13) | (1 <<29)), \
-					(UINT32)arg1)
+					(CXT_UINT32)arg1)
 	
 	#define RTRACE2(TypeAndSeverity, unusedLoggingThread, str, arg1, arg2)  RPT_Write(                   \
 					(TypeAndSeverity),                     \
 					(((__LINE__) & LINE_NUM_MASK) | (FILEIDNUM << 13) | (2 <<29)), \
-					(UINT32)arg1, (UINT32)arg2)
+					(CXT_UINT32)arg1, (CXT_UINT32)arg2)
 
 
 	#define RTRACE3(TypeAndSeverity, unusedLoggingThread, str, arg1, arg2, arg3)  RPT_Write(              \
 					(TypeAndSeverity),                      \
 					(((__LINE__) & LINE_NUM_MASK) | (FILEIDNUM << 13) | (3 <<29)),  \
-					(UINT32)arg1, (UINT32)arg2, (UINT32)arg3)
+					(CXT_UINT32)arg1, (CXT_UINT32)arg2, (CXT_UINT32)arg3)
 
 
 	#define RTRACE4(TypeAndSeverity, unusedLoggingThread, str, arg1, arg2, arg3, arg4)  RPT_Write(       \
 					(TypeAndSeverity),                     \
 					(((__LINE__) & LINE_NUM_MASK) | (FILEIDNUM << 13) | (4 <<29)), \
-					(UINT32)arg1, (UINT32)arg2, (UINT32)arg3, (UINT32)arg4)
+					(CXT_UINT32)arg1, (CXT_UINT32)arg2, (CXT_UINT32)arg3, (CXT_UINT32)arg4)
 
 
 	#define RTRACE5(TypeAndSeverity, unusedLoggingThread, str, arg1, arg2, arg3, arg4, arg5)  RPT_Write(        \
 					(TypeAndSeverity),                            \
 					(((__LINE__) & LINE_NUM_MASK) | (FILEIDNUM << 13) | (5 <<29)),        \
-					(UINT32)arg1, (UINT32)arg2, (UINT32)arg3, (UINT32)arg4, (UINT32)arg5)						
+					(CXT_UINT32)arg1, (CXT_UINT32)arg2, (CXT_UINT32)arg3, (CXT_UINT32)arg4, (CXT_UINT32)arg5)						
 
 
 	#define RTRACE6(TypeAndSeverity, unusedLoggingThread, str, arg1, arg2, arg3, arg4, arg5, arg6)  RPT_Write(                \
 					(TypeAndSeverity),                                          \
 					(((__LINE__) & LINE_NUM_MASK) | (FILEIDNUM << 13) | (6 <<29)),                      \
-					(UINT32)arg1, (UINT32)arg2, (UINT32)arg3, (UINT32)arg4, (UINT32)arg5, (UINT32)arg6)
+					(CXT_UINT32)arg1, (CXT_UINT32)arg2, (CXT_UINT32)arg3, (CXT_UINT32)arg4, (CXT_UINT32)arg5, (CXT_UINT32)arg6)
 
 
 	#define RTRACE7(TypeAndSeverity, unusedLoggingThread, str, arg1, arg2, arg3, arg4, arg5, arg6, arg7)  RPT_Write(                        \
 					(TypeAndSeverity),                                                        \
 					(((__LINE__) & LINE_NUM_MASK) | (FILEIDNUM << 13) | (7 <<29)),                                    \
-					(UINT32)arg1, (UINT32)arg2, (UINT32)arg3, (UINT32)arg4, (UINT32)arg5, (UINT32)arg6, (UINT32)arg7)
+					(CXT_UINT32)arg1, (CXT_UINT32)arg2, (CXT_UINT32)arg3, (CXT_UINT32)arg4, (CXT_UINT32)arg5, (CXT_UINT32)arg6, (CXT_UINT32)arg7)
 
     #define RTRACE_DUMP(TypeAndSeverity, unusedLoggingThread, BufferAddress, Size)  RPT_Write( \
 					(TypeAndSeverity),       \
 					(RTRACE_DUMP_CODE << 13),                        \
-					(UINT32)BufferAddress,                           \
-					(UINT32)Size)
+					(CXT_UINT32)BufferAddress,                           \
+					(CXT_UINT32)Size)
 
     #define RDUMP(TypeAndSeverity, BufferAddress, Size)  RPT_Write( \
 			    (TypeAndSeverity),                                  \
 			    (RDUMP_CODE << 13),                                 \
-			    (UINT32)BufferAddress,                              \
-			    (UINT32)Size)
+			    (CXT_UINT32)BufferAddress,                              \
+			    (CXT_UINT32)Size)
 
 
     #define RTRACE_EOS(TypeAndSeverity, unusedLoggingThread)  RPT_Write(     \
@@ -1847,7 +1847,7 @@
 
 #if ((defined SCR) && (OS_TYPE == OS_STB))
 	#include "rpt_io.h"
-	#define DW_CLIENT_ID ((UINT32)0)
+	#define DW_CLIENT_ID ((CXT_UINT32)0)
 	#define Num_Messages 0
 	#define BLAM_SEVERITY_DEFAULT 0
 
@@ -1884,7 +1884,7 @@
     #define TRACE(mask,printf)  {                                           \
                                     if ((mask) & ulTraceMask)               \
                                     {                                       \
-                                        UINT32 dwTime = OsGetSystemTime();  \
+                                        CXT_UINT32 dwTime = OsGetSystemTime();  \
                                         OsDebugPrintf ("%07u.%03u: ", dwTime/1000, dwTime%1000); \
                                         OsDebugPrintf printf;               \
                                     }                                       \
@@ -1907,7 +1907,7 @@
 	#define RTRACE0(TypeAndSeverity, LoggingThread, str) {										\
                     if (((TypeAndSeverity) & NOBLAMTRACEMASK) ||	(LoggingThread == NOBLAMLOGGINGTHREAD)) \
                                 {																\
-                                    UINT32 dwTime = OsGetSystemTime();							\
+                                    CXT_UINT32 dwTime = OsGetSystemTime();							\
                                     OsDebugPrintf ("%07u.%03u: ", dwTime/1000, dwTime%1000);    \
                                     OsDebugPrintf (str);										\
                                 }																\
@@ -1917,7 +1917,7 @@
 	#define RTRACE1(TypeAndSeverity, LoggingThread, str, arg1) {								\
                     if (((TypeAndSeverity) & NOBLAMTRACEMASK) ||	(LoggingThread == NOBLAMLOGGINGTHREAD)) \
                                 {																\
-                                    UINT32 dwTime = OsGetSystemTime();							\
+                                    CXT_UINT32 dwTime = OsGetSystemTime();							\
                                     OsDebugPrintf ("%07u.%03u: ", dwTime/1000, dwTime%1000);    \
                                     OsDebugPrintf (str, arg1);									\
                                 }																\
@@ -1927,7 +1927,7 @@
 	#define RTRACE2(TypeAndSeverity, LoggingThread, str, arg1, arg2) {						\
                     if (((TypeAndSeverity) & NOBLAMTRACEMASK) ||	(LoggingThread == NOBLAMLOGGINGTHREAD)) \
 							{																\
-                                UINT32 dwTime = OsGetSystemTime();							\
+                                CXT_UINT32 dwTime = OsGetSystemTime();							\
                                 OsDebugPrintf ("%07u.%03u: ", dwTime/1000, dwTime%1000);    \
                                 OsDebugPrintf (str, arg1, arg2);							\
                             }																\
@@ -1937,7 +1937,7 @@
 	#define RTRACE3(TypeAndSeverity, LoggingThread, str, arg1, arg2, arg3) {	        \
                     if (((TypeAndSeverity) & NOBLAMTRACEMASK) ||	(LoggingThread == NOBLAMLOGGINGTHREAD)) \
 						{												                \
-                            UINT32 dwTime = OsGetSystemTime();					        \
+                            CXT_UINT32 dwTime = OsGetSystemTime();					        \
                             OsDebugPrintf ("%07u.%03u: ", dwTime/1000, dwTime%1000);    \
                             OsDebugPrintf (str, arg1, arg2, arg3);                      \
 						}															    \
@@ -1947,7 +1947,7 @@
 	#define RTRACE4(TypeAndSeverity, LoggingThread, str, arg1, arg2, arg3, arg4) {	    \
                     if (((TypeAndSeverity) & NOBLAMTRACEMASK) ||	(LoggingThread == NOBLAMLOGGINGTHREAD)) \
 					{												                    \
-                        UINT32 dwTime = OsGetSystemTime();					            \
+                        CXT_UINT32 dwTime = OsGetSystemTime();					            \
                         OsDebugPrintf ("%07u.%03u: ", dwTime/1000, dwTime%1000);        \
                         OsDebugPrintf (str, arg1, arg2, arg3, arg4);                    \
                     }																	\
@@ -1957,7 +1957,7 @@
 	#define RTRACE5(TypeAndSeverity, LoggingThread, str, arg1, arg2, arg3, arg4, arg5) {	\
                     if (((TypeAndSeverity) & NOBLAMTRACEMASK) ||	(LoggingThread == NOBLAMLOGGINGTHREAD)) \
 					{																		\
-                        UINT32 dwTime = OsGetSystemTime();									\
+                        CXT_UINT32 dwTime = OsGetSystemTime();									\
                         OsDebugPrintf ("%07u.%03u: ", dwTime/1000, dwTime%1000);			\
                         OsDebugPrintf (str, arg1, arg2, arg3, arg4, arg5);                  \
                     }																		\
@@ -1967,7 +1967,7 @@
 	#define RTRACE6(TypeAndSeverity, LoggingThread, str, arg1, arg2, arg3, arg4, arg5, arg6) {	\
                     if (((TypeAndSeverity) & NOBLAMTRACEMASK) ||	(LoggingThread == NOBLAMLOGGINGTHREAD)) \
 					{																			\
-                        UINT32 dwTime = OsGetSystemTime();										\
+                        CXT_UINT32 dwTime = OsGetSystemTime();										\
                         OsDebugPrintf ("%07u.%03u: ", dwTime/1000, dwTime%1000);				\
                         OsDebugPrintf (str, arg1, arg2, arg3, arg4, arg5, arg6);                \
                     }																			\
@@ -1978,7 +1978,7 @@
 	#define RTRACE7(TypeAndSeverity, LoggingThread, str, arg1, arg2, arg3, arg4, arg5, arg6, arg7) {	\
                     if (((TypeAndSeverity) & NOBLAMTRACEMASK) ||	(LoggingThread == NOBLAMLOGGINGTHREAD)) \
 						{																				\
-                            UINT32 dwTime = OsGetSystemTime();											\
+                            CXT_UINT32 dwTime = OsGetSystemTime();											\
                             OsDebugPrintf ("%07u.%03u: ", dwTime/1000, dwTime%1000);					\
                             OsDebugPrintf (str, arg1, arg2, arg3, arg4, arg5, arg6, arg7);              \
                         }																				\
@@ -2021,7 +2021,7 @@
                                 }
 
 	#define DUMPDATA(mask, data, len) /*{                                           \
-	void DumpData(PUINT8 data, UINT32 len);					\
+	void DumpData(PCXT_UINT8 data, CXT_UINT32 len);					\
                                     if ((mask) & ulTraceMask)               \
                                     {                                       \
                                         DumpData(data, len);               \
diff -U3 -r hsfmodem-old/modules/imported/include/tonetype.h hsfmodem/modules/imported/include/tonetype.h
--- hsfmodem-old/modules/imported/include/tonetype.h	2006-02-07 16:43:56.000000000 +0000
+++ hsfmodem/modules/imported/include/tonetype.h	2006-02-12 08:04:10.000000000 +0000
@@ -231,7 +231,7 @@
 typedef struct 
 {
 	POLD_DUALTONEGEN pDualToneGen;
-	BOOL			Repeat;
+	CXT_BOOL			Repeat;
 } OLD_DUALTONEGEN_EXT, *POLD_DUALTONEGEN_EXT;
 
 /* The following struct include the parameters for a dtmf generator. */
@@ -247,8 +247,8 @@
  Generator of ANS/ANSAM tone */
 typedef struct 
 {
-	BOOL AmOn;	/* TRUE when ANSAM */
-	BOOL PmOn;  /* TRUE when Phase Modulation */
+	CXT_BOOL AmOn;	/* TRUE when ANSAM */
+	CXT_BOOL PmOn;  /* TRUE when Phase Modulation */
 	char MinAmpilitude; /* -dBm */
 	char MaxAmpilitude; /* -dBm */
 	char defaultAmpilitude; /* -dBm */
diff -U3 -r hsfmodem-old/modules/imported/include/usbhalos.h hsfmodem/modules/imported/include/usbhalos.h
--- hsfmodem-old/modules/imported/include/usbhalos.h	2004-06-21 04:58:27.000000000 +0100
+++ hsfmodem/modules/imported/include/usbhalos.h	2006-02-12 08:08:48.000000000 +0000
@@ -80,7 +80,7 @@
 // function prototypes which make interface between USB HAL and USB OS HAL
 
 __shimcall__
-HANDLE	OsUsbGetInstance		(UINT32 Unit);
+HANDLE	OsUsbGetInstance		(CXT_UINT32 Unit);
 
 /********************************************************************************
  two functions below indicate to lower HAL that the modem instance is being allocated or
@@ -105,10 +105,10 @@
 #if OS_TYPE == OS_LINUX
 __shimcall__
 HANDLE	OsUsbCreateInstance		(PVOID pDeviceID, HANDLE hUpper,
-		__shimcall__ BOOL (*cbUsbHalNotificationReceived) (PVOID hUpper, PUINT8 pDataReceived, unsigned RecvLength),
-		__shimcall__ void (*cbUsbHalDataReceived)			(PVOID hUpper, PUINT8 pDataReceived, unsigned RecvLength),
+		__shimcall__ CXT_BOOL (*cbUsbHalNotificationReceived) (PVOID hUpper, PCXT_UINT8 pDataReceived, unsigned RecvLength),
+		__shimcall__ void (*cbUsbHalDataReceived)			(PVOID hUpper, PCXT_UINT8 pDataReceived, unsigned RecvLength),
 		__shimcall__ void (*cbUsbHalDataTransmitDone)		(PVOID hUpper, unsigned TxLength),
-		__shimcall__ void (*cbUsbHalControlTransferDone)	(PVOID hUpper, PVOID userContext, UINT8 Request, UINT16 value, UINT16 index),
+		__shimcall__ void (*cbUsbHalControlTransferDone)	(PVOID hUpper, PVOID userContext, CXT_UINT8 Request, CXT_UINT16 value, CXT_UINT16 index),
 #if TARGET_HCF_FAMILY
 		__shimcall__ void (*cbUsbHalDownloadTransmitDone) (PVOID hUpper),
 #endif
@@ -148,7 +148,7 @@
 
 ********************************************************************************/
 __shimcall__
-BOOL OsUsbIsStarted						(HANDLE hUsbOsHal);
+CXT_BOOL OsUsbIsStarted						(HANDLE hUsbOsHal);
 
 /********************************************************************************
 
@@ -177,9 +177,9 @@
 
 ********************************************************************************/
 __shimcall__
-BOOL OsUsbMakeControlRequest			(HANDLE hUsbOsHal, HANDLE hCntrlReq, PVOID userContext,
-										UINT8 Request, UINT16 Value, UINT16 Index, 
-										IN PVOID pBuf, IN UINT32 nBytes);
+CXT_BOOL OsUsbMakeControlRequest			(HANDLE hUsbOsHal, HANDLE hCntrlReq, PVOID userContext,
+										CXT_UINT8 Request, CXT_UINT16 Value, CXT_UINT16 Index, 
+										IN PVOID pBuf, IN CXT_UINT32 nBytes);
 
 /********************************************************************************
 
@@ -206,12 +206,12 @@
 
 ********************************************************************************/
 __shimcall__
-BOOL OsUsbMakeControlRequestSync		(HANDLE hUsbOsHal, IN UINT8 Direction, UINT8 Request, UINT16 Value, UINT16 Index, 
+CXT_BOOL OsUsbMakeControlRequestSync		(HANDLE hUsbOsHal, IN CXT_UINT8 Direction, CXT_UINT8 Request, CXT_UINT16 Value, CXT_UINT16 Index, 
 										IN PVOID pBuf, IO PUINT32 pnBytes);
 
 
 __shimcall__
-BOOL OsUsbMakeGetStringDescriptorRequestSync	(HANDLE hUsbOsHal, IN UINT8 StrIndex, IN PVOID pBuf, IO PUINT32 pnBytes);
+CXT_BOOL OsUsbMakeGetStringDescriptorRequestSync	(HANDLE hUsbOsHal, IN CXT_UINT8 StrIndex, IN PVOID pBuf, IO PUINT32 pnBytes);
 
 
 
@@ -310,7 +310,7 @@
 
 ********************************************************************************/
 __shimcall__
-BOOL OsUsbMakeNotifyRequest				(HANDLE hUsbOsHal);
+CXT_BOOL OsUsbMakeNotifyRequest				(HANDLE hUsbOsHal);
 
 /********************************************************************************
 
@@ -332,7 +332,7 @@
 
 ********************************************************************************/
 __shimcall__
-BOOL OsUsbMakeDataTransmitRequest		(HANDLE hUsbOsHal, HANDLE hRequest, PVOID pBuf, UINT32 nBytes);
+CXT_BOOL OsUsbMakeDataTransmitRequest		(HANDLE hUsbOsHal, HANDLE hRequest, PVOID pBuf, CXT_UINT32 nBytes);
 
 /********************************************************************************
 
@@ -351,7 +351,7 @@
 
 ********************************************************************************/
 __shimcall__
-BOOL OsUsbMakeDataReceiveRequest		(HANDLE hUsbOsHal, PVOID pBuf, UINT32 nBytes);
+CXT_BOOL OsUsbMakeDataReceiveRequest		(HANDLE hUsbOsHal, PVOID pBuf, CXT_UINT32 nBytes);
 
 #if TARGET_HCF_FAMILY
 /********************************************************************************
@@ -371,7 +371,7 @@
 
 ********************************************************************************/
 __shimcall__
-BOOL OsUsbMakeDownloadTransmitRequest	(HANDLE pUsbOsHal, PVOID pBuf, UINT32 nBytes);
+CXT_BOOL OsUsbMakeDownloadTransmitRequest	(HANDLE pUsbOsHal, PVOID pBuf, CXT_UINT32 nBytes);
 #endif
 
 //#$YS$
@@ -409,7 +409,7 @@
 
 ********************************************************************************/
 __shimcall__
-BOOL OsUsbMakeDcpRequest				(HANDLE hUsbOsHal, PVOID pBuf, UINT32 nBytes);
+CXT_BOOL OsUsbMakeDcpRequest				(HANDLE hUsbOsHal, PVOID pBuf, CXT_UINT32 nBytes);
 __shimcall__
 void OsUsbStartDcpRequests				(HANDLE hUsb, HANDLE hDcp);
 
@@ -467,7 +467,7 @@
 
 ********************************************************************************/
 __shimcall__
-BOOL UsbHalNotificationReceived (PVOID hUpper, PUINT8 pDataReceived, unsigned RecvLength);
+CXT_BOOL UsbHalNotificationReceived (PVOID hUpper, PCXT_UINT8 pDataReceived, unsigned RecvLength);
 
 /********************************************************************************
 
@@ -486,7 +486,7 @@
 
 ********************************************************************************/
 __shimcall__
-void UsbHalDataReceived			(PVOID hUpper, PUINT8 pDataReceived, unsigned RecvLength);
+void UsbHalDataReceived			(PVOID hUpper, PCXT_UINT8 pDataReceived, unsigned RecvLength);
 
 /********************************************************************************
 
@@ -523,7 +523,7 @@
 
 ********************************************************************************/
 __shimcall__
-void UsbHalControlTransferDone	(PVOID hUpper, PVOID userContext, UINT8 Request, UINT16 value, UINT16 index);
+void UsbHalControlTransferDone	(PVOID hUpper, PVOID userContext, CXT_UINT8 Request, CXT_UINT16 value, CXT_UINT16 index);
 
 #if TARGET_HCF_FAMILY
 /********************************************************************************
@@ -560,11 +560,11 @@
 #pragma pack (1)
 typedef struct
 {
-	UINT8	bmRequestType;
-	UINT8	bRequest;
-	UINT16	wValue;
-	UINT16	wIndex;
-	UINT16	wLength;
+	CXT_UINT8	bmRequestType;
+	CXT_UINT8	bRequest;
+	CXT_UINT16	wValue;
+	CXT_UINT16	wIndex;
+	CXT_UINT16	wLength;
 	PVOID   pData;
 } USB_REQUEST_HEADER, *PUSB_REQUEST_HEADER;
 #pragma pack ()
diff -U3 -r hsfmodem-old/modules/include/linux_dbgscr.h hsfmodem/modules/include/linux_dbgscr.h
--- hsfmodem-old/modules/include/linux_dbgscr.h	2006-01-13 19:23:50.000000000 +0000
+++ hsfmodem/modules/include/linux_dbgscr.h	2006-02-12 08:04:12.000000000 +0000
@@ -21,7 +21,7 @@
 #endif
 
 __shimcall__
-	BOOL LinuxScrSetEntryPointCallback( PVOID epcbk );
+	CXT_BOOL LinuxScrSetEntryPointCallback( PVOID epcbk );
 
 #ifdef __cplusplus
 }
diff -U3 -r hsfmodem-old/modules/include/osdiag_dev.h hsfmodem/modules/include/osdiag_dev.h
--- hsfmodem-old/modules/include/osdiag_dev.h	2006-01-13 19:23:50.000000000 +0000
+++ hsfmodem/modules/include/osdiag_dev.h	2006-02-12 08:08:49.000000000 +0000
@@ -20,13 +20,13 @@
 typedef struct {
     DWORD		TimeStamp;
     CNXT_DIAG_CODES	Code;
-    UINT32		Data;
+    CXT_UINT32		Data;
 } SDK2K_NOTIFICATION, *PSDK2K_NOTIFICATION;
 
 typedef struct {
     CNXT_DIAG_CTRL_CODES ControlCode;
     PVOID Buffer;
-    UINT32 BufferSize;
+    CXT_UINT32 BufferSize;
 } SDK2K_IOCTLARGS, *PSDK2K_IOCTLARGS;
 
 #define SDK2K_IOC_CONFIGURE	_IOWR('2', 0, SDK2K_IOCTLARGS)
diff -U3 -r hsfmodem-old/modules/include/osresour_ex.h hsfmodem/modules/include/osresour_ex.h
--- hsfmodem-old/modules/include/osresour_ex.h	2006-01-27 12:49:32.000000000 +0000
+++ hsfmodem/modules/include/osresour_ex.h	2006-02-12 08:08:49.000000000 +0000
@@ -65,34 +65,34 @@
     HW_TYPE hwType;
     void *hwIf;
 #endif
-    BOOL hwInUse;
+    CXT_BOOL hwInUse;
 	unsigned long osPageOffset;
     HANDLE pmDev;
     COM_STATUS (*pmControl)(struct tagOS_DEVNODE *DevNode,
 		__shimcall__ COM_STATUS (*pmControlFunc)(HANDLE hDevMgr, ePmeState PmeState),
 		HANDLE hDevMgr, ePmeState PmeState, ePmeState OldPmeState) __shimcall__;
 	HANDLE hcomctrl;
-	UINT32 *pci_state;
+	CXT_UINT32 *pci_state;
 } OS_DEVNODE, *POS_DEVNODE;
 
 typedef struct {
-    UINT32 addr;
-    UINT32 len;
+    CXT_UINT32 addr;
+    CXT_UINT32 len;
 } OS_PCI_DEV_RES, *POS_PCI_DEV_RES;
 
 __shimcall__
-BOOL OsGetPCIDeviceResources(HANDLE DevNode,
+CXT_BOOL OsGetPCIDeviceResources(HANDLE DevNode,
 	POS_PCI_DEV_RES pPhysMem, POS_PCI_DEV_RES pPhysIO1, POS_PCI_DEV_RES pPhysIO2,
-	BOOL bEnableBusMastering);
+	CXT_BOOL bEnableBusMastering);
 
 __shimcall__
-PVOID OsMapPhysMem(UINT32 dwPhysMemBase, UINT32 dwMemSize);
+PVOID OsMapPhysMem(CXT_UINT32 dwPhysMemBase, CXT_UINT32 dwMemSize);
 
 __shimcall__
-BOOL OsUnmapPhysMem(PVOID dwLinearAddr, UINT32 dwMemSize);
+CXT_BOOL OsUnmapPhysMem(PVOID dwLinearAddr, CXT_UINT32 dwMemSize);
 
 __shimcall__
-BOOL OsHookInterrupt(HANDLE DevNode, __kernelcall__ OS_IRQRETURN_T (*isr)(int irq, void *devidp, void *unused), void* devid);
+CXT_BOOL OsHookInterrupt(HANDLE DevNode, __kernelcall__ OS_IRQRETURN_T (*isr)(int irq, void *devidp, void *unused), void* devid);
 
 __shimcall__
 void OsUnhookInterrupt(HANDLE DevNode, void *devid);
diff -U3 -r hsfmodem-old/modules/include/osusb.h hsfmodem/modules/include/osusb.h
--- hsfmodem-old/modules/include/osusb.h	2006-01-13 19:23:50.000000000 +0000
+++ hsfmodem/modules/include/osusb.h	2006-02-12 08:08:50.000000000 +0000
@@ -94,12 +94,12 @@
 	URB_LIST_ENTRY_STATE state;
 	PURB volatile urb;
 	USB_CTRLREQUEST	devRequest;
-	PUINT8 bufferPtr;
+	PCXT_UINT8 bufferPtr;
 	size_t bufferSize;
-	PUINT8 userBufferPtr;
+	PCXT_UINT8 userBufferPtr;
 	size_t userBufferSize;
 	PVOID userContext;
-	UINT32	startTime;
+	CXT_UINT32	startTime;
 } URB_LIST_ENTRY, *PURB_LIST_ENTRY;
 
 typedef struct tagURB_LIST {
@@ -113,12 +113,12 @@
 // this particular device.
 //
 typedef struct tagUSBOSHAL {
-	BOOL			bActive;
+	CXT_BOOL			bActive;
 
-	BOOL (*cbUsbHalNotificationReceived)	(PVOID hUpper, PUINT8 pDataReceived, unsigned RecvLength) __shimcall__;
-	void (*cbUsbHalDataReceived)			(PVOID hUpper, PUINT8 pDataReceived, unsigned RecvLength) __shimcall__;
+	CXT_BOOL (*cbUsbHalNotificationReceived)	(PVOID hUpper, PCXT_UINT8 pDataReceived, unsigned RecvLength) __shimcall__;
+	void (*cbUsbHalDataReceived)			(PVOID hUpper, PCXT_UINT8 pDataReceived, unsigned RecvLength) __shimcall__;
 	void (*cbUsbHalDataTransmitDone)		(PVOID hUpper, unsigned TxLength) __shimcall__;
-	void (*cbUsbHalControlTransferDone)		(PVOID hUpper, PVOID userContext, UINT8 Request, UINT16 value, UINT16 index) __shimcall__;
+	void (*cbUsbHalControlTransferDone)		(PVOID hUpper, PVOID userContext, CXT_UINT8 Request, CXT_UINT16 value, CXT_UINT16 index) __shimcall__;
 #if TARGET_HCF_FAMILY
 	void (*cbUsbHalDownloadTransmitDone)	(PVOID hUpper) __shimcall__;
 #endif
@@ -160,9 +160,9 @@
 
 	HANDLE hUpper; // handle of OS independent portion of the USB HAL
 
-	BOOL			UpdateEEPROM;
+	CXT_BOOL			UpdateEEPROM;
 
-//	BOOL				bPipeResetInProgress;
+//	CXT_BOOL				bPipeResetInProgress;
 //    int		        ResetAttemptCount;
 
 	PVOID				pLastControlData;
@@ -180,7 +180,7 @@
 int OsUsbFWDownload (PUSBOSHAL pUsbOsHal);
 
 __shimcall__
-BOOL OsUsbAllocateUrbs (PUSBOSHAL pUsbOsHal);
+CXT_BOOL OsUsbAllocateUrbs (PUSBOSHAL pUsbOsHal);
 __shimcall__
 void OsUsbFreeUrbs (PUSBOSHAL pUsbOsHal);
 
Binary files hsfmodem-old/modules/mod_engine.o and hsfmodem/modules/mod_engine.o differ
Binary files hsfmodem-old/modules/mod_mc97ali.o and hsfmodem/modules/mod_mc97ali.o differ
Binary files hsfmodem-old/modules/mod_mc97ati.o and hsfmodem/modules/mod_mc97ati.o differ
Binary files hsfmodem-old/modules/mod_mc97ich.o and hsfmodem/modules/mod_mc97ich.o differ
Binary files hsfmodem-old/modules/mod_mc97sis.o and hsfmodem/modules/mod_mc97sis.o differ
Binary files hsfmodem-old/modules/mod_mc97via.o and hsfmodem/modules/mod_mc97via.o differ
Binary files hsfmodem-old/modules/mod_osspec.o and hsfmodem/modules/mod_osspec.o differ
diff -U3 -r hsfmodem-old/modules/osdcp.c hsfmodem/modules/osdcp.c
--- hsfmodem-old/modules/osdcp.c	2006-01-27 12:49:32.000000000 +0000
+++ hsfmodem/modules/osdcp.c	2006-02-12 08:08:52.000000000 +0000
@@ -447,7 +447,7 @@
 }
  
 __shimcall__
-void DcpCallback(HANDLE hDcp, PVOID pData, UINT32 dwSize)
+void DcpCallback(HANDLE hDcp, PVOID pData, CXT_UINT32 dwSize)
 {
     dcp_instance_t *pDcp = hDcp;
     unsigned long flags;
diff -U3 -r hsfmodem-old/modules/osdiag.c hsfmodem/modules/osdiag.c
--- hsfmodem-old/modules/osdiag.c	2006-01-27 12:49:32.000000000 +0000
+++ hsfmodem/modules/osdiag.c	2006-02-12 08:08:53.000000000 +0000
@@ -111,7 +111,7 @@
 } dmp_unit_t;
 
 __shimcall__
-BOOL
+CXT_BOOL
 DMPSRV_Dispatcher(PCHAR ClientName, DMP_SERVER_CODE Code,
 		PCHAR FileName, PBYTE pSegment, DWORD nData )
 {
@@ -700,7 +700,7 @@
 }
  
 __shimcall__
-COM_STATUS OsDiagMgrNotify(HANDLE hOsDiagMgr, CNXT_DIAG_CODES Code, UINT32 dwData)
+COM_STATUS OsDiagMgrNotify(HANDLE hOsDiagMgr, CNXT_DIAG_CODES Code, CXT_UINT32 dwData)
 {
     diag_instance_t *pDiag = hOsDiagMgr;
     unsigned long flags;
diff -U3 -r hsfmodem-old/modules/osfloat.c hsfmodem/modules/osfloat.c
--- hsfmodem-old/modules/osfloat.c	2006-01-27 12:49:32.000000000 +0000
+++ hsfmodem/modules/osfloat.c	2006-02-12 08:04:15.000000000 +0000
@@ -137,7 +137,7 @@
 functionality :	Restores the FPU after float operations.
 ***************************************************************************/
 __shimcall__
-GLOBAL	BOOL OsFloatSuffix(int Id)
+GLOBAL	CXT_BOOL OsFloatSuffix(int Id)
 {
 #if 0
 	if(!in_interrupt()) {
diff -U3 -r hsfmodem-old/modules/osmemory.c hsfmodem/modules/osmemory.c
--- hsfmodem-old/modules/osmemory.c	2006-01-13 19:23:50.000000000 +0000
+++ hsfmodem/modules/osmemory.c	2006-02-12 08:08:54.000000000 +0000
@@ -64,7 +64,7 @@
 #include <asm/io.h> /* for virt_to_bus() */
 
 __shimcall__
-BOOL	OsMemDMAAllocate(UINT32 nPages,PUINT16* ppPhysAddr, PHANDLE pMemHandle, PUINT16* ppBuffer)
+CXT_BOOL	OsMemDMAAllocate(CXT_UINT32 nPages,PCXT_UINT16* ppPhysAddr, PHANDLE pMemHandle, PCXT_UINT16* ppBuffer)
 {
     int count;
     unsigned long allocs[256];
@@ -77,12 +77,12 @@
 	    break;
 	}
 
-	if ( 0x0 == (((UINT32)(allocs[count])) & 0x0000FFFF) )
+	if ( 0x0 == (((CXT_UINT32)(allocs[count])) & 0x0000FFFF) )
 	{
-	    *ppBuffer = (PUINT16)allocs[count];
+	    *ppBuffer = (PCXT_UINT16)allocs[count];
 	    if(pMemHandle)
 		*pMemHandle = (PVOID) allocs[count];
-	    *ppPhysAddr = (PUINT16)virt_to_bus(*ppBuffer);
+	    *ppPhysAddr = (PCXT_UINT16)virt_to_bus(*ppBuffer);
 	    //printk(KERN_DEBUG"%s: success - 0x%lx(%p) after %d attempts\n", __FUNCTION__, allocs[count], *ppPhysAddr, count);
 	    for ( count--; count >= 0; count-- )
 	    {
@@ -101,7 +101,7 @@
 }
 
 __shimcall__
-BOOL	OsMemDMAFree(HANDLE MemHandle, UINT32 nPages)
+CXT_BOOL	OsMemDMAFree(HANDLE MemHandle, CXT_UINT32 nPages)
 {
     if (NULL == MemHandle)
 	return (FALSE);
diff -U3 -r hsfmodem-old/modules/osnvm.c hsfmodem/modules/osnvm.c
--- hsfmodem-old/modules/osnvm.c	2006-02-07 16:30:11.000000000 +0000
+++ hsfmodem/modules/osnvm.c	2006-02-12 08:08:54.000000000 +0000
@@ -318,7 +318,7 @@
 static const char cnxt_nvmdir_static[] = CNXTNVMDIR;
 static const char cnxt_nvmdir_dynamic[] = CNXTNVMDIR "/dynamic";
 
-static const UINT16 g_DefaultCountryCode = 0xB5; /* USA */
+static const CXT_UINT16 g_DefaultCountryCode = 0xB5; /* USA */
 
 static const PROFILE_DATA g_FactoryProfile = {
 	1,							// Echo
@@ -384,7 +384,7 @@
     struct list_head link;
     char *pathname;
     PVOID pBuf;
-    UINT32 dwSize;
+    CXT_UINT32 dwSize;
     enum NVM_FORMAT nvmFormat;
 } nvmelem_t;
 
@@ -392,7 +392,7 @@
 static DECLARE_MUTEX(nvmelem_writelist_sem);
 
 /* nvmelem_writelist_sem must be held by caller */
-static BOOL NVM_WriteListAppend(const char *pathname, PVOID pBuf, UINT32 dwSize, enum NVM_FORMAT nvmFormat)
+static CXT_BOOL NVM_WriteListAppend(const char *pathname, PVOID pBuf, CXT_UINT32 dwSize, enum NVM_FORMAT nvmFormat)
 {
 	nvmelem_t *nel;
 
@@ -416,12 +416,12 @@
 
 
 /* Write pBuf to file as sequence of two-digit hex bytes */
-static BOOL
-NVM_WriteFileData(FILE *file, const char *pathname, PVOID pBuf, UINT32 dwSize, enum NVM_FORMAT nvmFormat)
+static CXT_BOOL
+NVM_WriteFileData(FILE *file, const char *pathname, PVOID pBuf, CXT_UINT32 dwSize, enum NVM_FORMAT nvmFormat)
 {
     char buf[MAX_OEM_STR_LEN + 4], *dp;
     unsigned char *p;
-    UINT32 size;
+    CXT_UINT32 size;
     int errno;
 
     p = pBuf;
@@ -443,10 +443,10 @@
 	sprintf (dp, "%02X\n", *p++);
 	dp += 3;
 
-    } else if((nvmFormat == NVM_FORMAT_HEXSHORTS) && !(dwSize % sizeof(UINT16))) {
-	for (size = sizeof(UINT16); size < dwSize; size += sizeof(UINT16)) {
-	    sprintf (dp, "%04X,", *(UINT16*)p);
-	    p += sizeof(UINT16);
+    } else if((nvmFormat == NVM_FORMAT_HEXSHORTS) && !(dwSize % sizeof(CXT_UINT16))) {
+	for (size = sizeof(CXT_UINT16); size < dwSize; size += sizeof(CXT_UINT16)) {
+	    sprintf (dp, "%04X,", *(CXT_UINT16*)p);
+	    p += sizeof(CXT_UINT16);
 	    dp += 5;
 	    if(((size) % 16) == 0) {
 		*dp++ = '\n';
@@ -457,14 +457,14 @@
 		dp = buf;
 	    }
 	}
-	sprintf (dp, "%04X\n", *(UINT16*)p);
-	p += sizeof(UINT16);
+	sprintf (dp, "%04X\n", *(CXT_UINT16*)p);
+	p += sizeof(CXT_UINT16);
 	dp += 5;
 
-    } else if((nvmFormat == NVM_FORMAT_HEXLONGS) && !(dwSize % sizeof(UINT32))) {
-	for (size = sizeof(UINT32); size < dwSize; size += sizeof(UINT32)) {
-	    sprintf (dp, "%08X,", *(UINT32*)p);
-	    p += sizeof(UINT32);
+    } else if((nvmFormat == NVM_FORMAT_HEXLONGS) && !(dwSize % sizeof(CXT_UINT32))) {
+	for (size = sizeof(CXT_UINT32); size < dwSize; size += sizeof(CXT_UINT32)) {
+	    sprintf (dp, "%08X,", *(CXT_UINT32*)p);
+	    p += sizeof(CXT_UINT32);
 	    dp += 9;
 	    if(((size) % 16) == 0) {
 		*dp++ = '\n';
@@ -475,8 +475,8 @@
 		dp = buf;
 	    }
 	}
-	sprintf (dp, "%08X\n", *(UINT32*)p);
-	p += sizeof(UINT32);
+	sprintf (dp, "%08X\n", *(CXT_UINT32*)p);
+	p += sizeof(CXT_UINT32);
 	dp += 9;
 
     } else if(nvmFormat == NVM_FORMAT_STRING) {
@@ -516,7 +516,7 @@
 }
 
 static void
-NVM_WriteFlushList(BOOL write)
+NVM_WriteFlushList(CXT_BOOL write)
 {
     down(&nvmelem_writelist_sem);
     while(!list_empty(&nvmelem_writelist)) {
@@ -549,8 +549,8 @@
     up(&nvmelem_writelist_sem);
 }
 
-static BOOL
-NVM_WriteFile(const char *pathname, PVOID pBuf, UINT32 dwSize, enum NVM_FORMAT nvmFormat)
+static CXT_BOOL
+NVM_WriteFile(const char *pathname, PVOID pBuf, CXT_UINT32 dwSize, enum NVM_FORMAT nvmFormat)
 {
     int err;
     FILE *file;
@@ -572,7 +572,7 @@
     file = OsFOpen(pathname, "w", &err);
     if (!file) {
 	if(err == -EROFS) {
-	    BOOL res;
+	    CXT_BOOL res;
 
 	    //printk(KERN_DEBUG"%s: delaying write %s\n", __FUNCTION__, pathname);
 	    res = NVM_WriteListAppend(pathname, pBuf, dwSize, nvmFormat);
@@ -596,14 +596,14 @@
  * - Sequence of two-digit hex bytes
  * - String enclosed in ""
  */
-static BOOL
-NVM_ReadFile(const char *pathname, PVOID pBuf, UINT32 *pdwSize)
+static CXT_BOOL
+NVM_ReadFile(const char *pathname, PVOID pBuf, CXT_UINT32 *pdwSize)
 {
     int err;
     FILE *file;
     char buf[100], *p, *dp;
-    BOOL stringMode = FALSE;
-    UINT32 l;
+    CXT_BOOL stringMode = FALSE;
+    CXT_UINT32 l;
     int n;
     struct list_head *lh;
     int errno;
@@ -662,23 +662,23 @@
 		if(!isxdigit(*p))
 		    continue;
 
-		/* hack to read COUNTRY_CODE as UINT16 without swapping: */
-		if((p == buf) && (n == 5) && (l >= *pdwSize) && (*pdwSize == sizeof(UINT16)) &&
+		/* hack to read COUNTRY_CODE as CXT_UINT16 without swapping: */
+		if((p == buf) && (n == 5) && (l >= *pdwSize) && (*pdwSize == sizeof(CXT_UINT16)) &&
 			isxdigit(p[1]) && isxdigit(p[2]) &&
 			isxdigit(p[3]) && p[4] == '\n') {
-		    *((UINT16*)dp) = simple_strtoul (p, &p, 16);
+		    *((CXT_UINT16*)dp) = simple_strtoul (p, &p, 16);
 		    dp += 2;
 		    l -= 2;
 		    continue;
 		}
 
-		/* hack to read LICENSE_KEY as UINT32 without swapping: */
-		if((p == buf) && (n == 9) && (l >= *pdwSize) && (*pdwSize == sizeof(UINT32)) &&
+		/* hack to read LICENSE_KEY as CXT_UINT32 without swapping: */
+		if((p == buf) && (n == 9) && (l >= *pdwSize) && (*pdwSize == sizeof(CXT_UINT32)) &&
 			isxdigit(p[1]) && isxdigit(p[2]) &&
 			isxdigit(p[3]) && isxdigit(p[4]) &&
 			isxdigit(p[5]) && isxdigit(p[6]) &&
 			isxdigit(p[7]) && p[8] == '\n') {
-		    *((UINT32*)dp) = simple_strtoul (p, &p, 16);
+		    *((CXT_UINT32*)dp) = simple_strtoul (p, &p, 16);
 		    dp += 4;
 		    l -= 4;
 		    continue;
@@ -716,8 +716,8 @@
     return file ? TRUE : FALSE;
 }
 
-static BOOL
-NVM_ReadStaticParm(POS_DEVNODE pDevNode, const char *name, PVOID pBuf, UINT32 * pdwSize)
+static CXT_BOOL
+NVM_ReadStaticParm(POS_DEVNODE pDevNode, const char *name, PVOID pBuf, CXT_UINT32 * pdwSize)
 {
     char pathname[100];
 
@@ -725,8 +725,8 @@
     return NVM_ReadFile(pathname, pBuf, pdwSize);
 }
 
-static BOOL
-NVM_ReadDynamicParm(POS_DEVNODE pDevNode, const char *name, PVOID pBuf, UINT32 * pdwSize)
+static CXT_BOOL
+NVM_ReadDynamicParm(POS_DEVNODE pDevNode, const char *name, PVOID pBuf, CXT_UINT32 * pdwSize)
 {
     char pathname[100];
 
@@ -734,12 +734,12 @@
     return NVM_ReadFile(pathname, pBuf, pdwSize);
 }
 
-static BOOL
-NVM_ReadCountryParm(POS_DEVNODE pDevNode, int countryt35, UINT8 reference, const char *name, PVOID pBuf, UINT32 * pdwSize)
+static CXT_BOOL
+NVM_ReadCountryParm(POS_DEVNODE pDevNode, int countryt35, CXT_UINT8 reference, const char *name, PVOID pBuf, CXT_UINT32 * pdwSize)
 {
     char pathname[100];
-    BOOL r;
-    UINT32 Size = pdwSize ? *pdwSize : 0;
+    CXT_BOOL r;
+    CXT_UINT32 Size = pdwSize ? *pdwSize : 0;
 
     snprintf(pathname, sizeof(pathname), "%s/%s/Region/%04X%s", cnxt_nvmdir_static, pDevNode->hwProfile, countryt35, name);
     r = NVM_ReadFile(pathname, pBuf, pdwSize);
@@ -752,11 +752,11 @@
 	return r;
 }
 
-static BOOL
+static CXT_BOOL
 NVM_ReadCountry(POS_DEVNODE pDevNode, BYTE daaType, int countryt35, CtryPrmsStruct *ctryPrms)
 {
-    UINT32 dwSize;
-    UINT8 Reference = 0xFF;
+    CXT_UINT32 dwSize;
+    CXT_UINT8 Reference = 0xFF;
 	char *nameTxLevel, *nameRelays;
 
     memset(ctryPrms, 0, sizeof(ctryPrms));
@@ -881,7 +881,7 @@
 
 
 static
-BOOL isDynamicParm(CFGMGR_CODE eCode)
+CXT_BOOL isDynamicParm(CFGMGR_CODE eCode)
 {
     switch(eCode) {
 	case CFGMGR_PROFILE_STORED:
@@ -912,11 +912,11 @@
 
 __shimcall__
 COM_STATUS
-NVM_Read (HANDLE hNVM, CFGMGR_CODE eCode, PVOID pBuf, UINT32 * pdwSize)
+NVM_Read (HANDLE hNVM, CFGMGR_CODE eCode, PVOID pBuf, CXT_UINT32 * pdwSize)
 {
     POS_DEVNODE pDevNode = (POS_DEVNODE)hNVM;
-    BOOL res;
-    UINT32 Size;
+    CXT_BOOL res;
+    CXT_UINT32 Size;
 
     //printk(KERN_DEBUG "%s: pDevNode=%p CfgCode=%s Size=%p\n", __FUNCTION__, pDevNode, eCodeStr(eCode), pdwSize);
 
@@ -996,7 +996,7 @@
     char pathname[100];
     int err;
     char hwProfile[sizeof(pDevNode->hwProfile)];
-    UINT32 uiSize;
+    CXT_UINT32 uiSize;
     char *argv[] = { "/bin/mkdir", "--mode=700", "--parents", pathname, NULL };
     char *envp[] = { "HOME=/", "PATH=/sbin:/bin:/usr/sbin:/usr/bin", NULL };
 
@@ -1019,8 +1019,8 @@
     }
 
     if(!strncmp(pDevNode->hwInstName, "PCI", 3)) {
-	UINT16 pci_id;
-	UINT32 size;
+	CXT_UINT16 pci_id;
+	CXT_UINT32 size;
 
     	size = sizeof(pci_id);
     	pci_id = ((struct pci_dev *)pDevNode->hwDev)->device;
diff -U3 -r hsfmodem-old/modules/osresour.c hsfmodem/modules/osresour.c
--- hsfmodem-old/modules/osresour.c	2006-01-13 22:08:00.000000000 +0000
+++ hsfmodem/modules/osresour.c	2006-02-12 08:08:55.000000000 +0000
@@ -19,9 +19,9 @@
 #ifndef TARGET_HCF_USB_LINUX
 
 __shimcall__
-BOOL OsGetPCIDeviceResources(HANDLE DevNode, 
+CXT_BOOL OsGetPCIDeviceResources(HANDLE DevNode, 
 	POS_PCI_DEV_RES pPhysMem, POS_PCI_DEV_RES pPhysIO1, POS_PCI_DEV_RES pPhysIO2,
-       	BOOL bEnableBusMastering)
+       	CXT_BOOL bEnableBusMastering)
 {			   
     struct pci_dev *pcidev = (struct pci_dev *)DevNode;
     int i, needed = 0;
@@ -81,7 +81,7 @@
 }
 
 __shimcall__
-PVOID OsMapPhysMem(UINT32 dwPhysMemBase, UINT32 dwMemSize)
+PVOID OsMapPhysMem(CXT_UINT32 dwPhysMemBase, CXT_UINT32 dwMemSize)
 {
     PVOID mem;
 
@@ -94,7 +94,7 @@
 }
 
 __shimcall__
-BOOL OsUnmapPhysMem(PVOID dwLinearAddr, UINT32 dwMemSize)
+CXT_BOOL OsUnmapPhysMem(PVOID dwLinearAddr, CXT_UINT32 dwMemSize)
 {
     if(dwLinearAddr != NULL)
 	iounmap((void *)dwLinearAddr);
@@ -102,7 +102,7 @@
 }
 
 __shimcall__
-BOOL OsHookInterrupt(HANDLE DevNode, __kernelcall__ OS_IRQRETURN_T (*isr)(int irq, void *devidp, void *unused), void* devid)
+CXT_BOOL OsHookInterrupt(HANDLE DevNode, __kernelcall__ OS_IRQRETURN_T (*isr)(int irq, void *devidp, void *unused), void* devid)
 {
     struct pci_dev *pcidev = (struct pci_dev *)DevNode;
     const char *devname;
diff -U3 -r hsfmodem-old/modules/osservices.c hsfmodem/modules/osservices.c
--- hsfmodem-old/modules/osservices.c	2006-01-27 12:49:32.000000000 +0000
+++ hsfmodem/modules/osservices.c	2006-02-12 08:09:28.000000000 +0000
@@ -232,7 +232,7 @@
 }
 
 __shimcall__
-BOOL OsLockTry(HLOCK hLock)
+CXT_BOOL OsLockTry(HLOCK hLock)
 {
     unsigned long flags;
 
@@ -278,7 +278,7 @@
 Result: true if newValue was written to the address. 
  ****************************************************************************************/
 __shimcall__
-BOOL OsAtomicCompareAndSwapEx (PVOID oldValue, PVOID newValue, PVOID* address, INT size)
+CXT_BOOL OsAtomicCompareAndSwapEx (PVOID oldValue, PVOID newValue, PVOID* address, INT size)
 {
 #if defined(__HAVE_ARCH_CMPXCHG) && !defined(__powerpc__)
     switch(size) {
@@ -296,7 +296,7 @@
     }
 #else
     unsigned long flags;
-    BOOL ret = FALSE;
+    CXT_BOOL ret = FALSE;
 
     spin_lock_irqsave(&atomic_lock, flags);
 
@@ -339,7 +339,7 @@
 }
 
 __shimcall__
-INT32 OsAtomicAdd   (INT32 amount, PINT32 address)
+CXT_INT32 OsAtomicAdd   (CXT_INT32 amount, PINT32 address)
 {
     unsigned long flags;
     atomic_t *v = (atomic_t *)address;
@@ -353,11 +353,11 @@
 }
 
 __shimcall__
-INT32 OsAtomicIncrement (PINT32 address)
+CXT_INT32 OsAtomicIncrement (PINT32 address)
 {
     unsigned long flags;
     atomic_t *v = (atomic_t *)address;
-    INT32 amount;
+    CXT_INT32 amount;
 
     spin_lock_irqsave(&atomic_lock, flags);
     atomic_inc(v);
@@ -368,11 +368,11 @@
 }
 
 __shimcall__
-INT32 OsAtomicDecrement (PINT32 address)
+CXT_INT32 OsAtomicDecrement (PINT32 address)
 {
     unsigned long flags;
     atomic_t *v = (atomic_t *)address;
-    INT32 amount;
+    CXT_INT32 amount;
 
     spin_lock_irqsave(&atomic_lock, flags);
     atomic_dec(v);
@@ -385,7 +385,7 @@
 struct _OSTHRD {
 	const char *name;
 	int pid;
-	BOOLEAN highestprio;
+	CXT_BOOLEAN highestprio;
 	task_queue tq;
 	wait_queue_head_t wq;
 #ifdef DECLARE_COMPLETION
@@ -551,7 +551,7 @@
 }
 
 static void
-OsThreadStart(OSTHRD *osthrd, const char *name, BOOLEAN highestprio)
+OsThreadStart(OSTHRD *osthrd, const char *name, CXT_BOOLEAN highestprio)
 {
 	memset(osthrd, 0, sizeof(*osthrd));
 
@@ -622,7 +622,7 @@
 
 __shimcall__
 POSTHRD
-OsThreadCreate(const char *name, BOOLEAN highestprio, int *pid)
+OsThreadCreate(const char *name, CXT_BOOLEAN highestprio, int *pid)
 {
 	OSTHRD *osthrd = OsAllocate(sizeof(OSTHRD));
 
@@ -806,7 +806,7 @@
 
 #define TICKS_TO_MSECS(ticks) (ticks*(1000/HZ))
 
-static inline long MSECS_TO_TICKS(UINT32 msecs)
+static inline long MSECS_TO_TICKS(CXT_UINT32 msecs)
 {
     long ticks = (msecs)/(1000/HZ);
 
@@ -820,8 +820,8 @@
 typedef struct TIME_OUT_INSTANCE_TYPE {
     OSSCHED				TaskQueue;
     struct timer_list			Timer;
-    UINT32				mSec;
-    UINT32				bLocked;
+    CXT_UINT32				mSec;
+    CXT_UINT32				bLocked;
     PFREE_FUNC				pFuncFree;
     PVOID				pRefData;
     PCBFUNC				pTimeOutCallBack;
@@ -871,10 +871,10 @@
     }
 }
 
-static INT32 ntimers;
+static CXT_INT32 ntimers;
 
 __shimcall__
-HOSTIMER OsCreatePeriodicTimer(IN UINT32 InitialTimeOut, IN PCBFUNC pTimeOutCallBack,
+HOSTIMER OsCreatePeriodicTimer(IN CXT_UINT32 InitialTimeOut, IN PCBFUNC pTimeOutCallBack,
 	IN PALLOC_FUNC pFuncAlloc, IN PFREE_FUNC pFuncFree,
 	IN PVOID pRefData, OUT HTHREAD* pThreadId)
 {
@@ -982,7 +982,7 @@
 }
 
 __shimcall__
-BOOL OsSetPeriodicTimer(IN HOSTIMER hTimeOut, IN UINT32 NewTimeOut)
+CXT_BOOL OsSetPeriodicTimer(IN HOSTIMER hTimeOut, IN CXT_UINT32 NewTimeOut)
 {
     PTIME_OUT_INSTANCE_T	pTimeOutInstance = (PTIME_OUT_INSTANCE_T)hTimeOut;
 
@@ -1018,7 +1018,7 @@
 static time_t epoch = 0;
 
 __shimcall__
-UINT32 OsGetSystemTime(void)
+CXT_UINT32 OsGetSystemTime(void)
 {
     struct timeval		timestamp;
 
@@ -1028,13 +1028,13 @@
 }
 
 __shimcall__
-void OsSleep(UINT32 ms)
+void OsSleep(CXT_UINT32 ms)
 {
     /* we must schedule() for sleeps >= 10ms since HCF calls us in loops
      * waiting for asynchronous events.
      */
     if(ms >= TICKS_TO_MSECS(1)) {
-	UINT32 start, end;
+	CXT_UINT32 start, end;
 	long timeout = MSECS_TO_TICKS(ms);
 	//long ort = timeout;
 
@@ -1072,12 +1072,12 @@
 
 typedef struct TIMER_TAG
 {
-    UINT32 msec;
+    CXT_UINT32 msec;
     struct timer_list timer;
 } TIMER_T, *PTIMER_T;
 
 __shimcall__
-HANDLE OsCreateTimer(UINT32 msec, __kernelcall__ PVOID pCBFunc, PVOID pRefData)
+HANDLE OsCreateTimer(CXT_UINT32 msec, __kernelcall__ PVOID pCBFunc, PVOID pRefData)
 {
     PTIMER_T pTimer;
 
@@ -1134,7 +1134,7 @@
 }
 
 __shimcall__
-void OsChangeTimerTimeOut(PVOID pTimer, UINT32 msec)
+void OsChangeTimerTimeOut(PVOID pTimer, CXT_UINT32 msec)
 {
     PTIMER_T pTimerS = (PTIMER_T)pTimer;
     if ( pTimer == NULL )
@@ -1206,9 +1206,9 @@
 }
 
 __shimcall__
-UINT32 OsReadCpuCnt(void)
+CXT_UINT32 OsReadCpuCnt(void)
 {
-	UINT32 tsc;
+	CXT_UINT32 tsc;
 
 	rdtscl(tsc);
 
@@ -1248,7 +1248,7 @@
 
 
 __shimcall__
-void    OsRawVPrintf       (LPCSTR szFormat, PVOID args, BOOL addnl)
+void    OsRawVPrintf       (LPCSTR szFormat, PVOID args, CXT_BOOL addnl)
 {
     char printk_buf[1024];
 
@@ -1358,7 +1358,7 @@
 }
 
 #if 0
-void OsDebugDumpData(PUINT8 data, UINT32 len)
+void OsDebugDumpData(PCXT_UINT8 data, CXT_UINT32 len)
 {
     OsDebugPrintf("%s: data=%p len=%ld\n", __FUNCTION__, data, len);
 }
@@ -1471,7 +1471,7 @@
 
 // waits until event is set by OsEventSet() call or timeout (ms) has passed
 __shimcall__
-OSEVENT_WAIT_RESULT OsEventWaitTime(HOSEVENT hEvent, UINT32 timeout)
+OSEVENT_WAIT_RESULT OsEventWaitTime(HOSEVENT hEvent, CXT_UINT32 timeout)
 {
 	PEVENT pEvent = (PEVENT)hEvent;
 	DECLARE_WAITQUEUE(wait, current);
@@ -1613,7 +1613,7 @@
 #if (__GNUC__ == 3 && __GNUC_MINOR__ > 1) || __GNUC__ > 3
 __attribute__((used))
 #endif
-static void regParmUsed(BOOL *regParm)
+static void regParmUsed(CXT_BOOL *regParm)
 {
 #if defined(__i386__)
 	register void **esp asm("esp") = esp;
@@ -1625,10 +1625,10 @@
 }
 
 __shimcall__
-BOOL
+CXT_BOOL
 OsKernelUsesRegParm(void)
 {
-	BOOL regParm;
+	CXT_BOOL regParm;
 
 	regParmUsed(&regParm);
 
diff -U3 -r hsfmodem-old/modules/osstring.c hsfmodem/modules/osstring.c
--- hsfmodem-old/modules/osstring.c	2006-01-13 19:23:50.000000000 +0000
+++ hsfmodem/modules/osstring.c	2006-02-12 08:08:56.000000000 +0000
@@ -13,25 +13,25 @@
 #include "osservices.h"
 
 __shimcall__
-PVOID OsMemSet(PVOID pBuf, UINT8 c, UINT32 Count)
+PVOID OsMemSet(PVOID pBuf, CXT_UINT8 c, CXT_UINT32 Count)
 {
     return memset(pBuf, c, Count);
 }
 
 __shimcall__
-PVOID OsMemMove(PVOID pDest, PVOID pSrc, UINT32 Count)
+PVOID OsMemMove(PVOID pDest, PVOID pSrc, CXT_UINT32 Count)
 {
     return memmove(pDest, pSrc, Count);
 }
 
 __shimcall__
-PVOID OsMemCpy(PVOID pDest, PVOID pSrc, UINT32 Count)
+PVOID OsMemCpy(PVOID pDest, PVOID pSrc, CXT_UINT32 Count)
 {
     return memcpy(pDest, pSrc, Count);
 }
 
 __shimcall__
-int OsMemCmp(PVOID pBuff1, PVOID pBuff2, UINT32 Count)
+int OsMemCmp(PVOID pBuff1, PVOID pBuff2, CXT_UINT32 Count)
 {
     return memcmp(pBuff1, pBuff2, Count);
 }
@@ -67,7 +67,7 @@
 }
 
 __shimcall__
-int OsStrnCmp(LPCSTR szStr1, LPCSTR szStr2, UINT32 Count)
+int OsStrnCmp(LPCSTR szStr1, LPCSTR szStr2, CXT_UINT32 Count)
 {
     return strncmp(szStr1, szStr2, Count);
 }
diff -U3 -r hsfmodem-old/modules/osusb.c hsfmodem/modules/osusb.c
--- hsfmodem-old/modules/osusb.c	2006-01-27 12:49:32.000000000 +0000
+++ hsfmodem/modules/osusb.c	2006-02-12 08:08:57.000000000 +0000
@@ -38,7 +38,7 @@
 #endif
 
 //#undef dbg
-//#define dbg(format, arg...) { UINT32 dwTime = OsGetSystemTime(); printk(KERN_DEBUG "%07lu.%03lu: "__FILE__ ": " format "\n" , dwTime/1000, dwTime%1000, ## arg); }
+//#define dbg(format, arg...) { CXT_UINT32 dwTime = OsGetSystemTime(); printk(KERN_DEBUG "%07lu.%03lu: "__FILE__ ": " format "\n" , dwTime/1000, dwTime%1000, ## arg); }
 //#define dbg(format, arg...) do {} while (0)
 
 #define Working TRUE
@@ -109,7 +109,7 @@
 	}
 }
 
-static BOOL
+static CXT_BOOL
 SubmitUrbListEntry(PURB_LIST_ENTRY ule)
 {
 	int res;
@@ -204,7 +204,7 @@
 	}
 
 	if(bufferSize) {
-		ule->bufferPtr = (PUINT8)(ule + 1);
+		ule->bufferPtr = (PCXT_UINT8)(ule + 1);
 		ule->bufferSize = bufferSize;
 	}
 
@@ -271,7 +271,7 @@
 	}
 }
 
-static BOOL InitUrbList(PURB_LIST ul, PUSBOSHAL pUsbOsHal, size_t bufferSize, int nurbs)
+static CXT_BOOL InitUrbList(PURB_LIST ul, PUSBOSHAL pUsbOsHal, size_t bufferSize, int nurbs)
 {
 	INIT_LIST_HEAD(&ul->urb_list);
 	INIT_LIST_HEAD(&ul->queued_list);
@@ -315,10 +315,10 @@
 ******************************************************************************/
 __shimcall__
 HANDLE OsUsbCreateInstance (PVOID pDeviceID, HANDLE hUpper,
-		__shimcall__ BOOL (*cbUsbHalNotificationReceived) (PVOID hUpper, PUINT8 pDataReceived, unsigned RecvLength),
-		__shimcall__ void (*cbUsbHalDataReceived)			(PVOID hUpper, PUINT8 pDataReceived, unsigned RecvLength),
+		__shimcall__ CXT_BOOL (*cbUsbHalNotificationReceived) (PVOID hUpper, PCXT_UINT8 pDataReceived, unsigned RecvLength),
+		__shimcall__ void (*cbUsbHalDataReceived)			(PVOID hUpper, PCXT_UINT8 pDataReceived, unsigned RecvLength),
 		__shimcall__ void (*cbUsbHalDataTransmitDone)		(PVOID hUpper, unsigned TxLength),
-		__shimcall__ void (*cbUsbHalControlTransferDone)	(PVOID hUpper, PVOID userContext, UINT8 Request, UINT16 value, UINT16 index),
+		__shimcall__ void (*cbUsbHalControlTransferDone)	(PVOID hUpper, PVOID userContext, CXT_UINT8 Request, CXT_UINT16 value, CXT_UINT16 index),
 #if TARGET_HCF_FAMILY
 		__shimcall__ void (*cbUsbHalDownloadTransmitDone) (PVOID hUpper),
 #endif
@@ -438,7 +438,7 @@
 	unsigned char info[5];
 #endif
 	int fwSize;
-	PUINT8 pC2Firmware;
+	PCXT_UINT8 pC2Firmware;
 
 	dbg("%s: %p", __FUNCTION__, pUsbOsHal);
 
@@ -514,7 +514,7 @@
 
 		i = 0;
 		while (i<fwSize) {
-			UINT32 nBytes = fwSize - i;
+			CXT_UINT32 nBytes = fwSize - i;
 			
 			if(nBytes > FW_BLOCK_SIZE)
 				nBytes = FW_BLOCK_SIZE;
@@ -601,7 +601,7 @@
 
 ******************************************************************************/
 __shimcall__
-BOOL OsUsbIsStarted (HANDLE hUsbOsHal)
+CXT_BOOL OsUsbIsStarted (HANDLE hUsbOsHal)
 {
 	PUSBOSHAL pUsbOsHal = (PUSBOSHAL)hUsbOsHal;
 
@@ -925,7 +925,7 @@
 	int UsbStatus = urb->status;
 	// save a copy of data and received length
     int UsbRecvLength = urb->actual_length;
-	PUINT8 pDataReceived = urb->transfer_buffer;
+	PCXT_UINT8 pDataReceived = urb->transfer_buffer;
 
 	dbg("%s: ule=%p urb=%p UsbStatus=%d UsbRecvLength=%d", __FUNCTION__, ule, urb, UsbStatus, UsbRecvLength);
 
@@ -1021,7 +1021,7 @@
 
 ******************************************************************************/
 __shimcall__
-BOOL OsUsbMakeDataReceiveRequest	(HANDLE hUsbOsHal, PVOID pBuf, UINT32 nBytes)
+CXT_BOOL OsUsbMakeDataReceiveRequest	(HANDLE hUsbOsHal, PVOID pBuf, CXT_UINT32 nBytes)
 {
 	PUSBOSHAL pUsbOsHal = (PUSBOSHAL)hUsbOsHal;
 	PURB_LIST_ENTRY ule;
@@ -1077,7 +1077,7 @@
 
 ******************************************************************************/
 __shimcall__
-BOOL OsUsbMakeDataTransmitRequest	(HANDLE hUsbOsHal, HANDLE hRequest, PVOID pBuf, UINT32 nBytes)
+CXT_BOOL OsUsbMakeDataTransmitRequest	(HANDLE hUsbOsHal, HANDLE hRequest, PVOID pBuf, CXT_UINT32 nBytes)
 {
 	PUSBOSHAL pUsbOsHal = (PUSBOSHAL)hUsbOsHal;
 	PURB_LIST_ENTRY ule = (PURB_LIST_ENTRY)hRequest;
@@ -1120,7 +1120,7 @@
 
 ******************************************************************************/
 __shimcall__
-BOOL OsUsbMakeDownloadTransmitRequest	(HANDLE hUsbOsHal, PVOID pBuf, UINT32 nBytes)
+CXT_BOOL OsUsbMakeDownloadTransmitRequest	(HANDLE hUsbOsHal, PVOID pBuf, CXT_UINT32 nBytes)
 {
 	PUSBOSHAL pUsbOsHal = (PUSBOSHAL)hUsbOsHal;
 	PURB_LIST_ENTRY ule;
@@ -1309,13 +1309,13 @@
 
 ******************************************************************************/
 __shimcall__
-BOOL OsUsbMakeControlRequest (HANDLE hUsbOsHal, HANDLE hCntrlReq, IN PVOID userContext, UINT8 Request, UINT16 Value, UINT16 Index,
-							  IN PVOID pBuf, IN UINT32 nBytes)
+CXT_BOOL OsUsbMakeControlRequest (HANDLE hUsbOsHal, HANDLE hCntrlReq, IN PVOID userContext, CXT_UINT8 Request, CXT_UINT16 Value, CXT_UINT16 Index,
+							  IN PVOID pBuf, IN CXT_UINT32 nBytes)
 {
 	PUSBOSHAL pUsbOsHal = (PUSBOSHAL)hUsbOsHal;
 	PURB_LIST_ENTRY ule;
 	USB_CTRLREQUEST *dr;
-	UINT16 snBytes = (UINT16)nBytes;
+	CXT_UINT16 snBytes = (CXT_UINT16)nBytes;
 
 	dbg("%s: ule=%p req=0x%x val=%d idx=%d pbuf=%p len=%ld", __FUNCTION__, hCntrlReq, Request, Value, Index, pBuf, nBytes);
 
@@ -1399,12 +1399,12 @@
 
 ******************************************************************************/
 __shimcall__
-BOOL OsUsbMakeControlRequestSync		(HANDLE hUsbOsHal, IN UINT8 Direction, UINT8 Request, UINT16 Value, UINT16 Index,
+CXT_BOOL OsUsbMakeControlRequestSync		(HANDLE hUsbOsHal, IN CXT_UINT8 Direction, CXT_UINT8 Request, CXT_UINT16 Value, CXT_UINT16 Index,
 										IN PVOID pBuf, IO PUINT32 pnBytes)
 {
 	PUSBOSHAL pUsbOsHal = (PUSBOSHAL)hUsbOsHal;
 	int ret;
-	UINT8 ControlRequestBuffer[MAX_CONTROL_DATA_PACKET];
+	CXT_UINT8 ControlRequestBuffer[MAX_CONTROL_DATA_PACKET];
 
 	dbg("%s: req=0x%x dir=%d val=%d idx=%d pbuf=%p len=%ld", __FUNCTION__, Request, Direction, Value, Index, pBuf, *pnBytes);
 
@@ -1442,9 +1442,9 @@
 
 #if 0
 __shimcall__
-BOOL OsUsbMakeGetStringDescriptorRequestSync(
+CXT_BOOL OsUsbMakeGetStringDescriptorRequestSync(
 	HANDLE hUsbOsHal,
-	IN UINT8 uStrIndex,	// String Descriptor Index
+	IN CXT_UINT8 uStrIndex,	// String Descriptor Index
 	IN PVOID pBuf,
 	IN OUT PUINT32 pnBytes)
 {
@@ -1478,7 +1478,7 @@
 
 ******************************************************************************/
 __shimcall__
-BOOL OsUsbMakeNotifyRequest	(HANDLE hUsbOsHal)
+CXT_BOOL OsUsbMakeNotifyRequest	(HANDLE hUsbOsHal)
 {
 	PUSBOSHAL pUsbOsHal = (PUSBOSHAL)hUsbOsHal;
 	PURB_LIST_ENTRY ule;
@@ -1569,7 +1569,7 @@
 }
 
 __shimcall__
-BOOL OsUsbAllocateUrbs (PUSBOSHAL pUsbOsHal)
+CXT_BOOL OsUsbAllocateUrbs (PUSBOSHAL pUsbOsHal)
 {
 	dbg("%s: %p", __FUNCTION__, pUsbOsHal);
 
@@ -1665,14 +1665,14 @@
 {
     HANDLE	hHalOs;
 
-    BOOL	fOn;
+    CXT_BOOL	fOn;
 	int		nBufNo;
 
 	PIO_WORKITEM	pWorkItem;
 
-    UINT16  Buffer[2][DCP_BLOCK_SIZE];
-    UINT32  dwCount;
-	UINT32	hFile;
+    CXT_UINT16  Buffer[2][DCP_BLOCK_SIZE];
+    CXT_UINT32  dwCount;
+	CXT_UINT32	hFile;
 
 } DCP, *PDCP;
 
@@ -1708,7 +1708,7 @@
 {
     PDCP pDcp = (PDCP)Context;
 	if (pDcp->fOn && pDcp->hFile)
-		R0FileWrite(pDcp->hFile, (UINT8*)pDcp->Buffer[1-pDcp->nBufNo], sizeof(pDcp->Buffer[0]));
+		R0FileWrite(pDcp->hFile, (CXT_UINT8*)pDcp->Buffer[1-pDcp->nBufNo], sizeof(pDcp->Buffer[0]));
 }
 
 __shimcall__
@@ -1732,7 +1732,7 @@
 		pDcp->fOn = FALSE;
 		if(pDcp->hFile)
 		{
-		   R0FileWrite(pDcp->hFile, (UINT8*)pDcp->Buffer[pDcp->nBufNo], 2*pDcp->dwCount);
+		   R0FileWrite(pDcp->hFile, (CXT_UINT8*)pDcp->Buffer[pDcp->nBufNo], 2*pDcp->dwCount);
 		   R0FileClose(pDcp->hFile);
 		   pDcp->hFile = 0;
 		}
@@ -1807,7 +1807,7 @@
 
 ******************************************************************************/
 __shimcall__
-BOOL OsUsbMakeDcpRequest(HANDLE hOsHal, PVOID pBuf, UINT32 nBytes)
+CXT_BOOL OsUsbMakeDcpRequest(HANDLE hOsHal, PVOID pBuf, CXT_UINT32 nBytes)
 {
 	PIRP irp;
 	PURB urb;
