···2929 * @param version version read from the bbt page during scan3030 * @param len length of the pattern, if 0 no pattern check is performed3131 * @param maxblocks maximum number of blocks to search for a bbt. This number of3232- * blocks is reserved at the end of the device 3232+ * blocks is reserved at the end of the device3333 * where the tables are written.3434 * @param reserved_block_code if non-0, this pattern denotes a reserved3535 * (rather than bad) block in the stored bbt
···1122-/* Common Flash Interface structures 22+/* Common Flash Interface structures33 * See http://support.intel.com/design/flash/technote/index.htm44- * $Id: cfi.h,v 1.55 2005/08/06 04:40:42 nico Exp $44+ * $Id: cfi.h,v 1.56 2005/11/07 11:14:54 gleixner Exp $55 */6677#ifndef __MTD_CFI_H__···8282}838384848585-/* NB: these values must represents the number of bytes needed to meet the 8686- * device type (x8, x16, x32). Eg. a 32 bit device is 4 x 8 bytes. 8585+/* NB: these values must represents the number of bytes needed to meet the8686+ * device type (x8, x16, x32). Eg. a 32 bit device is 4 x 8 bytes.8787 * These numbers are used in calculations.8888 */8989#define CFI_DEVICETYPE_X8 (8 / 8)···259259/*260260 * Transforms the CFI command for the given geometry (bus width & interleave).261261 * It looks too long to be inline, but in the common case it should almost all262262- * get optimised away. 262262+ * get optimised away.263263 */264264static inline map_word cfi_build_cmd(u_long cmd, struct map_info *map, struct cfi_private *cfi)265265{···268268 unsigned long onecmd;269269 int i;270270271271- /* We do it this way to give the compiler a fighting chance 271271+ /* We do it this way to give the compiler a fighting chance272272 of optimising away all the crap for 'bankwidth' larger than273273 an unsigned long, in the common case where that support is274274 disabled */···279279 wordwidth = map_bankwidth(map);280280 words_per_bus = 1;281281 }282282-282282+283283 chip_mode = map_bankwidth(map) / cfi_interleave(cfi);284284 chips_per_word = wordwidth * cfi_interleave(cfi) / map_bankwidth(map);285285···298298 break;299299 }300300301301- /* Now replicate it across the size of an unsigned long, or 301301+ /* Now replicate it across the size of an unsigned long, or302302 just to the bus width as appropriate */303303 switch (chips_per_word) {304304 default: BUG();···314314 ;315315 }316316317317- /* And finally, for the multi-word case, replicate it 317317+ /* And finally, for the multi-word case, replicate it318318 in all words in the structure */319319 for (i=0; i < words_per_bus; i++) {320320 val.x[i] = onecmd;···325325#define CMD(x) cfi_build_cmd((x), map, cfi)326326327327328328-static inline unsigned long cfi_merge_status(map_word val, struct map_info *map, 328328+static inline unsigned long cfi_merge_status(map_word val, struct map_info *map,329329 struct cfi_private *cfi)330330{331331 int wordwidth, words_per_bus, chip_mode, chips_per_word;332332 unsigned long onestat, res = 0;333333 int i;334334335335- /* We do it this way to give the compiler a fighting chance 335335+ /* We do it this way to give the compiler a fighting chance336336 of optimising away all the crap for 'bankwidth' larger than337337 an unsigned long, in the common case where that support is338338 disabled */···343343 wordwidth = map_bankwidth(map);344344 words_per_bus = 1;345345 }346346-346346+347347 chip_mode = map_bankwidth(map) / cfi_interleave(cfi);348348 chips_per_word = wordwidth * cfi_interleave(cfi) / map_bankwidth(map);349349
+9-9
include/linux/mtd/doc2000.h
···11-/* 11+/*22 * Linux driver for Disk-On-Chip devices33 *44- * Copyright (C) 1999 Machine Vision Holdings, Inc. 44+ * Copyright (C) 1999 Machine Vision Holdings, Inc.55 * Copyright (C) 2001-2003 David Woodhouse <dwmw2@infradead.org>66 * Copyright (C) 2002-2003 Greg Ungerer <gerg@snapgear.com>77 * Copyright (C) 2002-2003 SnapGear Inc88 *99- * $Id: doc2000.h,v 1.24 2005/01/05 12:40:38 dwmw2 Exp $ 99+ * $Id: doc2000.h,v 1.25 2005/11/07 11:14:54 gleixner Exp $1010 *1111 * Released under GPL1212 */···7575#define DoC_Mplus_CtrlConfirm 0x10767676#define DoC_Mplus_Power 0x1fff77777878-/* How to access the device? 7979- * On ARM, it'll be mmap'd directly with 32-bit wide accesses. 7878+/* How to access the device?7979+ * On ARM, it'll be mmap'd directly with 32-bit wide accesses.8080 * On PPC, it's mmap'd and 16-bit wide.8181- * Others use readb/writeb 8181+ * Others use readb/writeb8282 */8383#if defined(__arm__)8484#define ReadDOC_(adr, reg) ((unsigned char)(*(volatile __u32 *)(((unsigned long)adr)+((reg)<<2))))···172172 unsigned long totlen;173173 unsigned char ChipID; /* Type of DiskOnChip */174174 int ioreg;175175-175175+176176 unsigned long mfr; /* Flash IDs - only one type of flash per device */177177 unsigned long id;178178 int chipshift;···180180 char pageadrlen;181181 char interleave; /* Internal interleaving - Millennium Plus style */182182 unsigned long erasesize;183183-183183+184184 int curfloor;185185 int curchip;186186-186186+187187 int numchips;188188 struct Nand *chips;189189 struct mtd_info *nextdoc;
+7-7
include/linux/mtd/flashchip.h
···1122-/* 22+/*33 * struct flchip definition44- * 55- * Contains information about the location and state of a given flash device 44+ *55+ * Contains information about the location and state of a given flash device66 *77 * (C) 2000 Red Hat. GPLd.88 *99- * $Id: flashchip.h,v 1.17 2005/03/14 18:27:15 bjd Exp $99+ * $Id: flashchip.h,v 1.18 2005/11/07 11:14:54 gleixner Exp $1010 *1111 */1212···15151616/* For spinlocks. sched.h includes spinlock.h from whichever directory it1717 * happens to be in - so we don't have to care whether we're on 2.2, which1818- * has asm/spinlock.h, or 2.4, which has linux/spinlock.h 1818+ * has asm/spinlock.h, or 2.4, which has linux/spinlock.h1919 */2020#include <linux/sched.h>21212222-typedef enum { 2222+typedef enum {2323 FL_READY,2424 FL_STATUS,2525 FL_CFI_QUERY,···4545464647474848-/* NOTE: confusingly, this can be used to refer to more than one chip at a time, 4848+/* NOTE: confusingly, this can be used to refer to more than one chip at a time,4949 if they're interleaved. This can even refer to individual partitions on5050 the same physical chip when present. */5151
+3-3
include/linux/mtd/ftl.h
···11/*22- * $Id: ftl.h,v 1.6 2003/01/24 13:20:04 dwmw2 Exp $33- * 22+ * $Id: ftl.h,v 1.7 2005/11/07 11:14:54 gleixner Exp $33+ *44 * Derived from (and probably identical to):55 * ftl.h 1.7 1999/10/25 20:23:1766 *···1212 * Software distributed under the License is distributed on an "AS IS"1313 * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See1414 * the License for the specific language governing rights and1515- * limitations under the License. 1515+ * limitations under the License.1616 *1717 * The initial developer of the original code is David A. Hinds1818 * <dahinds@users.sourceforge.net>. Portions created by David A. Hinds
···1122/* JEDEC Flash Interface.33- * This is an older type of interface for self programming flash. It is 33+ * This is an older type of interface for self programming flash. It is44 * commonly use in older AMD chips and is obsolete compared with CFI.55 * It is called JEDEC because the JEDEC association distributes the ID codes66 * for the chips.77 *88 * See the AMD flash databook for information on how to operate the interface.99 *1010- * $Id: jedec.h,v 1.3 2003/05/21 11:51:01 dwmw2 Exp $1010+ * $Id: jedec.h,v 1.4 2005/11/07 11:14:54 gleixner Exp $1111 */12121313#ifndef __LINUX_MTD_JEDEC_H__···3333 __u16 jedec;3434 unsigned long size;3535 unsigned long sectorsize;3636-3636+3737 // *(__u8*)(base + (adder << addrshift)) = data << datashift3838 // Address size = size << addrshift3939 unsigned long base; // Byte 0 of the flash, will be unaligned4040 unsigned int datashift; // Useful for 32bit/16bit accesses4141 unsigned int addrshift;4242 unsigned long offset; // linerized start. base==offset for unbanked, uninterleaved flash4343-4343+4444 __u32 capabilities;4545-4545+4646 // These markers are filled in by the flash_chip_scan function4747 unsigned long start;4848 unsigned long length;···5151struct jedec_private5252{5353 unsigned long size; // Total size of all the devices5454-5454+5555 /* Bank handling. If sum(bank_fill) == size then this is linear flash.5656 Otherwise the mapping has holes in it. bank_fill may be used to5757- find the holes, but in the common symetric case 5858- bank_fill[0] == bank_fill[*], thus addresses may be computed 5757+ find the holes, but in the common symetric case5858+ bank_fill[0] == bank_fill[*], thus addresses may be computed5959 mathmatically. bank_fill must be powers of two */6060 unsigned is_banked;6161 unsigned long bank_fill[MAX_JEDEC_CHIPS];6262-6363- struct jedec_flash_chip chips[MAX_JEDEC_CHIPS]; 6262+6363+ struct jedec_flash_chip chips[MAX_JEDEC_CHIPS];6464};65656666#endif
+7-7
include/linux/mtd/map.h
···1122/* Overhauled routines for dealing with different mmap regions of flash */33-/* $Id: map.h,v 1.52 2005/05/25 10:29:41 gleixner Exp $ */33+/* $Id: map.h,v 1.54 2005/11/07 11:14:54 gleixner Exp $ */4455#ifndef __LINUX_MTD_MAP_H__66#define __LINUX_MTD_MAP_H__···170170 to a chip probe routine -- either JEDEC or CFI probe or both -- via171171 do_map_probe(). If a chip is recognised, the probe code will invoke the172172 appropriate chip driver (if present) and return a struct mtd_info.173173- At which point, you fill in the mtd->module with your own module 173173+ At which point, you fill in the mtd->module with your own module174174 address, and register it with the MTD core code. Or you could partition175175 it and register the partitions instead, or keep it for your own private176176 use; whatever.177177-177177+178178 The mtd->priv field will point to the struct map_info, and any further179179- private data required by the chip driver is linked from the 180180- mtd->priv->fldrv_priv field. This allows the map driver to get at 179179+ private data required by the chip driver is linked from the180180+ mtd->priv->fldrv_priv field. This allows the map driver to get at181181 the destructor function map->fldrv_destroy() when it's tired182182 of living.183183*/···214214 If there is no cache to care about this can be set to NULL. */215215 void (*inval_cache)(struct map_info *, unsigned long, ssize_t);216216217217- /* set_vpp() must handle being reentered -- enable, enable, disable 217217+ /* set_vpp() must handle being reentered -- enable, enable, disable218218 must leave it enabled. */219219 void (*set_vpp)(struct map_info *, int);220220···353353{354354 map_word r;355355 int i;356356-356356+357357 if (map_bankwidth(map) < MAP_FF_LIMIT) {358358 int bw = 8 * map_bankwidth(map);359359 r.x[0] = (1 << bw) - 1;
+12-12
include/linux/mtd/mtd.h
···11-/* 22- * $Id: mtd.h,v 1.60 2005/08/06 04:40:42 nico Exp $11+/*22+ * $Id: mtd.h,v 1.61 2005/11/07 11:14:54 gleixner Exp $33 *44 * Copyright (C) 1999-2003 David Woodhouse <dwmw2@infradead.org> et al.55 *···90909191 // oobinfo is a nand_oobinfo structure, which can be set by iotcl (MEMSETOOBINFO)9292 struct nand_oobinfo oobinfo;9393- u_int32_t oobavail; // Number of bytes in OOB area available for fs 9393+ u_int32_t oobavail; // Number of bytes in OOB area available for fs94949595 /* Data for variable erase regions. If numeraseregions is zero,9696- * it means that the whole device has erasesize as given above. 9696+ * it means that the whole device has erasesize as given above.9797 */9898 int numeraseregions;9999- struct mtd_erase_region_info *eraseregions; 9999+ struct mtd_erase_region_info *eraseregions;100100101101 /* This really shouldn't be here. It can go away in 2.5 */102102 u_int32_t bank_size;···119119 int (*read_oob) (struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf);120120 int (*write_oob) (struct mtd_info *mtd, loff_t to, size_t len, size_t *retlen, const u_char *buf);121121122122- /* 123123- * Methods to access the protection register area, present in some 122122+ /*123123+ * Methods to access the protection register area, present in some124124 * flash devices. The user data is one time programmable but the125125- * factory data is read only. 125125+ * factory data is read only.126126 */127127 int (*get_fact_prot_info) (struct mtd_info *mtd, struct otp_info *buf, size_t len);128128 int (*read_fact_prot_reg) (struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char *buf);···133133134134 /* kvec-based read/write methods. We need these especially for NAND flash,135135 with its limited number of write cycles per erase.136136- NB: The 'count' parameter is the number of _vectors_, each of 136136+ NB: The 'count' parameter is the number of _vectors_, each of137137 which contains an (ofs, len) tuple.138138 */139139 int (*readv) (struct mtd_info *mtd, struct kvec *vecs, unsigned long count, loff_t from, size_t *retlen);140140- int (*readv_ecc) (struct mtd_info *mtd, struct kvec *vecs, unsigned long count, loff_t from, 140140+ int (*readv_ecc) (struct mtd_info *mtd, struct kvec *vecs, unsigned long count, loff_t from,141141 size_t *retlen, u_char *eccbuf, struct nand_oobinfo *oobsel);142142 int (*writev) (struct mtd_info *mtd, const struct kvec *vecs, unsigned long count, loff_t to, size_t *retlen);143143- int (*writev_ecc) (struct mtd_info *mtd, const struct kvec *vecs, unsigned long count, loff_t to, 143143+ int (*writev_ecc) (struct mtd_info *mtd, const struct kvec *vecs, unsigned long count, loff_t to,144144 size_t *retlen, u_char *eccbuf, struct nand_oobinfo *oobsel);145145146146 /* Sync */···204204#define MTD_WRITEECC(mtd, args...) (*(mtd->write_ecc))(mtd, args)205205#define MTD_READOOB(mtd, args...) (*(mtd->read_oob))(mtd, args)206206#define MTD_WRITEOOB(mtd, args...) (*(mtd->write_oob))(mtd, args)207207-#define MTD_SYNC(mtd) do { if (mtd->sync) (*(mtd->sync))(mtd); } while (0) 207207+#define MTD_SYNC(mtd) do { if (mtd->sync) (*(mtd->sync))(mtd); } while (0)208208209209210210#ifdef CONFIG_MTD_PARTITIONS
+27-27
include/linux/mtd/nand.h
···2424 * bat later if I did something naughty.2525 * 10-11-2000 SJH Added private NAND flash structure for driver2626 * 10-24-2000 SJH Added prototype for 'nand_scan' function2727- * 10-29-2001 TG changed nand_chip structure to support 2727+ * 10-29-2001 TG changed nand_chip structure to support2828 * hardwarespecific function for accessing control lines2929 * 02-21-2002 TG added support for different read/write adress and3030 * ready/busy line access function···3636 * CONFIG_MTD_NAND_ECC_JFFS2 is not set3737 * 08-10-2002 TG extensions to nand_chip structure to support HW-ECC3838 *3939- * 08-29-2002 tglx nand_chip structure: data_poi for selecting 3939+ * 08-29-2002 tglx nand_chip structure: data_poi for selecting4040 * internal / fs-driver buffer4141 * support for 6byte/512byte hardware ECC4242 * read_ecc, write_ecc extended for different oob-layout4343 * oob layout selections: NAND_NONE_OOB, NAND_JFFS2_OOB,4444 * NAND_YAFFS_OOB4545 * 11-25-2002 tglx Added Manufacturer code FUJITSU, NATIONAL4646- * Split manufacturer and device ID structures 4646+ * Split manufacturer and device ID structures4747 *4848 * 02-08-2004 tglx added option field to nand structure for chip anomalities4949 * 05-25-2004 tglx added bad block table support, ST-MICRO manufacturer id5050 * update of nand_chip structure description5151- * 01-17-2005 dmarlin added extended commands for AG-AND device and added option 5151+ * 01-17-2005 dmarlin added extended commands for AG-AND device and added option5252 * for BBT_AUTO_REFRESH.5353- * 01-20-2005 dmarlin added optional pointer to hardware specific callback for 5353+ * 01-20-2005 dmarlin added optional pointer to hardware specific callback for5454 * extra error status checks.5555 */5656#ifndef __LINUX_MTD_NAND_H···120120#define NAND_CMD_CACHEDPROG 0x15121121122122/* Extended commands for AG-AND device */123123-/* 124124- * Note: the command for NAND_CMD_DEPLETE1 is really 0x00 but 123123+/*124124+ * Note: the command for NAND_CMD_DEPLETE1 is really 0x00 but125125 * there is no way to distinguish that from NAND_CMD_READ0126126 * until the remaining sequence of commands has been completed127127 * so add a high order bit and mask it off in the command.···145145#define NAND_STATUS_READY 0x40146146#define NAND_STATUS_WP 0x80147147148148-/* 148148+/*149149 * Constants for ECC_MODES150150 */151151···191191#define NAND_CACHEPRG 0x00000008192192/* Chip has copy back function */193193#define NAND_COPYBACK 0x00000010194194-/* AND Chip which has 4 banks and a confusing page / block 194194+/* AND Chip which has 4 banks and a confusing page / block195195 * assignment. See Renesas datasheet for further information */196196#define NAND_IS_AND 0x00000020197197/* Chip has a array of 4 pages which can be read without198198 * additional ready /busy waits */199199-#define NAND_4PAGE_ARRAY 0x00000040 199199+#define NAND_4PAGE_ARRAY 0x00000040200200/* Chip requires that BBT is periodically rewritten to prevent201201 * bits from adjacent blocks from 'leaking' in altering data.202202 * This happens with the Renesas AG-AND chips, possibly others. */···219219/* Use a flash based bad block table. This option is passed to the220220 * default bad block table function. */221221#define NAND_USE_FLASH_BBT 0x00010000222222-/* The hw ecc generator provides a syndrome instead a ecc value on read 223223- * This can only work if we have the ecc bytes directly behind the 222222+/* The hw ecc generator provides a syndrome instead a ecc value on read223223+ * This can only work if we have the ecc bytes directly behind the224224 * data bytes. Applies for DOC and AG-AND Renesas HW Reed Solomon generators */225225#define NAND_HWECC_SYNDROME 0x00020000226226/* This option skips the bbt scan during initialization. */···252252253253/**254254 * struct nand_hw_control - Control structure for hardware controller (e.g ECC generator) shared among independend devices255255- * @lock: protection lock 255255+ * @lock: protection lock256256 * @active: the mtd device which holds the controller currently257257 * @wq: wait queue to sleep on if a NAND operation is in progress258258 * used instead of the per chip wait queue when a hw controller is available···265265266266/**267267 * struct nand_chip - NAND Private Flash Chip Data268268- * @IO_ADDR_R: [BOARDSPECIFIC] address to read the 8 I/O lines of the flash device 269269- * @IO_ADDR_W: [BOARDSPECIFIC] address to write the 8 I/O lines of the flash device 268268+ * @IO_ADDR_R: [BOARDSPECIFIC] address to read the 8 I/O lines of the flash device269269+ * @IO_ADDR_W: [BOARDSPECIFIC] address to write the 8 I/O lines of the flash device270270 * @read_byte: [REPLACEABLE] read one byte from the chip271271 * @write_byte: [REPLACEABLE] write one byte to the chip272272 * @read_word: [REPLACEABLE] read one word from the chip···289289 * be provided if a hardware ECC is available290290 * @erase_cmd: [INTERN] erase command write function, selectable due to AND support291291 * @scan_bbt: [REPLACEABLE] function to scan bad block table292292- * @eccmode: [BOARDSPECIFIC] mode of ecc, see defines 292292+ * @eccmode: [BOARDSPECIFIC] mode of ecc, see defines293293 * @eccsize: [INTERN] databytes used per ecc-calculation294294 * @eccbytes: [INTERN] number of ecc bytes per ecc-calculation step295295 * @eccsteps: [INTERN] number of ecc calculation steps per page···301301 * @phys_erase_shift: [INTERN] number of address bits in a physical eraseblock302302 * @bbt_erase_shift: [INTERN] number of address bits in a bbt entry303303 * @chip_shift: [INTERN] number of address bits in one chip304304- * @data_buf: [INTERN] internal buffer for one page + oob 304304+ * @data_buf: [INTERN] internal buffer for one page + oob305305 * @oob_buf: [INTERN] oob buffer for one eraseblock306306 * @oobdirty: [INTERN] indicates that oob_buf must be reinitialized307307 * @data_poi: [INTERN] pointer to a data buffer···316316 * @bbt: [INTERN] bad block table pointer317317 * @bbt_td: [REPLACEABLE] bad block table descriptor for flash lookup318318 * @bbt_md: [REPLACEABLE] bad block table mirror descriptor319319- * @badblock_pattern: [REPLACEABLE] bad block scan pattern used for initial bad block scan 319319+ * @badblock_pattern: [REPLACEABLE] bad block scan pattern used for initial bad block scan320320 * @controller: [OPTIONAL] a pointer to a hardware controller structure which is shared among multiple independend devices321321 * @priv: [OPTIONAL] pointer to private chip date322322- * @errstat: [OPTIONAL] hardware specific function to perform additional error status checks 322322+ * @errstat: [OPTIONAL] hardware specific function to perform additional error status checks323323 * (determine if errors are correctable)324324 */325325-325325+326326struct nand_chip {327327 void __iomem *IO_ADDR_R;328328 void __iomem *IO_ADDR_W;329329-329329+330330 u_char (*read_byte)(struct mtd_info *mtd);331331 void (*write_byte)(struct mtd_info *mtd, u_char byte);332332 u16 (*read_word)(struct mtd_info *mtd);333333 void (*write_word)(struct mtd_info *mtd, u16 word);334334-334334+335335 void (*write_buf)(struct mtd_info *mtd, const u_char *buf, int len);336336 void (*read_buf)(struct mtd_info *mtd, u_char *buf, int len);337337 int (*verify_buf)(struct mtd_info *mtd, const u_char *buf, int len);···396396 * @name: Identify the device type397397 * @id: device ID code398398 * @pagesize: Pagesize in bytes. Either 256 or 512 or 0399399- * If the pagesize is 0, then the real pagesize 399399+ * If the pagesize is 0, then the real pagesize400400 * and the eraseize are determined from the401401 * extended id bytes in the chip402402 * @erasesize: Size of an erase block in the flash device.···425425extern struct nand_flash_dev nand_flash_ids[];426426extern struct nand_manufacturers nand_manuf_ids[];427427428428-/** 428428+/**429429 * struct nand_bbt_descr - bad block table descriptor430430 * @options: options for this descriptor431431 * @pages: the page(s) where we find the bbt, used with option BBT_ABSPAGE···436436 * @version: version read from the bbt page during scan437437 * @len: length of the pattern, if 0 no pattern check is performed438438 * @maxblocks: maximum number of blocks to search for a bbt. This number of439439- * blocks is reserved at the end of the device where the tables are 439439+ * blocks is reserved at the end of the device where the tables are440440 * written.441441 * @reserved_block_code: if non-0, this pattern denotes a reserved (rather than442442 * bad) block in the stored bbt443443- * @pattern: pattern to identify bad block table or factory marked good / 443443+ * @pattern: pattern to identify bad block table or factory marked good /444444 * bad blocks, can be NULL, if len = 0445445 *446446- * Descriptor for the bad block table marker and the descriptor for the 446446+ * Descriptor for the bad block table marker and the descriptor for the447447 * pattern which identifies good and bad blocks. The assumption is made448448 * that the pattern and the version count are always located in the oob area449449 * of the first block.
+1-1
include/linux/mtd/onenand.h
···7777 * @param wq [INTERN] wait queue to sleep on if a OneNAND operation is in progress7878 * @param state [INTERN] the current state of the OneNAND device7979 * @param autooob [REPLACEABLE] the default (auto)placement scheme8080- * @param bbm [REPLACEABLE] pointer to Bad Block Management 8080+ * @param bbm [REPLACEABLE] pointer to Bad Block Management8181 * @param priv [OPTIONAL] pointer to private chip date8282 */8383struct onenand_chip {
+10-10
include/linux/mtd/partitions.h
···55 *66 * This code is GPL77 *88- * $Id: partitions.h,v 1.16 2004/11/16 18:34:40 dwmw2 Exp $88+ * $Id: partitions.h,v 1.17 2005/11/07 11:14:55 gleixner Exp $99 */10101111#ifndef MTD_PARTITIONS_H···16161717/*1818 * Partition definition structure:1919- * 1919+ *2020 * An array of struct partition is passed along with a MTD object to2121 * add_mtd_partitions() to create them.2222 *2323 * For each partition, these fields are available:2424 * name: string that will be used to label the partition's MTD device.2525- * size: the partition size; if defined as MTDPART_SIZ_FULL, the partition 2525+ * size: the partition size; if defined as MTDPART_SIZ_FULL, the partition2626 * will extend to the end of the master MTD device.2727- * offset: absolute starting position within the master MTD device; if 2828- * defined as MTDPART_OFS_APPEND, the partition will start where the 2727+ * offset: absolute starting position within the master MTD device; if2828+ * defined as MTDPART_OFS_APPEND, the partition will start where the2929 * previous one ended; if MTDPART_OFS_NXTBLK, at the next erase block.3030- * mask_flags: contains flags that have to be masked (removed) from the 3030+ * mask_flags: contains flags that have to be masked (removed) from the3131 * master MTD flag set for the corresponding MTD partition.3232- * For example, to force a read-only partition, simply adding 3232+ * For example, to force a read-only partition, simply adding3333 * MTD_WRITEABLE to the mask_flags will do the trick.3434 *3535- * Note: writeable partitions require their size and offset be 3535+ * Note: writeable partitions require their size and offset be3636 * erasesize aligned (e.g. use MTDPART_OFS_NEXTBLK).3737- */ 3737+ */38383939struct mtd_partition {4040 char *name; /* identifier string */···66666767extern int register_mtd_parser(struct mtd_part_parser *parser);6868extern int deregister_mtd_parser(struct mtd_part_parser *parser);6969-extern int parse_mtd_partitions(struct mtd_info *master, const char **types, 6969+extern int parse_mtd_partitions(struct mtd_info *master, const char **types,7070 struct mtd_partition **pparts, unsigned long origin);71717272#define put_partition_parser(p) do { module_put((p)->owner); } while(0)
+6-6
include/linux/mtd/physmap.h
···11/*22- * For boards with physically mapped flash and using 22+ * For boards with physically mapped flash and using33 * drivers/mtd/maps/physmap.c mapping driver.44 *55- * $Id: physmap.h,v 1.3 2004/07/21 00:16:15 jwboyer Exp $55+ * $Id: physmap.h,v 1.4 2005/11/07 11:14:55 gleixner Exp $66 *77 * Copyright (C) 2003 MontaVista Software Inc.88 * Author: Jun Sun, jsun@mvista.com or jsun@junsun.net···18181919#include <linux/config.h>20202121-#if defined(CONFIG_MTD_PHYSMAP) 2121+#if defined(CONFIG_MTD_PHYSMAP)22222323#include <linux/mtd/mtd.h>2424#include <linux/mtd/map.h>···4444#if defined(CONFIG_MTD_PARTITIONS)45454646/*4747- * Machines that wish to do flash partition may want to call this function in 4848- * their setup routine. 4747+ * Machines that wish to do flash partition may want to call this function in4848+ * their setup routine.4949 *5050 * physmap_set_partitions(mypartitions, num_parts);5151 *5252- * Note that one can always override this hard-coded partition with 5252+ * Note that one can always override this hard-coded partition with5353 * command line partition (you need to enable CONFIG_MTD_CMDLINE_PARTS).5454 */5555void physmap_set_partitions(struct mtd_partition *parts, int num_parts);
+6-6
include/linux/mtd/pmc551.h
···11/*22- * $Id: pmc551.h,v 1.5 2003/01/24 16:49:53 dwmw2 Exp $22+ * $Id: pmc551.h,v 1.6 2005/11/07 11:14:55 gleixner Exp $33 *44 * PMC551 PCI Mezzanine Ram Device55 *···77 * Mark Ferrell88 * Copyright 1999,2000 Nortel Networks99 *1010- * License: 1010+ * License:1111 * As part of this driver was derrived from the slram.c driver it falls1212 * under the same license, which is GNU General Public License v21313 */···17171818#include <linux/mtd/mtd.h>19192020-#define PMC551_VERSION "$Id: pmc551.h,v 1.5 2003/01/24 16:49:53 dwmw2 Exp $\n"\2020+#define PMC551_VERSION "$Id: pmc551.h,v 1.6 2005/11/07 11:14:55 gleixner Exp $\n"\2121 "Ramix PMC551 PCI Mezzanine Ram Driver. (C) 1999,2000 Nortel Networks.\n"22222323/*···3030 u32 curr_map0;3131 u32 asize;3232 struct mtd_info *nextpmc551;3333-}; 3333+};34343535/*3636 * Function Prototypes···3939static void pmc551_unpoint(struct mtd_info *, u_char *, loff_t, size_t);4040static int pmc551_point (struct mtd_info *mtd, loff_t from, size_t len, size_t *retlen, u_char **mtdbuf);4141static int pmc551_read(struct mtd_info *, loff_t, size_t, size_t *, u_char *);4242-static int pmc551_write(struct mtd_info *, loff_t, size_t, size_t *, const u_char *); 4242+static int pmc551_write(struct mtd_info *, loff_t, size_t, size_t *, const u_char *);434344444545/*···5050#endif51515252#ifndef PCI_DEVICE_ID_V3_SEMI_V370PDC5353-#define PCI_DEVICE_ID_V3_SEMI_V370PDC 0x0200 5353+#define PCI_DEVICE_ID_V3_SEMI_V370PDC 0x02005454#endif55555656
+3-3
include/linux/mtd/xip.h
···1212 * it under the terms of the GNU General Public License version 2 as1313 * published by the Free Software Foundation.1414 *1515- * $Id: xip.h,v 1.4 2005/10/17 21:03:16 nico Exp $1515+ * $Id: xip.h,v 1.5 2005/11/07 11:14:55 gleixner Exp $1616 */17171818#ifndef __LINUX_MTD_XIP_H__···6060 * overflowing.6161 *6262 * xip_iprefetch()6363- * 6363+ *6464 * Macro to fill instruction prefetch6565- * e.g. a series of nops: asm volatile (".rep 8; nop; .endr"); 6565+ * e.g. a series of nops: asm volatile (".rep 8; nop; .endr");6666 */67676868#include <asm/mtd-xip.h>