equal
deleted
inserted
replaced
116 m_canReceive = (CANRECEIVE_DRIVER_PROC)GetProcAddress(handle, myTEXT("canReceive_driver")); |
116 m_canReceive = (CANRECEIVE_DRIVER_PROC)GetProcAddress(handle, myTEXT("canReceive_driver")); |
117 m_canSend = (CANSEND_DRIVER_PROC)GetProcAddress(handle, myTEXT("canSend_driver")); |
117 m_canSend = (CANSEND_DRIVER_PROC)GetProcAddress(handle, myTEXT("canSend_driver")); |
118 m_canOpen = (CANOPEN_DRIVER_PROC)GetProcAddress(handle, myTEXT("canOpen_driver")); |
118 m_canOpen = (CANOPEN_DRIVER_PROC)GetProcAddress(handle, myTEXT("canOpen_driver")); |
119 m_canClose = (CANCLOSE_DRIVER_PROC)GetProcAddress(handle, myTEXT("canClose_driver")); |
119 m_canClose = (CANCLOSE_DRIVER_PROC)GetProcAddress(handle, myTEXT("canClose_driver")); |
120 m_canChangeBaudRate = (CANCHANGEBAUDRATE_DRIVER_PROC)GetProcAddress(handle, myTEXT("canChangeBaudRate_driver")); |
120 m_canChangeBaudRate = (CANCHANGEBAUDRATE_DRIVER_PROC)GetProcAddress(handle, myTEXT("canChangeBaudRate_driver")); |
|
121 |
|
122 if(m_canReceive==NULL || m_canSend==NULL || m_canOpen==NULL || m_canClose==NULL || m_canChangeBaudRate==NULL) |
|
123 { |
|
124 m_canReceive = NULL; |
|
125 m_canSend = NULL; |
|
126 m_canOpen = NULL; |
|
127 m_canClose = NULL; |
|
128 m_canChangeBaudRate = NULL; |
|
129 FreeLibrary(handle); |
|
130 handle = NULL; |
|
131 } |
121 #else |
132 #else |
122 //compiled in... |
133 //compiled in... |
123 handle = 1; //TODO: remove this hack |
134 handle = 1; //TODO: remove this hack |
124 |
135 |
125 m_canReceive = canReceive_driver; |
136 m_canReceive = canReceive_driver; |
138 { |
149 { |
139 if (port && (m_canSend != NULL)) |
150 if (port && (m_canSend != NULL)) |
140 { |
151 { |
141 return m_canSend(((CANPort*)port)->fd, m); |
152 return m_canSend(((CANPort*)port)->fd, m); |
142 } |
153 } |
143 return 1; |
154 return 1; /* NOT OK */ |
144 } |
155 } |
145 |
156 |
146 /***************************************************************************/ |
157 /***************************************************************************/ |
147 void canReceiveLoop(CAN_PORT port) |
158 void canReceiveLoop(CAN_PORT port) |
148 { |
159 { |