Changeset 11 for trunk/txlib/include/txcon.h
- Timestamp:
- 05/09/06 22:21:53 (3 years ago)
- Files:
-
- 1 modified
-
trunk/txlib/include/txcon.h (modified) (16 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/txlib/include/txcon.h
r1 r11 74 74 75 75 76 typedef enum screen_state76 typedef enum device_state 77 77 { 78 SCREEN_ON = 0,79 SCREEN_OFF = 1,80 SCREEN_TEST = 281 } SCREEN_STATE; // end of enum "screen_state"78 DEVICE_ON = 0, 79 DEVICE_OFF = 1, 80 DEVICE_TEST = 2 81 } DEVICE_STATE; // end of enum "device_state" 82 82 83 83 // void void function pointer … … 808 808 if (TxTrLevel >= 10) \ 809 809 { \ 810 SCREEN_STATE tss = TxScreenState(SCREEN_TEST); \811 if (TxTrLogOnly) TxScreenState( SCREEN_OFF); \810 DEVICE_STATE tss = TxScreenState(DEVICE_TEST); \ 811 if (TxTrLogOnly) TxScreenState(DEVICE_OFF); \ 812 812 TxTraceEnter( __FUNCTION__); \ 813 813 TxTraceLeader(); \ … … 825 825 if (TxTrLevel >= 10) \ 826 826 { \ 827 SCREEN_STATE tss = TxScreenState(SCREEN_TEST); \828 if (TxTrLogOnly) TxScreenState( SCREEN_OFF); \827 DEVICE_STATE tss = TxScreenState(DEVICE_TEST); \ 828 if (TxTrLogOnly) TxScreenState(DEVICE_OFF); \ 829 829 TxTraceReturn( __FUNCTION__, (ULONG) retc); \ 830 830 if (TxTrLogOnly) TxScreenState(tss); \ … … 837 837 if (TxTrLevel >= 10) \ 838 838 { \ 839 SCREEN_STATE tss = TxScreenState(SCREEN_TEST); \840 if (TxTrLogOnly) TxScreenState( SCREEN_OFF); \839 DEVICE_STATE tss = TxScreenState(DEVICE_TEST); \ 840 if (TxTrLogOnly) TxScreenState(DEVICE_OFF); \ 841 841 TxTraceEnter( __FUNCTION__); \ 842 842 if (TxTrLogOnly) TxScreenState(tss); \ … … 851 851 if (TxTrLevel >= 10) \ 852 852 { \ 853 SCREEN_STATE tss = TxScreenState(SCREEN_TEST); \854 if (TxTrLogOnly) TxScreenState( SCREEN_OFF); \853 DEVICE_STATE tss = TxScreenState(DEVICE_TEST); \ 854 if (TxTrLogOnly) TxScreenState(DEVICE_OFF); \ 855 855 TxTraceRetVoid( __FUNCTION__); \ 856 856 if (TxTrLogOnly) TxScreenState(tss); \ … … 861 861 if (TxTrLevel >= 10) \ 862 862 { \ 863 SCREEN_STATE tss = TxScreenState(SCREEN_TEST); \864 if (TxTrLogOnly) TxScreenState( SCREEN_OFF); \863 DEVICE_STATE tss = TxScreenState(DEVICE_TEST); \ 864 if (TxTrLogOnly) TxScreenState(DEVICE_OFF); \ 865 865 TxTraceRetDouble( __FUNCTION__, (double) rc); \ 866 866 if (TxTrLogOnly) TxScreenState(tss); \ … … 871 871 if (TxTrLevel >= 10) \ 872 872 { \ 873 SCREEN_STATE tss = TxScreenState(SCREEN_TEST); \874 if (TxTrLogOnly) TxScreenState( SCREEN_OFF); \873 DEVICE_STATE tss = TxScreenState(DEVICE_TEST); \ 874 if (TxTrLogOnly) TxScreenState(DEVICE_OFF); \ 875 875 TxTraceRetBool( __FUNCTION__, (BOOL) rc); \ 876 876 if (TxTrLogOnly) TxScreenState(tss); \ … … 881 881 if (TxTrLevel >= 10) \ 882 882 { \ 883 SCREEN_STATE tss = TxScreenState(SCREEN_TEST); \884 if (TxTrLogOnly) TxScreenState( SCREEN_OFF); \883 DEVICE_STATE tss = TxScreenState(DEVICE_TEST); \ 884 if (TxTrLogOnly) TxScreenState(DEVICE_OFF); \ 885 885 TxTraceReturn( __FUNCTION__, (ULONG) rc); \ 886 886 if (TxTrLogOnly) TxScreenState(tss); \ … … 893 893 if (TxTrLevel >= lev) \ 894 894 { \ 895 SCREEN_STATE tss = TxScreenState(SCREEN_TEST); \896 if (TxTrLogOnly) TxScreenState( SCREEN_OFF); \895 DEVICE_STATE tss = TxScreenState(DEVICE_TEST); \ 896 if (TxTrLogOnly) TxScreenState(DEVICE_OFF); \ 897 897 TxTraceLeader(); \ 898 898 TxPrint txf; \ … … 917 917 if (TxTrLevel >= lev) \ 918 918 { \ 919 SCREEN_STATE tss = TxScreenState(SCREEN_TEST); \920 if (TxTrLogOnly) TxScreenState( SCREEN_OFF); \919 DEVICE_STATE tss = TxScreenState(DEVICE_TEST); \ 920 if (TxTrLogOnly) TxScreenState(DEVICE_OFF); \ 921 921 TxPrint( "Hexdump at %8.8lx size:% 3lu bytes, of '%s'\n", \ 922 922 (char *) a, (ULONG) b, s); \ … … 932 932 if (TxTrLevel >= 30) \ 933 933 { \ 934 SCREEN_STATE tss = TxScreenState(SCREEN_TEST); \935 if (TxTrLogOnly) TxScreenState( SCREEN_OFF); \934 DEVICE_STATE tss = TxScreenState(DEVICE_TEST); \ 935 if (TxTrLogOnly) TxScreenState(DEVICE_OFF); \ 936 936 TxPrint("%s Data *: %8.8lX, size: % 9lu " \ 937 937 "= %8.8lX, CRC: %s%8.8lX%s\n", \ … … 948 948 if (TxTrLevel >= lev) \ 949 949 { \ 950 SCREEN_STATE tss = TxScreenState(SCREEN_TEST); \951 if (TxTrLogOnly) TxScreenState( SCREEN_OFF); \950 DEVICE_STATE tss = TxScreenState(DEVICE_TEST); \ 951 if (TxTrLogOnly) TxScreenState(DEVICE_OFF); \ 952 952 TxDisplayHex(l, (char *)a, (ULONG) b, (ULONG) o); \ 953 953 if (TxTrLogOnly) TxScreenState(tss); \ … … 959 959 if (TxTrLevel >= lev) \ 960 960 { \ 961 SCREEN_STATE tss = TxScreenState(SCREEN_TEST); \962 if (TxTrLogOnly) TxScreenState( SCREEN_OFF); \961 DEVICE_STATE tss = TxScreenState(DEVICE_TEST); \ 962 if (TxTrLogOnly) TxScreenState(DEVICE_OFF); \ 963 963 TxTraceLeader() 964 964 … … 977 977 if ((TxTrLevel >= 10) && (!TxTrLogOnly)) \ 978 978 { \ 979 SCREEN_STATE tss = TxScreenState(SCREEN_TEST); \980 if (TxTrLogOnly) TxScreenState( SCREEN_OFF); \979 DEVICE_STATE tss = TxScreenState(DEVICE_TEST); \ 980 if (TxTrLogOnly) TxScreenState(DEVICE_OFF); \ 981 981 TxPrint("\n"); \ 982 982 if (TxTrLogOnly) TxScreenState(tss); \ … … 997 997 if (TxTrLevel >= 70) \ 998 998 { \ 999 SCREEN_STATE tss = TxScreenState(SCREEN_TEST); \1000 if (TxTrLogOnly) TxScreenState( SCREEN_OFF); \999 DEVICE_STATE tss = TxScreenState(DEVICE_TEST); \ 1000 if (TxTrLogOnly) TxScreenState(DEVICE_OFF); \ 1001 1001 TxPrint txf; \ 1002 1002 if (TxTrLogOnly) TxScreenState(tss); \ … … 1223 1223 1224 1224 // Test and set TxScreenState 1225 SCREEN_STATE TxScreenState // RET screen active 1226 ( 1227 SCREEN_STATE action // IN screen action 1225 DEVICE_STATE TxScreenState // RET screen active 1226 ( 1227 DEVICE_STATE action // IN screen action 1228 ); 1229 1230 1231 // Test and set TxLogfileState, logging when state = ON and file opened 1232 DEVICE_STATE TxLogfileState // RET logfile active 1233 ( 1234 DEVICE_STATE action // IN logfile action 1228 1235 ); 1229 1236
