uml: arch/um/drivers formatting (cb8fa61c) · Commits · e / devices / android_kernel_teracube_2e

arch/um/drivers/chan_user.c

+11 −7

Original line number	Diff line number	Diff line
		@@ -82,17 +82,21 @@ int generic_console_write(int fd, const char *buf, int n)
		if (err)
		goto error;
		new = save;
		/* The terminal becomes a bit less raw, to handle \n also as
		/*
		* The terminal becomes a bit less raw, to handle \n also as
		* "Carriage Return", not only as "New Line". Otherwise, the new
		* line won't start at the first column.*/
		* line won't start at the first column.
		*/
		new.c_oflag \|= OPOST;
		CATCH_EINTR(err = tcsetattr(fd, TCSAFLUSH, &new));
		if (err)
		goto error;
		}
		err = generic_write(fd, buf, n, NULL);
		/* Restore raw mode, in any case; we must ignore any error apart
		* EINTR, except for debug.*/
		/*
		* Restore raw mode, in any case; we must ignore any error apart
		* EINTR, except for debug.
		*/
		if (isatty(fd))
		CATCH_EINTR(tcsetattr(fd, TCSAFLUSH, &save));
		return err;

arch/um/drivers/cow_user.c

+65 −68

Original line number	Diff line number	Diff line
		#include <stddef.h>
		#include <string.h>
		#include <errno.h>
		/* _XOPEN_SOURCE is needed for pread, but we define _GNU_SOURCE, which defines
		/*
		* Copyright (C) 2007 Jeff Dike (jdike@{linux.intel,addtoit}.com)
		* Licensed under the GPL
		*/

		/*
		* _XOPEN_SOURCE is needed for pread, but we define _GNU_SOURCE, which defines
		* that.
		*/
		#include <unistd.h>
		#include <byteswap.h>
		#include <sys/time.h>
		#include <sys/param.h>
		#include <sys/user.h>

		#include "os.h"

		#include <errno.h>
		#include <string.h>
		#include <arpa/inet.h>
		#include <asm/types.h>
		#include "cow.h"
		#include "cow_sys.h"

		@@ -28,7 +29,8 @@ struct cow_header_v1 {
		__s32 sectorsize;
		} __attribute__((packed));

		/* Define PATH_LEN_V3 as the usual value of MAXPATHLEN, just hard-code it in
		/*
		* Define PATH_LEN_V3 as the usual value of MAXPATHLEN, just hard-code it in
		* case other systems have different values for MAXPATHLEN.
		*
		* The same must hold for V2 - we want file format compatibility, not anything
		@@ -46,7 +48,8 @@ struct cow_header_v2 {
		__s32 sectorsize;
		} __attribute__((packed));

		/* Changes from V2 -
		/*
		* Changes from V2 -
		* PATH_LEN_V3 as described above
		* Explicitly specify field bit lengths for systems with different
		* lengths for the usual C types. Not sure whether char or
		@@ -70,7 +73,8 @@ struct cow_header_v2 {
		* Fixed (finally!) the rounding bug
		*/

		/* Until Dec2005, __attribute__((packed)) was left out from the below
		/*
		* Until Dec2005, __attribute__((packed)) was left out from the below
		* definition, leading on 64-bit systems to 4 bytes of padding after mtime, to
		* align size to 8-byte alignment. This shifted all fields above (no padding
		* was present on 32-bit, no other padding was added).
		@@ -147,7 +151,7 @@ static int absolutize(char to, int size, char from)
		if (getcwd(save_cwd, sizeof(save_cwd)) == NULL) {
		cow_printf("absolutize : unable to get cwd - errno = %d\n",
		errno);
		return(-1);
		return -1;
		}
		slash = strrchr(from, '/');
		if (slash != NULL) {
		@@ -156,19 +160,19 @@ static int absolutize(char to, int size, char from)
		*slash = '/';
		cow_printf("absolutize : Can't cd to '%s' - "
		"errno = %d\n", from, errno);
		return(-1);
		return -1;
		}
		*slash = '/';
		if (getcwd(to, size) == NULL) {
		cow_printf("absolutize : unable to get cwd of '%s' - "
		"errno = %d\n", from, errno);
		return(-1);
		return -1;
		}
		remaining = size - strlen(to);
		if (strlen(slash) + 1 > remaining) {
		cow_printf("absolutize : unable to fit '%s' into %d "
		"chars\n", from, size);
		return(-1);
		return -1;
		}
		strcat(to, slash);
		}
		@@ -176,14 +180,14 @@ static int absolutize(char to, int size, char from)
		if (strlen(save_cwd) + 1 + strlen(from) + 1 > size) {
		cow_printf("absolutize : unable to fit '%s' into %d "
		"chars\n", from, size);
		return(-1);
		return -1;
		}
		strcpy(to, save_cwd);
		strcat(to, "/");
		strcat(to, from);
		}
		chdir(save_cwd);
		return(0);
		return 0;
		}

		int write_cow_header(char cow_file, int fd, char backing_file,
		@@ -202,7 +206,8 @@ int write_cow_header(char cow_file, int fd, char backing_file,
		err = -ENOMEM;
		header = cow_malloc(sizeof(*header));
		if (header == NULL) {
		cow_printf("write_cow_header - failed to allocate COW V3 header\n");
		cow_printf("write_cow_header - failed to allocate COW V3 "
		"header\n");
		goto out;
		}
		header->magic = htonl(COW_MAGIC);
		@@ -254,14 +259,14 @@ int write_cow_header(char cow_file, int fd, char backing_file,
		out_free:
		cow_free(header);
		out:
		return(err);
		return err;
		}

		int file_reader(__u64 offset, char buf, int len, void arg)
		{
		int fd = ((int ) arg);

		return(pread(fd, buf, len, offset));
		return pread(fd, buf, len, offset);
		}

		/* XXX Need to sanity-check the values read from the header */
		@@ -280,7 +285,7 @@ int read_cow_header(int (reader)(__u64, char , int, void ), void arg,
		header = cow_malloc(sizeof(*header));
		if (header == NULL) {
		cow_printf("read_cow_header - Failed to allocate header\n");
		return(-ENOMEM);
		return -ENOMEM;
		}
		err = -EINVAL;
		n = (reader)(0, (char ) header, sizeof(*header), arg);
		@@ -290,12 +295,10 @@ int read_cow_header(int (reader)(__u64, char , int, void ), void arg,
		}

		magic = header->v1.magic;
		if(magic == COW_MAGIC) {
		if (magic == COW_MAGIC)
		version = header->v1.version;
		}
		else if(magic == ntohl(COW_MAGIC)){
		else if (magic == ntohl(COW_MAGIC))
		version = ntohl(header->v1.version);
		}
		/* No error printed because the non-COW case comes through here */
		else goto out;

		@@ -355,7 +358,8 @@ int read_cow_header(int (reader)(__u64, char , int, void ), void arg,
		goto out;
		}

		/* this was used until Dec2005 - 64bits are needed to represent
		/*
		* this was used until Dec2005 - 64bits are needed to represent
		* 2038+. I.e. we can safely do this truncating cast.
		*
		* Additionally, we must use ntohl() instead of ntohll(), since
		@@ -389,7 +393,7 @@ int read_cow_header(int (reader)(__u64, char , int, void ), void arg,
		err = 0;
		out:
		cow_free(header);
		return(err);
		return err;
		}

		int init_cow_file(int fd, char cow_file, char backing_file, int sectorsize,
		@@ -416,7 +420,8 @@ int init_cow_file(int fd, char cow_file, char backing_file, int sectorsize,
		goto out;
		}

		/* does not really matter how much we write it is just to set EOF
		/*
		* does not really matter how much we write it is just to set EOF
		* this also sets the entire COW bitmap
		* to zero without having to allocate it
		*/
		@@ -429,15 +434,7 @@ int init_cow_file(int fd, char cow_file, char backing_file, int sectorsize,
		goto out;
		}

		return(0);

		return 0;
		out:
		return(err);
		return err;
		}

		/*
		* ---------------------------------------------------------------------------
		* Local variables:
		* c-file-style: "linux"
		* End:
		*/

arch/um/drivers/fd.c

+6 −7

Original line number	Diff line number	Diff line
		@@ -3,17 +3,16 @@
		* Licensed under the GPL
		*/

		#include <stddef.h>
		#include <stdlib.h>
		#include <stdio.h>
		#include <stdlib.h>
		#include <unistd.h>
		#include <errno.h>
		#include <termios.h>
		#include <unistd.h>
		#include "chan_user.h"
		#include "kern_constants.h"
		#include "os.h"
		#include "um_malloc.h"
		#include "user.h"
		#include "os.h"
		#include "kern_constants.h"

		struct fd_chan {
		int fd;

arch/um/drivers/hostaudio_kern.c

+61 −57

Original line number	Diff line number	Diff line
		@@ -3,14 +3,12 @@
		* Licensed under the GPL
		*/

		#include "linux/fs.h"
		#include "linux/module.h"
		#include "linux/init.h"
		#include "linux/slab.h"
		#include "linux/fs.h"
		#include "linux/sound.h"
		#include "linux/soundcard.h"
		#include "asm/uaccess.h"
		#include "kern_util.h"
		#include "init.h"
		#include "os.h"

		@@ -25,7 +23,8 @@ struct hostmixer_state {
		#define HOSTAUDIO_DEV_DSP "/dev/sound/dsp"
		#define HOSTAUDIO_DEV_MIXER "/dev/sound/mixer"

		/* Changed either at boot time or module load time. At boot, this is
		/*
		* Changed either at boot time or module load time. At boot, this is
		* single-threaded; at module load, multiple modules would each have
		* their own copy of these variables.
		*/
		@@ -44,7 +43,7 @@ static char *mixer = HOSTAUDIO_DEV_MIXER;
		static int set_dsp(char name, int add)
		{
		dsp = name;
		return(0);
		return 0;
		}

		__uml_setup("dsp=", set_dsp, "dsp=<dsp device>\n" DSP_HELP);
		@@ -52,7 +51,7 @@ __uml_setup("dsp=", set_dsp, "dsp=<dsp device>\n" DSP_HELP);
		static int set_mixer(char name, int add)
		{
		mixer = name;
		return(0);
		return 0;
		}

		__uml_setup("mixer=", set_mixer, "mixer=<mixer device>\n" MIXER_HELP);
		@@ -77,12 +76,12 @@ static ssize_t hostaudio_read(struct file file, char __user buffer,
		int err;

		#ifdef DEBUG
		printk("hostaudio: read called, count = %d\n", count);
		printk(KERN_DEBUG "hostaudio: read called, count = %d\n", count);
		#endif

		kbuf = kmalloc(count, GFP_KERNEL);
		if (kbuf == NULL)
		return(-ENOMEM);
		return -ENOMEM;

		err = os_read_file(state->fd, kbuf, count);
		if (err < 0)
		@@ -93,7 +92,7 @@ static ssize_t hostaudio_read(struct file file, char __user buffer,

		out:
		kfree(kbuf);
		return(err);
		return err;
		}

		static ssize_t hostaudio_write(struct file file, const char __user buffer,
		@@ -104,12 +103,12 @@ static ssize_t hostaudio_write(struct file file, const char __user buffer,
		int err;

		#ifdef DEBUG
		printk("hostaudio: write called, count = %d\n", count);
		printk(KERN_DEBUG "hostaudio: write called, count = %d\n", count);
		#endif

		kbuf = kmalloc(count, GFP_KERNEL);
		if (kbuf == NULL)
		return(-ENOMEM);
		return -ENOMEM;

		err = -EFAULT;
		if (copy_from_user(kbuf, buffer, count))
		@@ -122,7 +121,7 @@ static ssize_t hostaudio_write(struct file file, const char __user buffer,

		out:
		kfree(kbuf);
		return(err);
		return err;
		}

		static unsigned int hostaudio_poll(struct file *file,
		@@ -131,10 +130,10 @@ static unsigned int hostaudio_poll(struct file *file,
		unsigned int mask = 0;

		#ifdef DEBUG
		printk("hostaudio: poll called (unimplemented)\n");
		printk(KERN_DEBUG "hostaudio: poll called (unimplemented)\n");
		#endif

		return(mask);
		return mask;
		}

		static int hostaudio_ioctl(struct inode inode, struct file file,
		@@ -145,7 +144,7 @@ static int hostaudio_ioctl(struct inode inode, struct file file,
		int err;

		#ifdef DEBUG
		printk("hostaudio: ioctl called, cmd = %u\n", cmd);
		printk(KERN_DEBUG "hostaudio: ioctl called, cmd = %u\n", cmd);
		#endif
		switch(cmd){
		case SNDCTL_DSP_SPEED:
		@@ -155,7 +154,7 @@ static int hostaudio_ioctl(struct inode inode, struct file file,
		case SNDCTL_DSP_SUBDIVIDE:
		case SNDCTL_DSP_SETFRAGMENT:
		if (get_user(data, (int __user *) arg))
		return(-EFAULT);
		return EFAULT;
		break;
		default:
		break;
		@@ -171,13 +170,13 @@ static int hostaudio_ioctl(struct inode inode, struct file file,
		case SNDCTL_DSP_SUBDIVIDE:
		case SNDCTL_DSP_SETFRAGMENT:
		if (put_user(data, (int __user *) arg))
		return(-EFAULT);
		return -EFAULT;
		break;
		default:
		break;
		}

		return(err);
		return err;
		}

		static int hostaudio_open(struct inode inode, struct file file)
		@@ -187,24 +186,26 @@ static int hostaudio_open(struct inode inode, struct file file)
		int ret;

		#ifdef DEBUG
		printk("hostaudio: open called (host: %s)\n", dsp);
		printk(KERN_DEBUG "hostaudio: open called (host: %s)\n", dsp);
		#endif

		state = kmalloc(sizeof(struct hostaudio_state), GFP_KERNEL);
		if (state == NULL)
		return(-ENOMEM);
		return -ENOMEM;

		if(file->f_mode & FMODE_READ) r = 1;
		if(file->f_mode & FMODE_WRITE) w = 1;
		if (file->f_mode & FMODE_READ)
		r = 1;
		if (file->f_mode & FMODE_WRITE)
		w = 1;

		ret = os_open_file(dsp, of_set_rw(OPENFLAGS(), r, w), 0);
		if (ret < 0) {
		kfree(state);
		return(ret);
		return ret;
		}
		state->fd = ret;
		file->private_data = state;
		return(0);
		return 0;
		}

		static int hostaudio_release(struct inode inode, struct file file)
		@@ -212,12 +213,12 @@ static int hostaudio_release(struct inode inode, struct file file)
		struct hostaudio_state *state = file->private_data;

		#ifdef DEBUG
		printk("hostaudio: release called\n");
		printk(KERN_DEBUG "hostaudio: release called\n");
		#endif
		os_close_file(state->fd);
		kfree(state);

		return(0);
		return 0;
		}

		/* /dev/mixer file operations */
		@@ -228,10 +229,10 @@ static int hostmixer_ioctl_mixdev(struct inode inode, struct file file,
		struct hostmixer_state *state = file->private_data;

		#ifdef DEBUG
		printk("hostmixer: ioctl called\n");
		printk(KERN_DEBUG "hostmixer: ioctl called\n");
		#endif

		return(os_ioctl_generic(state->fd, cmd, arg));
		return os_ioctl_generic(state->fd, cmd, arg);
		}

		static int hostmixer_open_mixdev(struct inode inode, struct file file)
		@@ -241,26 +242,29 @@ static int hostmixer_open_mixdev(struct inode inode, struct file file)
		int ret;

		#ifdef DEBUG
		printk("hostmixer: open called (host: %s)\n", mixer);
		printk(KERN_DEBUG "hostmixer: open called (host: %s)\n", mixer);
		#endif

		state = kmalloc(sizeof(struct hostmixer_state), GFP_KERNEL);
		if(state == NULL) return(-ENOMEM);
		if (state == NULL)
		return -ENOMEM;

		if(file->f_mode & FMODE_READ) r = 1;
		if(file->f_mode & FMODE_WRITE) w = 1;
		if (file->f_mode & FMODE_READ)
		r = 1;
		if (file->f_mode & FMODE_WRITE)
		w = 1;

		ret = os_open_file(mixer, of_set_rw(OPENFLAGS(), r, w), 0);

		if (ret < 0) {
		printk("hostaudio_open_mixdev failed to open '%s', err = %d\n",
		dsp, -ret);
		printk(KERN_ERR "hostaudio_open_mixdev failed to open '%s', "
		"err = %d\n", dsp, -ret);
		kfree(state);
		return(ret);
		return ret;
		}

		file->private_data = state;
		return(0);
		return 0;
		}

		static int hostmixer_release(struct inode inode, struct file file)
		@@ -268,13 +272,13 @@ static int hostmixer_release(struct inode inode, struct file file)
		struct hostmixer_state *state = file->private_data;

		#ifdef DEBUG
		printk("hostmixer: release called\n");
		printk(KERN_DEBUG "hostmixer: release called\n");
		#endif

		os_close_file(state->fd);
		kfree(state);

		return(0);
		return 0;
		}

		/* kernel module operations */

arch/um/drivers/mconsole_user.c

+54 −65

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2001 Lennert Buytenhek (buytenh@gnu.org)
		* Copyright (C) 2001 - 2003 Jeff Dike (jdike@addtoit.com)
		* Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
		* Licensed under the GPL
		*/

		#include <stdio.h>
		#include <stdlib.h>
		#include <errno.h>
		#include <signal.h>
		#include <string.h>
		#include <unistd.h>
		#include <sys/socket.h>
		#include <sys/types.h>
		#include <sys/uio.h>
		#include <sys/un.h>
		#include <unistd.h>
		#include "user.h"
		#include "sysdep/ptrace.h"
		#include "kern_constants.h"
		#include "mconsole.h"
		#include "os.h"
		#include "user.h"

		static struct mconsole_command commands[] = {
		/* With uts namespaces, uts information becomes process-specific, so
		/*
		* With uts namespaces, uts information becomes process-specific, so
		* we need a process context. If we try handling this in interrupt
		* context, we may hit an exiting process without a valid uts
		* namespace.
		@@ -107,12 +104,12 @@ int mconsole_get_request(int fd, struct mc_request *req)

		mconsole_reply_v0(req, "ERR Version 0 mconsole clients are "
		"not supported by this driver");
		return(0);
		return 0;
		}

		if (req->request.len >= MCONSOLE_MAX_DATA) {
		mconsole_reply(req, "Request too large", 1, 0);
		return(0);
		return 0;
		}
		if (req->request.version != MCONSOLE_VERSION) {
		mconsole_reply(req, "This driver only supports version "
		@@ -123,16 +120,17 @@ int mconsole_get_request(int fd, struct mc_request *req)
		req->cmd = mconsole_parse(req);
		if (req->cmd == NULL) {
		mconsole_reply(req, "Unknown command", 1, 0);
		return(0);
		return 0;
		}

		return(1);
		return 1;
		}

		int mconsole_reply_len(struct mc_request req, const char str, int total,
		int err, int more)
		{
		/* XXX This is a stack consumption problem. It'd be nice to
		/*
		* XXX This is a stack consumption problem. It'd be nice to
		* make it global and serialize access to it, but there are a
		* ton of callers to this function.
		*/
		@@ -161,9 +159,10 @@ int mconsole_reply_len(struct mc_request req, const char str, int total,
		n = sendto(req->originating_fd, &reply, len, 0,
		(struct sockaddr *) req->origin, req->originlen);

		if(n < 0) return(-errno);
		if (n < 0)
		return -errno;
		} while (total > 0);
		return(0);
		return 0;
		}

		int mconsole_reply(struct mc_request req, const char str, int err, int more)
		@@ -191,14 +190,14 @@ int mconsole_notify(char sock_name, int type, const void data, int len)
		notify_sock = socket(PF_UNIX, SOCK_DGRAM, 0);
		if (notify_sock < 0) {
		err = -errno;
		printk("mconsole_notify - socket failed, errno = %d\n",
		err);
		printk(UM_KERN_ERR "mconsole_notify - socket failed, "
		"errno = %d\n", errno);
		}
		}
		unlock_notify();

		if (err)
		return(err);
		return err;

		target.sun_family = AF_UNIX;
		strcpy(target.sun_path, sock_name);
		@@ -216,18 +215,8 @@ int mconsole_notify(char sock_name, int type, const void data, int len)
		sizeof(target));
		if (n < 0) {
		err = -errno;
		printk("mconsole_notify - sendto failed, errno = %d\n", errno);
		printk(UM_KERN_ERR "mconsole_notify - sendto failed, "
		"errno = %d\n", errno);
		}
		return(err);
		return err;
		}

		/*
		* Overrides for Emacs so that we follow Linus's tabbing style.
		* Emacs will notice this stuff at the end of the file and automatically
		* adjust the settings for this buffer only. This must remain at the end
		* of the file.
		* ---------------------------------------------------------------------------
		* Local variables:
		* c-file-style: "linux"
		* End:
		*/