[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/msp430/adc12 AdcP.nc, 1.7, 1.8 Msp430Adc12ImplP.nc, 1.11, 1.12 Msp430Adc12SingleChannel.nc, 1.5, 1.6
David Gay
idgay at users.sourceforge.net
Fri Jun 27 11:05:26 PDT 2008
Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/adc12
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv21552
Modified Files:
AdcP.nc Msp430Adc12ImplP.nc Msp430Adc12SingleChannel.nc
Log Message:
deputy-fixes
Index: AdcP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/adc12/AdcP.nc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** AdcP.nc 23 Jun 2008 20:25:15 -0000 1.7
--- AdcP.nc 27 Jun 2008 18:05:23 -0000 1.8
***************
*** 160,164 ****
async event uint16_t* SingleChannel.multipleDataReady[uint8_t client](
! uint16_t * COUNT_NOK(length) buf, uint16_t length)
{
// error !
--- 160,164 ----
async event uint16_t* SingleChannel.multipleDataReady[uint8_t client](
! uint16_t *buf, uint16_t numSamples)
{
// error !
Index: Msp430Adc12ImplP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/adc12/Msp430Adc12ImplP.nc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Msp430Adc12ImplP.nc 23 Jun 2008 20:25:15 -0000 1.11
--- Msp430Adc12ImplP.nc 27 Jun 2008 18:05:23 -0000 1.12
***************
*** 82,86 ****
uint16_t resultBufferLength; /* length of buffer */
uint16_t *COUNT_NOK(resultBufferLength) resultBufferStart;
- uint16_t *BND_NOK(resultBufferStart, resultBufferStart+resultBufferLength) resultBuffer; /* conversion results */
uint16_t resultBufferIndex; /* offset into buffer */
uint8_t numChannels; /* number of channels (multi-channel conversion) */
--- 82,85 ----
***************
*** 297,302 ****
state = MULTIPLE_DATA;
! resultBuffer = buf;
resultBufferLength = length;
resultBufferIndex = 0;
call HplAdc12.setCtl0(ctl0);
--- 296,302 ----
state = MULTIPLE_DATA;
! resultBufferStart = NULL;
resultBufferLength = length;
+ resultBufferStart = buf;
resultBufferIndex = 0;
call HplAdc12.setCtl0(ctl0);
***************
*** 353,358 ****
state = MULTIPLE_DATA_REPEAT;
! resultBuffer = buf;
resultBufferLength = length;
resultBufferIndex = 0;
--- 353,359 ----
state = MULTIPLE_DATA_REPEAT;
! resultBufferStart = NULL;
resultBufferLength = length;
+ resultBufferStart = buf;
resultBufferIndex = 0;
***************
*** 379,383 ****
atomic {
if (call ADCArbiterInfo.userId() == id){
! if (state & MULTIPLE_DATA_REPEAT && !resultBuffer)
return EINVAL;
if (state & ADC_BUSY)
--- 380,384 ----
atomic {
if (call ADCArbiterInfo.userId() == id){
! if (state & MULTIPLE_DATA_REPEAT && !resultBufferStart)
return EINVAL;
if (state & ADC_BUSY)
***************
*** 432,437 ****
state = MULTI_CHANNEL;
! resultBuffer = buf;
resultBufferLength = numSamples;
resultBufferIndex = 0;
numChannels = numMemctl+1;
--- 433,439 ----
state = MULTI_CHANNEL;
! resultBufferStart = NULL;
resultBufferLength = numSamples;
+ resultBufferStart = buf;
resultBufferIndex = 0;
numChannels = numMemctl+1;
***************
*** 462,466 ****
atomic {
if (call ADCArbiterInfo.userId() == id){
! if (!resultBuffer)
return EINVAL;
if (state & ADC_BUSY)
--- 464,468 ----
atomic {
if (call ADCArbiterInfo.userId() == id){
! if (!resultBufferStart)
return EINVAL;
if (state & ADC_BUSY)
***************
*** 523,526 ****
--- 525,530 ----
{
bool overflow = FALSE;
+ uint16_t *resultBuffer;
+
if (iv <= 4){ // check for overflow
if (iv == 2)
***************
*** 551,555 ****
{
uint16_t i = 0, k;
! resultBufferStart = resultBuffer;
do {
*resultBuffer++ = call HplAdc12.getMem(i);
--- 555,559 ----
{
uint16_t i = 0, k;
! resultBuffer = resultBufferStart;
do {
*resultBuffer++ = call HplAdc12.getMem(i);
***************
*** 569,573 ****
{
uint16_t i = 0, length, k;
! resultBufferStart = resultBuffer;
if (resultBufferLength - resultBufferIndex > 16)
length = 16;
--- 573,577 ----
{
uint16_t i = 0, length, k;
! resultBuffer = resultBufferStart + resultBufferIndex;
if (resultBufferLength - resultBufferIndex > 16)
length = 16;
***************
*** 598,610 ****
{
uint8_t i = 0;
! resultBufferStart = resultBuffer;
do {
*resultBuffer++ = call HplAdc12.getMem(i);
} while (++i < resultBufferLength);
! resultBuffer = signal SingleChannel.multipleDataReady[clientID](
resultBuffer-resultBufferLength,
overflow ? 0 : resultBufferLength);
! if (!resultBuffer)
stopConversion();
break;
--- 602,614 ----
{
uint8_t i = 0;
! resultBuffer = resultBufferStart;
do {
*resultBuffer++ = call HplAdc12.getMem(i);
} while (++i < resultBufferLength);
! resultBufferStart = signal SingleChannel.multipleDataReady[clientID](
resultBuffer-resultBufferLength,
overflow ? 0 : resultBufferLength);
! if (!resultBufferStart)
stopConversion();
break;
***************
*** 620,624 ****
default async event uint16_t* SingleChannel.multipleDataReady[uint8_t id](
! uint16_t *buf, uint16_t length)
{
return 0;
--- 624,628 ----
default async event uint16_t* SingleChannel.multipleDataReady[uint8_t id](
! uint16_t *buf, uint16_t numSamples)
{
return 0;
Index: Msp430Adc12SingleChannel.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/msp430/adc12/Msp430Adc12SingleChannel.nc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Msp430Adc12SingleChannel.nc 4 Jun 2008 05:31:15 -0000 1.5
--- Msp430Adc12SingleChannel.nc 27 Jun 2008 18:05:23 -0000 1.6
***************
*** 225,229 ****
* was configured with <code>configureMultiple()</code>.
*/
! async event uint16_t * ONE_NOK multipleDataReady(uint16_t *COUNT(numSamples) buffer, uint16_t numSamples);
}
--- 225,229 ----
* was configured with <code>configureMultiple()</code>.
*/
! async event uint16_t * COUNT_NOK(numSamples) multipleDataReady(uint16_t *COUNT(numSamples) buffer, uint16_t numSamples);
}
More information about the Tinyos-2-commits
mailing list