9
0
Fork 0

Merge branch 'for-next/devnull'

Conflicts:
	commands/mem.c
This commit is contained in:
Sascha Hauer 2012-07-02 11:03:24 +02:00
commit 62fe47768b
3 changed files with 107 additions and 29 deletions

View File

@ -1,3 +1,4 @@
obj-y += stddev.o
obj-$(CONFIG_CMD_BOOTM) += bootm.o
obj-$(CONFIG_CMD_UIMAGE) += uimage.o
obj-$(CONFIG_CMD_LINUX16) += linux16.o

View File

@ -622,32 +622,3 @@ static int mem_init(void)
}
device_initcall(mem_init);
static ssize_t zero_read(struct cdev *cdev, void *buf, size_t count, loff_t offset, ulong flags)
{
memset(buf, 0, count);
return count;
}
static struct file_operations zeroops = {
.read = zero_read,
.lseek = dev_lseek_default,
};
static int zero_init(void)
{
struct cdev *cdev;
cdev = xzalloc(sizeof (*cdev));
cdev->name = "zero";
cdev->size = ~0;
cdev->ops = &zeroops;
devfs_create(cdev);
return 0;
}
device_initcall(zero_init);

106
commands/stddev.c Normal file
View File

@ -0,0 +1,106 @@
/*
* Copyright (c) 2011 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
*
* See file CREDITS for list of people who contributed to this
* project.
*
* 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.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
* MA 02111-1307 USA
*/
#include <common.h>
#include <init.h>
static ssize_t zero_read(struct cdev *cdev, void *buf, size_t count, loff_t offset, ulong flags)
{
memset(buf, 0, count);
return count;
}
static struct file_operations zeroops = {
.read = zero_read,
.lseek = dev_lseek_default,
};
static int zero_init(void)
{
struct cdev *cdev;
cdev = xzalloc(sizeof (*cdev));
cdev->name = "zero";
cdev->size = ~0;
cdev->ops = &zeroops;
devfs_create(cdev);
return 0;
}
device_initcall(zero_init);
static ssize_t full_read(struct cdev *cdev, void *buf, size_t count, loff_t offset, ulong flags)
{
memset(buf, 0xff, count);
return count;
}
static struct file_operations fullops = {
.read = full_read,
.lseek = dev_lseek_default,
};
static int full_init(void)
{
struct cdev *cdev;
cdev = xzalloc(sizeof (*cdev));
cdev->name = "full";
cdev->size = ~0;
cdev->ops = &fullops;
devfs_create(cdev);
return 0;
}
device_initcall(full_init);
static ssize_t null_write(struct cdev *cdev, const void *buf, size_t count, loff_t offset, ulong flags)
{
return count;
}
static struct file_operations nullops = {
.write = null_write,
.lseek = dev_lseek_default,
};
static int null_init(void)
{
struct cdev *cdev;
cdev = xzalloc(sizeof (*cdev));
cdev->name = "null";
cdev->size = 0;
cdev->ops = &nullops;
devfs_create(cdev);
return 0;
}
device_initcall(null_init);