staging: unisys: merge diagchannel.h to visorbus.h (e308d698) · Commits · 戴 / test

drivers/staging/unisys/include/diagchannel.h

deleted100644 → 0

+0 −38

Original line number	Diff line number	Diff line
		/* 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 _DIAG_CHANNEL_H_
		#define _DIAG_CHANNEL_H_

		/* Levels of severity for diagnostic events, in order from lowest severity to
		* highest (i.e. fatal errors are the most severe, and should always be logged,
		* but info events rarely need to be logged except during debugging). The
		* values DIAG_SEVERITY_ENUM_BEGIN and DIAG_SEVERITY_ENUM_END are not valid
		* severity values. They exist merely to dilineate the list, so that future
		* additions won't require changes to the driver (i.e. when checking for
		* out-of-range severities in SetSeverity). The values DIAG_SEVERITY_OVERRIDE
		* and DIAG_SEVERITY_SHUTOFF are not valid severity values for logging events
		* but they are valid for controlling the amount of event data. Changes made
		* to the enum, need to be reflected in s-Par.
		*/
		enum diag_severity {
		DIAG_SEVERITY_VERBOSE = 0,
		DIAG_SEVERITY_INFO = 1,
		DIAG_SEVERITY_WARNING = 2,
		DIAG_SEVERITY_ERR = 3,
		DIAG_SEVERITY_PRINT = 4,
		};

		#endif

drivers/staging/unisys/include/visorbus.h

+19 −0

Original line number	Diff line number	Diff line
		@@ -187,6 +187,25 @@ int visorbus_write_channel(struct visor_device *dev,
		void visorbus_enable_channel_interrupts(struct visor_device *dev);
		void visorbus_disable_channel_interrupts(struct visor_device *dev);

		/* Levels of severity for diagnostic events, in order from lowest severity to
		* highest (i.e. fatal errors are the most severe, and should always be logged,
		* but info events rarely need to be logged except during debugging). The
		* values DIAG_SEVERITY_ENUM_BEGIN and DIAG_SEVERITY_ENUM_END are not valid
		* severity values. They exist merely to dilineate the list, so that future
		* additions won't require changes to the driver (i.e. when checking for
		* out-of-range severities in SetSeverity). The values DIAG_SEVERITY_OVERRIDE
		* and DIAG_SEVERITY_SHUTOFF are not valid severity values for logging events
		* but they are valid for controlling the amount of event data. Changes made
		* to the enum, need to be reflected in s-Par.
		*/
		enum diag_severity {
		DIAG_SEVERITY_VERBOSE = 0,
		DIAG_SEVERITY_INFO = 1,
		DIAG_SEVERITY_WARNING = 2,
		DIAG_SEVERITY_ERR = 3,
		DIAG_SEVERITY_PRINT = 4,
		};

		bool visorchannel_signalremove(struct visorchannel *channel, u32 queue,
		void *msg);
		bool visorchannel_signalinsert(struct visorchannel *channel, u32 queue,

drivers/staging/unisys/visorbus/vmcallinterface.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -24,7 +24,6 @@
		#ifdef __GNUC__
		#include "iovmcall_gnuc.h"
		#endif /* */
		#include "diagchannel.h"

		#ifdef VMCALL_IO_CONTROLVM_ADDR
		#undef VMCALL_IO_CONTROLVM_ADDR

Admin message