boot-132.tar.gz

[apple/boot.git] / i386 / libsaio / ufs_byteorder.h

diff --git a/i386/libsaio/ufs_byteorder.h b/i386/libsaio/ufs_byteorder.h
index ef0c37e494bf7628fd9ef882e70e9b16b111b1b1..f4861a2a8839c0d1bbd183f8b0b6a5ff77ee94e4 100644 (file)
--- a/i386/libsaio/ufs_byteorder.h
+++ b/i386/libsaio/ufs_byteorder.h
@@ -1,12 +1,12 @@
 /*
 /*

- * Copyright (c) 1999 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 1999-2003 Apple Computer, Inc. All rights reserved.

  *
  * @APPLE_LICENSE_HEADER_START@
  * 
  *
  * @APPLE_LICENSE_HEADER_START@
  * 

- * Portions Copyright (c) 1999 Apple Computer, Inc.  All Rights
+ * Portions Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights

  * Reserved.  This file contains Original Code and/or Modifications of
  * Original Code as defined in and that are subject to the Apple Public
  * Reserved.  This file contains Original Code and/or Modifications of
  * Original Code as defined in and that are subject to the Apple Public

- * Source License Version 1.1 (the "License").  You may not use this file
+ * Source License Version 2.0 (the "License").  You may not use this file

  * except in compliance with the License.  Please obtain a copy of the
  * License at http://www.apple.com/publicsource and read it before using
  * this file.
  * except in compliance with the License.  Please obtain a copy of the
  * License at http://www.apple.com/publicsource and read it before using
  * this file.


@@ -36,22 +36,19 @@
 #ifndef __LIBSAIO_UFS_BYTEORDER_H
 #define __LIBSAIO_UFS_BYTEORDER_H
 
 #ifndef __LIBSAIO_UFS_BYTEORDER_H
 #define __LIBSAIO_UFS_BYTEORDER_H
 

-#include <sys/disktab.h>

 #include <sys/vnode.h>
 #include <sys/buf.h>
 #include <sys/vnode.h>
 #include <sys/buf.h>

-#include <dev/disk.h>
+#include <sys/disk.h>

 #include <ufs/ufs/quota.h>
 #include <ufs/ufs/quota.h>

-#include <ufs/ufs/inode.h>
+#include <ufs/ufs/dinode.h>
+#include <ufs/ufs/dir.h>

 #include <ufs/ffs/fs.h>
 
 #include <ufs/ffs/fs.h>
 

-void byte_swap_ints(int *array, int count);
-void byte_swap_shorts(short *array, int count);
+void byte_swap_ints(unsigned int *array, int count);
+void byte_swap_shorts(unsigned short *array, int count);

 void byte_swap_longlongs(unsigned long long *array, int count);
 
 void byte_swap_superblock(struct fs *sb);
 void byte_swap_longlongs(unsigned long long *array, int count);
 
 void byte_swap_superblock(struct fs *sb);

-void byte_swap_disklabel_in(disk_label_t *dl);
-void byte_swap_disktab_in(struct disktab *dt);
-void byte_swap_partition(struct partition *part);

 void byte_swap_dinode_in(struct dinode *di);
 void byte_swap_dir_block_in(char *addr, int count);
 void byte_swap_inode_in(struct dinode *dc, struct dinode *ic);
 void byte_swap_dinode_in(struct dinode *di);
 void byte_swap_dir_block_in(char *addr, int count);
 void byte_swap_inode_in(struct dinode *dc, struct dinode *ic);