Merge branch 'master' of ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2

[yaffs2.git] / yaffs_getblockinfo.h

diff --git a/yaffs_getblockinfo.h b/yaffs_getblockinfo.h
index b9742ac0ab3c00b5e333e4ac6ec67b3950ad4ad5..1c43b6cdb5361307c74613c01e176230c51fe205 100644 (file)
--- a/yaffs_getblockinfo.h
+++ b/yaffs_getblockinfo.h
@@ -1,7 +1,7 @@
 /*
- * YAFFS: Yet another Flash File System . A NAND-flash specific file system. 
+ * YAFFS: Yet another Flash File System . A NAND-flash specific file system.
  *
- * Copyright (C) 2002-2007 Aleph One Ltd.
+ * Copyright (C) 2002-2010 Aleph One Ltd.
  *   for Toby Churchill Ltd and Brightstar Engineering
  *
  * Created by Charles Manning <charles@aleph1.co.uk>
@@ -17,18 +17,19 @@
 #define __YAFFS_GETBLOCKINFO_H__
 
 #include "yaffs_guts.h"
+#include "yaffs_trace.h"
 
 /* Function to manipulate block info */
-static Y_INLINE yaffs_BlockInfo *yaffs_GetBlockInfo(yaffs_Device * dev, int blk)
+static Y_INLINE yaffs_block_info_t *yaffs_get_block_info(yaffs_dev_t * dev, int blk)
 {
-       if (blk < dev->internalStartBlock || blk > dev->internalEndBlock) {
+       if (blk < dev->internal_start_block || blk > dev->internal_end_block) {
                T(YAFFS_TRACE_ERROR,
                  (TSTR
-                  ("**>> yaffs: getBlockInfo block %d is not valid" TENDSTR),
+                  ("**>> yaffs: get_block_info block %d is not valid" TENDSTR),
                   blk));
                YBUG();
        }
-       return &dev->blockInfo[blk - dev->internalStartBlock];
+       return &dev->block_info[blk - dev->internal_start_block];
 }
 
 #endif