projects
/
yaffs2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'driver-refactoring' into new-driver-refactoring
[yaffs2.git]
/
mtdemul
/
nandemul2k.c
diff --git
a/mtdemul/nandemul2k.c
b/mtdemul/nandemul2k.c
index a877cbe42fbfae62b1147f87f032f08a80434d53..d1028ffc7e122bd9f00e7f468dfd43f9a96417f8 100644
(file)
--- a/
mtdemul/nandemul2k.c
+++ b/
mtdemul/nandemul2k.c
@@
-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-20
07
Aleph One Ltd.
+ * Copyright (C) 2002-20
11
Aleph One Ltd.
* for Toby Churchill Ltd and Brightstar Engineering
*
* Created by Charles Manning <charles@aleph1.co.uk>
* for Toby Churchill Ltd and Brightstar Engineering
*
* Created by Charles Manning <charles@aleph1.co.uk>
@@
-66,7
+66,7
@@
static struct mtd_info nandemul2k_mtd;
typedef struct
{
typedef struct
{
-
__
u8 data[PAGE_TOTAL_SIZE]; // Data + spare
+ u8 data[PAGE_TOTAL_SIZE]; // Data + spare
int empty; // is this empty?
} nandemul_Page;
int empty; // is this empty?
} nandemul_Page;
@@
-114,8
+114,8
@@
static void nandemul2k_Program(const void *buffer, int page, int start, int n_by
{
int pg = page%PAGES_PER_BLOCK;
int blk = page/PAGES_PER_BLOCK;
{
int pg = page%PAGES_PER_BLOCK;
int blk = page/PAGES_PER_BLOCK;
-
__
u8 *p;
-
__u8 *b = (__
u8 *)buffer;
+ u8 *p;
+
u8 *b = (
u8 *)buffer;
p = &ned.block[blk]->page[pg]->data[start];
p = &ned.block[blk]->page[pg]->data[start];
@@
-255,7
+255,7
@@
int nandemul2k_GetNumberOfBlocks(void) {return nandemul2k_CalcNBlocks();}
-static int nandemul2k_ReadId(
__u8 *vendorId, __
u8 *deviceId)
+static int nandemul2k_ReadId(
u8 *vendorId,
u8 *deviceId)
{
*vendorId = 'Y';
*deviceId = '2';
{
*vendorId = 'Y';
*deviceId = '2';
@@
-264,7
+264,7
@@
static int nandemul2k_ReadId(__u8 *vendorId, __u8 *deviceId)
}
}
-static int nandemul2k_ReadStatus(
__
u8 *status)
+static int nandemul2k_ReadStatus(u8 *status)
{
*status = 0;
return 1;
{
*status = 0;
return 1;