[Tinyos-2-commits] CVS: tinyos-2.x/tos/chips/at45db LogStorageP.nc, 1.1.2.13, 1.1.2.14

[David Gay]

Update of /cvsroot/tinyos/tinyos-2.x/tos/chips/at45db
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv11141

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	LogStorageP.nc 
Log Message:
fix boot on empty log in non-circular case


Index: LogStorageP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/chips/at45db/Attic/LogStorageP.nc,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -C2 -d -r1.1.2.13 -r1.1.2.14
*** LogStorageP.nc	2 Jun 2006 17:37:36 -0000	1.1.2.13
--- LogStorageP.nc	16 Jun 2006 17:32:59 -0000	1.1.2.14
***************
*** 442,446 ****
      if (metadata.flags & F_SYNC) /* must start on next page */
        {
! 	setWritePage(firstPage + 1);
  	s[client].wpos = metadata.pos + PAGE_SIZE;
        }
--- 442,452 ----
      if (metadata.flags & F_SYNC) /* must start on next page */
        {
! 	/* We need to special case the empty log, as we don't want
! 	   to wrap around in the case of a full, non-circular log
! 	   with a sync on its last page. */
! 	if (firstPage == lastPage && !metadata.pos)
! 	  setWritePage(firstVolumePage());
! 	else
! 	  setWritePage(firstPage + 1);
  	s[client].wpos = metadata.pos + PAGE_SIZE;
        }
***************
*** 545,549 ****
  
    void locateFirstReadDone() {
!     crcPage(firstPage);
    }
  
--- 551,555 ----
  
    void locateFirstReadDone() {
!     crcPage(lastPage);
    }