leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

u-boot yaffs2: Fix compilation warnings

Browse Source 
Also remove yaffs_hweight and use the hweight in u-boot.

Signed-off-by: Charles Manning <cdhmanning@gmail.com>
This commit is contained in:
Charles Manning 2012-08-14 18:26:10 +00:00 committed by Wolfgang Denk
parent 7cdcaef0b2
commit 74f45b739b
10 changed files with 6 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fs/yaffs2/Makefile
View File

@ -23,7 +23,7 @@ LIB = $(obj)libyaffs2.o
COBJS-$(CONFIG_YAFFS2) := \
yaffs_allocator.o yaffs_attribs.o yaffs_bitmap.o yaffs_uboot_glue.o\
yaffs_checkptrw.o yaffs_ecc.o yaffs_error.o \
yaffsfs.o yaffs_guts.o yaffs_hweight.o yaffs_nameval.o yaffs_nand.o\
yaffsfs.o yaffs_guts.o yaffs_nameval.o yaffs_nand.o\
yaffs_packedtags1.o yaffs_packedtags2.o yaffs_qsort.o \
yaffs_summary.o yaffs_tagscompat.o yaffs_verify.o yaffs_yaffs1.o \
yaffs_yaffs2.o yaffs_mtdif.o yaffs_mtdif2.o

1
fs/yaffs2/stdio.h
View File

@ -1 +0,0 @@
/* Dummy header for u-boot */

1
fs/yaffs2/stdlib.h
View File

@ -1 +0,0 @@
/* Dummy header for u-boot */

4
fs/yaffs2/string.h
View File

@ -1,4 +0,0 @@
#include <linux/stddef.h>
#include <linux/string.h>
#include <linux/stat.h>
#include <common.h>

52
fs/yaffs2/yaffs_hweight.c
View File

@ -1,52 +0,0 @@
/*
* YAFFS: Yet Another Flash File System. A NAND-flash specific file system.
*
* Copyright (C) 2002-2011 Aleph One Ltd.
* for Toby Churchill Ltd and Brightstar Engineering
*
* Created by Charles Manning <charles@aleph1.co.uk>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
/* These functions have been renamed to hweightxx to match the
* equivaqlent functions in the Linux kernel.
*/
#include "yaffs_hweight.h"
static const char yaffs_count_bits_table[256] = {
0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4,
1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5,
2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6,
3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7,
4, 5, 5, 6, 5, 6, 6, 7, 5, 6, 6, 7, 6, 7, 7, 8
};
int yaffs_hweight8(u8 x)
{
int ret_val;
ret_val = yaffs_count_bits_table[x];
return ret_val;
}
int yaffs_hweight32(u32 x)
{
return yaffs_hweight8(x & 0xff) +
yaffs_hweight8((x >> 8) & 0xff) +
yaffs_hweight8((x >> 16) & 0xff) +
yaffs_hweight8((x >> 24) & 0xff);
}

24
fs/yaffs2/yaffs_hweight.h
View File

@ -1,24 +0,0 @@
/*
* YAFFS: Yet another Flash File System . A NAND-flash specific file system.
*
* Copyright (C) 2002-2011 Aleph One Ltd.
* for Toby Churchill Ltd and Brightstar Engineering
*
* Created by Charles Manning <charles@aleph1.co.uk>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License version 2.1 as
* published by the Free Software Foundation.
*
* Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL.
*/
#ifndef __YAFFS_HWEIGHT_H__
#define __YAFFS_HWEIGHT_H__
#include "yportenv.h"
int yaffs_hweight8(u8 x);
int yaffs_hweight32(u32 x);
#endif

3
fs/yaffs2/yaffs_mtdif2.c
View File

@ -28,7 +28,6 @@
#include "yaffs_trace.h"
#include "yaffs_packedtags2.h"
#include "string.h"
#define yaffs_dev_to_mtd(dev) ((struct mtd_info *)((dev)->driver_context))
#define yaffs_dev_to_lc(dev) ((struct yaffs_linux_context *)((dev)->os_context))
@ -46,9 +45,7 @@ int nandmtd2_write_chunk_tags(struct yaffs_dev *dev, int nand_chunk,
struct mtd_oob_ops ops;
int retval = 0;
loff_t addr;
u8 local_spare[128];
struct yaffs_packed_tags2 pt;

2
fs/yaffs2/yaffsfs.c
View File

@ -17,8 +17,6 @@
#include "yportenv.h"
#include "yaffs_trace.h"
#include "string.h"
#define YAFFSFS_MAX_SYMLINK_DEREFERENCES 5
#ifndef NULL

16
fs/yaffs2/ydirectenv.h
View File

@ -20,15 +20,14 @@
#ifndef __YDIRECTENV_H__
#define __YDIRECTENV_H__
#include "stdlib.h"
#include "stdio.h"
#include "string.h"
#include <common.h>
#include <malloc.h>
#include <linux/compat.h>
#include "yaffs_osglue.h"
#include "yaffs_hweight.h"
void yaffs_bug_fn(const char *file_name, int line_no);
#define BUG() do { yaffs_bug_fn(__FILE__, __LINE__); } while (0)
#define YCHAR char
@ -47,8 +46,6 @@ void yaffs_bug_fn(const char *file_name, int line_no);
#define yaffs_strncmp(a, b, c) strncmp(a, b, c)
#endif
#define hweight8(x) yaffs_hweight8(x)
#define hweight32(x) yaffs_hweight32(x)
void yaffs_qsort(void *aa, size_t n, size_t es,
int (*cmp)(const void *, const void *));
@ -63,11 +60,6 @@ void yaffs_qsort(void *aa, size_t n, size_t es,
#define inline __inline__
#endif
#define kmalloc(x, flags) yaffsfs_malloc(x)
#define kfree(x) yaffsfs_free(x)
#define vmalloc(x) yaffsfs_malloc(x)
#define vfree(x) yaffsfs_free(x)
#define cond_resched() do {} while (0)
#define yaffs_trace(msk, fmt, ...) do { \

1
fs/yaffs2/yportenv.h
View File

@ -17,6 +17,7 @@
#ifndef __YPORTENV_H__
#define __YPORTENV_H__
#include <linux/types.h>
/* Definition of types */
#ifdef CONFIG_YAFFS_DEFINES_TYPES