[Firebug-cvs] fireboard/beta/apps/XSensorMTS400 TestMTS400M.nc,1.14,1.15
Brought to you by:
doolin
From: Michael N. <mne...@us...> - 2005-06-20 03:06:13
|
Update of /cvsroot/firebug/fireboard/beta/apps/XSensorMTS400 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14092 Modified Files: TestMTS400M.nc Log Message: eliminate atomic warning related to variable 'pack' Index: TestMTS400M.nc =================================================================== RCS file: /cvsroot/firebug/fireboard/beta/apps/XSensorMTS400/TestMTS400M.nc,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** TestMTS400M.nc 19 Jun 2005 19:09:27 -0000 1.14 --- TestMTS400M.nc 20 Jun 2005 03:06:04 -0000 1.15 *************** *** 1,3 **** --- 1,5 ---- /* tab:4 + * + * * "Copyright (c) 2000-2002 The Regents of the University of California. * All rights reserved. *************** *** 275,284 **** if (sending_packet) return; ! atomic sending_packet = TRUE; ! pack->xSensorHeader.board_id = SENSOR_BOARD_ID; ! pack->xSensorHeader.packet_id = iNextPacketID; ! pack->xSensorHeader.node_id = TOS_LOCAL_ADDRESS; ! // pack->xSensorHeader.rsvd = 0; ! call Leds.yellowOn(); if (IsUART) { --- 277,287 ---- if (sending_packet) return; ! atomic { ! sending_packet = TRUE; ! pack->xSensorHeader.board_id = SENSOR_BOARD_ID; ! pack->xSensorHeader.packet_id = iNextPacketID; ! pack->xSensorHeader.node_id = TOS_LOCAL_ADDRESS; ! // pack->xSensorHeader.rsvd = 0; ! }; call Leds.yellowOn(); if (IsUART) { *************** *** 334,339 **** sending_packet = FALSE; WaitingForSend = FALSE; } - pack = (XDataMsg *)msg_ptr->data; // usart1 is also connected to external serial flash --- 337,342 ---- sending_packet = FALSE; WaitingForSend = FALSE; + pack = (XDataMsg *)msg_ptr->data; } // usart1 is also connected to external serial flash *************** *** 598,603 **** ****************************************************************************/ async event result_t ADCBATT.dataReady(uint16_t data) { ! pack->xData.data1.vref = data ; ! atomic state = BATT_DONE; return SUCCESS; } --- 601,608 ---- ****************************************************************************/ async event result_t ADCBATT.dataReady(uint16_t data) { ! atomic { ! pack->xData.data1.vref = data ; ! state = BATT_DONE; ! }; return SUCCESS; } *************** *** 617,627 **** ****************************************************************************/ async event result_t IntersemaPressure.dataReady(uint16_t data) { ! pack->xData.data1.pressure = data ; ! atomic atomic sensor_state = SENSOR_PRESSURE_GETTEMPDATA; return call IntersemaTemp.getData(); } async event result_t IntersemaTemp.dataReady(uint16_t data) { ! pack->xData.data1.intersematemp = data ; post stopPressureControl(); return SUCCESS; --- 622,634 ---- ****************************************************************************/ async event result_t IntersemaPressure.dataReady(uint16_t data) { ! atomic { ! pack->xData.data1.pressure = data ; ! sensor_state = SENSOR_PRESSURE_GETTEMPDATA; ! }; return call IntersemaTemp.getData(); } async event result_t IntersemaTemp.dataReady(uint16_t data) { ! atomic pack->xData.data1.intersematemp = data ; post stopPressureControl(); return SUCCESS; *************** *** 635,644 **** if (count == 4) { ! pack->xData.data1.cal_wrod1 = calibration[0]; ! pack->xData.data1.cal_wrod2 = calibration[1]; ! pack->xData.data1.cal_wrod3 = calibration[2]; ! pack->xData.data1.cal_wrod4 = calibration[3]; ! ! atomic sensor_state = SENSOR_PRESSURE_GETPRESSDATA; call IntersemaPressure.getData(); } --- 642,653 ---- if (count == 4) { ! atomic { ! pack->xData.data1.cal_wrod1 = calibration[0]; ! pack->xData.data1.cal_wrod2 = calibration[1]; ! pack->xData.data1.cal_wrod3 = calibration[2]; ! pack->xData.data1.cal_wrod4 = calibration[3]; ! ! sensor_state = SENSOR_PRESSURE_GETPRESSDATA; ! }; call IntersemaPressure.getData(); } *************** *** 674,678 **** *****************************************************************************/ async event result_t Temperature.dataReady(uint16_t data) { ! pack->xData.data1.temperature = data ; post stopTempHumControl(); return SUCCESS; --- 683,687 ---- *****************************************************************************/ async event result_t Temperature.dataReady(uint16_t data) { ! atomic pack->xData.data1.temperature = data ; post stopTempHumControl(); return SUCCESS; *************** *** 680,685 **** async event result_t Humidity.dataReady(uint16_t data) { ! pack->xData.data1.humidity = data ; ! atomic sensor_state = SENSOR_HUMIDITY_GETTEMPDATA; return call Temperature.getData(); } --- 689,696 ---- async event result_t Humidity.dataReady(uint16_t data) { ! atomic { ! pack->xData.data1.humidity = data ; ! sensor_state = SENSOR_HUMIDITY_GETTEMPDATA; ! }; return call Temperature.getData(); } *************** *** 723,728 **** *****************************************************************************/ async event result_t TaosCh1.dataReady(uint16_t data) { ! ! pack->xData.data1.taoch1 = data & 0x00ff; post stopTaosControl(); return SUCCESS; --- 734,738 ---- *****************************************************************************/ async event result_t TaosCh1.dataReady(uint16_t data) { ! atomic pack->xData.data1.taoch1 = data & 0x00ff; post stopTaosControl(); return SUCCESS; *************** *** 730,736 **** async event result_t TaosCh0.dataReady(uint16_t data) { ! ! pack->xData.data1.taoch0 = data & 0x00ff; ! atomic sensor_state = SENSOR_LIGHT_GETCH1DATA; return call TaosCh1.getData(); } --- 740,747 ---- async event result_t TaosCh0.dataReady(uint16_t data) { ! atomic { ! pack->xData.data1.taoch0 = data & 0x00ff; ! sensor_state = SENSOR_LIGHT_GETCH1DATA; ! }; return call TaosCh1.getData(); } *************** *** 766,772 **** *****************************************************************************/ async event result_t AccelY.dataReady(uint16_t data){ ! ! pack->xData.data1.accel_y = data & 0xff; ! pack->xSensorHeader.rsvd = data >> 8; post powerOffAccel(); return SUCCESS; --- 777,784 ---- *****************************************************************************/ async event result_t AccelY.dataReady(uint16_t data){ ! atomic { ! pack->xData.data1.accel_y = data & 0xff; ! pack->xSensorHeader.rsvd = data >> 8; ! }; post powerOffAccel(); return SUCCESS; *************** *** 776,781 **** /***************************************************/ async event result_t AccelX.dataReady(uint16_t data) { ! pack->xData.data1.accel_x = data; ! atomic sensor_state = SENSOR_ACCEL_GETYDATA; call AccelY.getData(); return SUCCESS; --- 788,795 ---- /***************************************************/ async event result_t AccelX.dataReady(uint16_t data) { ! atomic { ! pack->xData.data1.accel_x = data; ! sensor_state = SENSOR_ACCEL_GETYDATA; ! }; call AccelY.getData(); return SUCCESS; |