FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2025-02-13 16:11:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

staging: unisys: Dissolve visorchannel.h

Browse Source 
This header is needed by other drivers and should be in a global namespace.
In addition, functionally it is part of visorbus, so roll the contents
into that header file.

Signed-off-by: Don Zickus <dzickus@redhat.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Don Zickus 2015-05-05 18:36:02 -04:00 committed by Greg Kroah-Hartman
parent 291603cca7
commit f6439218bb
6 changed files with 53 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
drivers/staging/unisys/visorbus/visorbus.h
View File

@ -35,8 +35,12 @@
#include <linux/uuid.h>
#include "periodic_work.h"
#include "visorchannel.h"
#include "channel.h"
#include "memregion.h"
#ifndef HOSTADDRESS
#define HOSTADDRESS u64
#endif
struct visor_driver;
struct visor_device;
@ -163,4 +167,48 @@ void visorbus_enable_channel_interrupts(struct visor_device *dev);
void visorbus_disable_channel_interrupts(struct visor_device *dev);
#endif
/* Note that for visorchannel_create() and visorchannel_create_overlapped(),
* <channel_bytes> and <guid> arguments may be 0 if we are a channel CLIENT.
* In this case, the values can simply be read from the channel header.
*/
struct visorchannel *visorchannel_create(HOSTADDRESS physaddr,
ulong channel_bytes, uuid_le guid);
struct visorchannel *visorchannel_create_overlapped(ulong channel_bytes,
struct visorchannel *parent,
ulong off, uuid_le guid);
struct visorchannel *visorchannel_create_with_lock(HOSTADDRESS physaddr,
ulong channel_bytes,
uuid_le guid);
struct visorchannel *visorchannel_create_overlapped_with_lock(
ulong channel_bytes,
struct visorchannel *parent,
ulong off, uuid_le guid);
void visorchannel_destroy(struct visorchannel *channel);
int visorchannel_read(struct visorchannel *channel, ulong offset,
void *local, ulong nbytes);
int visorchannel_write(struct visorchannel *channel, ulong offset,
void *local, ulong nbytes);
int visorchannel_clear(struct visorchannel *channel, ulong offset,
u8 ch, ulong nbytes);
BOOL visorchannel_signalremove(struct visorchannel *channel, u32 queue,
void *msg);
BOOL visorchannel_signalinsert(struct visorchannel *channel, u32 queue,
void *msg);
int visorchannel_signalqueue_slots_avail(struct visorchannel *channel,
u32 queue);
int visorchannel_signalqueue_max_slots(struct visorchannel *channel, u32 queue);
HOSTADDRESS visorchannel_get_physaddr(struct visorchannel *channel);
ulong visorchannel_get_nbytes(struct visorchannel *channel);
char *visorchannel_id(struct visorchannel *channel, char *s);
char *visorchannel_zoneid(struct visorchannel *channel, char *s);
u64 visorchannel_get_clientpartition(struct visorchannel *channel);
uuid_le visorchannel_get_uuid(struct visorchannel *channel);
struct memregion *visorchannel_get_memregion(struct visorchannel *channel);
char *visorchannel_uuid_id(uuid_le *guid, char *s);
void visorchannel_debug(struct visorchannel *channel, int num_queues,
struct seq_file *seq, u32 off);
void visorchannel_dump_section(struct visorchannel *chan, char *s,
int off, int len, struct seq_file *seq);
void __iomem *visorchannel_get_header(struct visorchannel *channel);
#endif

2
drivers/staging/unisys/visorbus/visorbus_private.h
View File

@ -21,7 +21,7 @@
#include "timskmod.h"
#include "visorbus.h"
#include "visorchipset.h"
#include "visorchannel.h"
#include "visorbus.h"
#include "version.h"
#include "vbuschannel.h"

76
drivers/staging/unisys/visorbus/visorchannel.h
View File

@ -1,76 +0,0 @@
/* visorchannel.h
*
* Copyright (C) 2010 - 2013 UNISYS CORPORATION
* All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or (at
* your option) any later version.
*
* 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, GOOD TITLE or
* NON INFRINGEMENT. See the GNU General Public License for more
* details.
*/
#ifndef __VISORCHANNEL_H__
#define __VISORCHANNEL_H__
#include <linux/uuid.h>
#include "memregion.h"
#include "channel.h"
#ifndef HOSTADDRESS
#define HOSTADDRESS u64
#endif
#ifndef BOOL
#define BOOL int
#endif
/* Note that for visorchannel_create() and visorchannel_create_overlapped(),
* <channel_bytes> and <guid> arguments may be 0 if we are a channel CLIENT.
* In this case, the values can simply be read from the channel header.
*/
struct visorchannel *visorchannel_create(HOSTADDRESS physaddr,
ulong channel_bytes, uuid_le guid);
struct visorchannel *visorchannel_create_overlapped(ulong channel_bytes,
struct visorchannel *parent,
ulong off, uuid_le guid);
struct visorchannel *visorchannel_create_with_lock(HOSTADDRESS physaddr,
ulong channel_bytes,
uuid_le guid);
struct visorchannel *visorchannel_create_overlapped_with_lock(
ulong channel_bytes,
struct visorchannel *parent,
ulong off, uuid_le guid);
void visorchannel_destroy(struct visorchannel *channel);
int visorchannel_read(struct visorchannel *channel, ulong offset,
void *local, ulong nbytes);
int visorchannel_write(struct visorchannel *channel, ulong offset,
void *local, ulong nbytes);
int visorchannel_clear(struct visorchannel *channel, ulong offset,
u8 ch, ulong nbytes);
BOOL visorchannel_signalremove(struct visorchannel *channel, u32 queue,
void *msg);
BOOL visorchannel_signalinsert(struct visorchannel *channel, u32 queue,
void *msg);
int visorchannel_signalqueue_slots_avail(struct visorchannel *channel,
u32 queue);
int visorchannel_signalqueue_max_slots(struct visorchannel *channel, u32 queue);
HOSTADDRESS visorchannel_get_physaddr(struct visorchannel *channel);
ulong visorchannel_get_nbytes(struct visorchannel *channel);
char *visorchannel_id(struct visorchannel *channel, char *s);
char *visorchannel_zoneid(struct visorchannel *channel, char *s);
u64 visorchannel_get_clientpartition(struct visorchannel *channel);
uuid_le visorchannel_get_uuid(struct visorchannel *channel);
struct memregion *visorchannel_get_memregion(struct visorchannel *channel);
char *visorchannel_uuid_id(uuid_le *guid, char *s);
void visorchannel_debug(struct visorchannel *channel, int num_queues,
struct seq_file *seq, u32 off);
void visorchannel_dump_section(struct visorchannel *chan, char *s,
int off, int len, struct seq_file *seq);
void __iomem *visorchannel_get_header(struct visorchannel *channel);
#endif

2
drivers/staging/unisys/visorbus/visorchannel_funcs.c
View File

@ -23,7 +23,7 @@
*/
#include "globals.h"
#include "visorchannel.h"
#include "visorbus.h"
#include <linux/uuid.h>
#define MYDRVNAME "visorchannel"

2
drivers/staging/unisys/visorchipset/file.c
View File

@ -24,7 +24,7 @@
#include "version.h"
#include "visorchipset.h"
#include "visorchipset_umode.h"
#include "visorchannel.h"
#include "visorbus.h"
#include "uisutils.h"
#include "file.h"

2
drivers/staging/unisys/visorchipset/visorchipset_main.c
View File

@ -18,7 +18,7 @@
#include "version.h"
#include "visorchipset.h"
#include "procobjecttree.h"
#include "visorchannel.h"
#include "visorbus.h"
#include "periodic_work.h"
#include "file.h"
#include "parser.h"