[Linux-ntfs-cvs] CVS: linux-ntfs/include bitmap.h,1.1,1.2 bootsect.h,1.1,1.2 disk_io.h,1.2,1.3

[Anton A. <an...@us...>]

Changes by: antona

Update of /cvsroot/linux-ntfs/linux-ntfs/include
In directory usw-pr-cvs1:/tmp/cvs-serv26977/include

Modified Files:
	bitmap.h bootsect.h disk_io.h 
Log Message:
More files added to ntfs lib. Fixed some consistency problems.


Index: bitmap.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/bitmap.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** bitmap.h	2001/01/24 15:01:18	1.1
--- bitmap.h	2001/01/25 22:25:43	1.2
***************
*** 39,47 ****
   * @bitmap:	field of bits
   * @bit:	bit to set
!  * @newvalue:	value to set bit to (0 or 1)
   *
!  * Set the bit @bit in the @bitmap to @newvalue. Ignore all errors.
   */
! extern inline void set_bit(__u8 *bitmap, __u64 bit, __u8 newvalue);
  
  /**
--- 39,48 ----
   * @bitmap:	field of bits
   * @bit:	bit to set
!  * @new_value:	value to set bit to (0 or 1)
   *
!  * Set the bit @bit in the @bitmap to @new_value. Ignore all errors.
   */
! extern inline void set_bit(__u8 *bitmap, const __u64 bit,
! 			   const __u8 new_value);
  
  /**
***************
*** 50,68 ****
   * @bit:	bit to get
   * 
!  * Get and return the value of the bit @bit in @bitmap (0 or 1). Return -1 on
!  * error.
   */
! extern inline char get_bit(__u8 *bitmap, __u64 bit);
  
  /**
!  * get_and_set_bit - get value of a bit in a field of bits and set it afterwards
   * @bitmap:	field of bits
   * @bit:	bit to get/set
!  * @newvalue:	value to set bit to (0 or 1)
   * 
!  * Return the value of the bit @bit and set it to @newvalue (0 or 1). Return -1
!  * on error.
   */
! extern inline char get_and_set_bit(__u8 *bitmap, __u64 bit, __u8 newvalue);
  
  #endif /* defined BITMAP_H */
--- 51,70 ----
   * @bit:	bit to get
   * 
!  * Get and return the value of the bit @bit in @bitmap (0 or 1).
!  * Return -1 on error.
   */
! extern inline char get_bit(const __u8 *bitmap, const __u64 bit);
  
  /**
!  * get_and_set_bit - get value of a bit in a field of bits and set it
   * @bitmap:	field of bits
   * @bit:	bit to get/set
!  * @new_value:	value to set bit to (0 or 1)
   * 
!  * Return the value of the bit @bit and set it to @new_value (0 or 1).
!  * Return -1 on error.
   */
! extern inline char get_and_set_bit(__u8 *bitmap, const __u64 bit,
! 				   const __u8 new_value);
  
  #endif /* defined BITMAP_H */

Index: bootsect.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/bootsect.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** bootsect.h	2001/01/24 20:37:36	1.1
--- bootsect.h	2001/01/25 22:25:43	1.2
***************
*** 25,38 ****
  
  
! /* The NTFS OEMid */
  #define magicNTFS	cpu_to_le64(0x202020205346544e) /* "NTFS    " */
  
  /*
   * Location of bootsector on partition:
!  * 	The standard PACKED_BOOT_SECTOR is on sector 0 of the partition.
   * 	On NT4 and above there is one backup copy of the boot sector to
   * 	be found on the last sector of the partition (not normally accessible
!  * 	from within Windows as the bootsector contained number of sectors value
!  * 	is one less than the actual value!).
   * 	On versions of NT 3.51 and earlier, the backup copy was located at 
   * 	number of sectors/2, i.e. in the middle of the volume.
--- 25,38 ----
  
  
! /* The NTFS oem_id */
  #define magicNTFS	cpu_to_le64(0x202020205346544e) /* "NTFS    " */
  
  /*
   * Location of bootsector on partition:
!  * 	The standard NTFS_BOOT_SECTOR is on sector 0 of the partition.
   * 	On NT4 and above there is one backup copy of the boot sector to
   * 	be found on the last sector of the partition (not normally accessible
!  * 	from within Windows as the bootsector contained number of sectors
!  *	value is one less than the actual value!).
   * 	On versions of NT 3.51 and earlier, the backup copy was located at 
   * 	number of sectors/2, i.e. in the middle of the volume.
***************
*** 88,97 ****
   * 
   * This function checks the boot sector in @b for describing a valid ntfs
!  * volume. Return 1 if @b is a NTFS boot sector or 0 otherwise. If silent is 0
!  * progress output will be output to stdout. If silent is 1 no output to stdout
!  * will occur. Errors/warnings to stderr will occur disregarding the value of
!  * silent.
   */
! int is_boot_sector_ntfs(PACKED_BOOT_SECTOR *b, int silent);
  
  #endif /* defined BOOTSECT_H */
--- 88,97 ----
   * 
   * This function checks the boot sector in @b for describing a valid ntfs
!  * volume. Return 1 if @b is a valid NTFS boot sector or 0 otherwise. If
!  * silent is 0, progress output will be output to stdout. If silent is 1 no
!  * output to stdout will occur. Errors/warnings to stderr will occur
!  * disregarding the value of silent.
   */
! int is_boot_sector_ntfs(const NTFS_BOOT_SECTOR *b, const int silent);
  
  #endif /* defined BOOTSECT_H */

Index: disk_io.h
===================================================================
RCS file: /cvsroot/linux-ntfs/linux-ntfs/include/disk_io.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** disk_io.h	2001/01/24 20:37:36	1.2
--- disk_io.h	2001/01/25 22:25:43	1.3
***************
*** 41,45 ****
   * either lseek, malloc, write or fdatasync.
   */
! ssize_t ntfs_pwrite(int fd, const void *b, size_t count, off_t pos);
  
  /**
--- 41,45 ----
   * either lseek, malloc, write or fdatasync.
   */
! __u64 ntfs_pwrite(int fd, const void *b, __u64 count, const __u64 pos);
  
  /**
***************
*** 57,61 ****
   * either lseek, malloc, write or fdatasync.
   */
! ssize_t mst_pwrite(int fd, const void *b, size_t count, off_t pos);
  
  /**
--- 57,61 ----
   * either lseek, malloc, write or fdatasync.
   */
! __u64 mst_pwrite(int fd, const void *b, __u64 count, const __u64 pos);
  
  /**