[Tinyos-contrib-commits] CVS: tinyos-1.x/contrib/harvard/spaulding/src/gui/sessions/readSD readSD.c, 1.4, 1.5

[Konrad Lorincz]

Update of /cvsroot/tinyos/tinyos-1.x/contrib/harvard/spaulding/src/gui/sessions/readSD
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv29791/src/gui/sessions/readSD

Modified Files:
	readSD.c 
Log Message:
Checked in EMG, and fixed display issue with gui

Index: readSD.c
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/contrib/harvard/spaulding/src/gui/sessions/readSD/readSD.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** readSD.c	5 Mar 2008 20:34:51 -0000	1.4
--- readSD.c	11 Mar 2008 20:30:52 -0000	1.5
***************
*** 23,27 ****
      uint32_t tail;
      uint32_t head;
! } __attribute__((__packed__)) FlashInfo;
  
  
--- 23,29 ----
      uint32_t tail;
      uint32_t head;
! } FlashInfo;
! 
! 
  
  
***************
*** 29,33 ****
      uint32_t sqnNbr;
      uint8_t data[BLOCK_DATA_SIZE];
! } __attribute__((__packed__)) Block;
  
  
--- 31,35 ----
      uint32_t sqnNbr;
      uint8_t data[BLOCK_DATA_SIZE];
! } Block;
  
  
***************
*** 44,48 ****
      channelID_t channelIDs[MCS_MAX_NBR_CHANNELS_SAMPLED];            
      sample_t    samples[SAMPLE_CHUNK_NUM_SAMPLES];
! } __attribute__((__packed__)) SampleChunk;         
  
  
--- 46,50 ----
      channelID_t channelIDs[MCS_MAX_NBR_CHANNELS_SAMPLED];            
      sample_t    samples[SAMPLE_CHUNK_NUM_SAMPLES];
! } SampleChunk;         
  
  
***************
*** 186,190 ****
  
  //char* SD_DEVICE_PATH = "/dev/sda"; // Spaulding device
! char* SD_DEVICE_PATH = "/dev/sdd";   // Konrad's device
  
  
--- 188,192 ----
  
  //char* SD_DEVICE_PATH = "/dev/sda"; // Spaulding device
! char* SD_DEVICE_PATH = "/dev/sdb";//"/dev/sdd";   // Konrad's device