[frontierkernel-commits] Frontier/Common/source ops.c,1.5,1.6

[icreedon <icr...@us...>]

Update of /cvsroot/frontierkernel/Frontier/Common/source
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13263

Modified Files:
	ops.c 
Log Message:
changed bcdToLong to bcdtolong to follow style conventions already established for function names, re-implemented bcdtolong based on aradke comments

Index: ops.c
===================================================================
RCS file: /cvsroot/frontierkernel/Frontier/Common/source/ops.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ops.c	23 Nov 2004 12:32:17 -0000	1.5
--- ops.c	24 Nov 2004 18:22:17 -0000	1.6
***************
*** 863,867 ****
  		gestalt (gestaltSystemVersion, &x);
  		
! 		numbertostring (bcdToLong (x >> 8), bs); /* high byte is major rev., 2004-11-16 creedon - convert from bcd for correct display on Mac OS X */
  		
  		pushchar ('.', bs);
--- 863,867 ----
  		gestalt (gestaltSystemVersion, &x);
  		
! 		numbertostring (bcdtolong (x >> 8), bs); /* high byte is major rev., 2004-11-16 creedon - convert from bcd for correct display on Mac OS X */
  		
  		pushchar ('.', bs);
***************
*** 953,968 ****
  
  
! unsigned long bcdToLong (unsigned long bcd) { /* 2004-11-16 creedon */
  
  	unsigned long ret = 0;
! 	short i;
  
- 	for (i = 0; i < 8; i++) {
- 		if (i > 0)
- 			ret += i * 10 * (bcd & 0x0000000f);
- 		else
- 			ret += bcd & 0x0000000f;
  		bcd >>= 4;
! 		}
  	return (ret);
! 	} /* bcdToLong */
--- 953,974 ----
  
  
! unsigned long bcdtolong (unsigned long bcd) { /* 2004-11-23 creedon, aradke */ 
! 
! 	/*
! 	convert a long value from BCD notation
! 	*/
  
  	unsigned long ret = 0;
! 	unsigned long m = 1;
! 
! 	do {
! 		ret += m * (bcd & 0x0000000f);
! 
! 		m *= 10;
  
  		bcd >>= 4;
! 
! 		} while (bcd != 0);
! 
  	return (ret);
! 	} /* bcdtolong */
\ No newline at end of file