Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68646323 authored by Sameer Wadgaonkar's avatar Sameer Wadgaonkar Committed by Greg Kroah-Hartman
Browse files

staging: unisys: include: renamed #defines in iochannel.h to match driver namespace



Renamed #defines
* ULTRA_VHBA_CHANNEL_PROTOCOL_SIGNATURE to
		VISOR_VHBA_CHANNEL_SIGNATURE
* ULTRA_VNIC_CHANNEL_PROTOCOL_SIGNATURE to
		VISOR_VNIC_CHANNEL_SIGNATURE
* ULTRA_VSWITCH_CHANNEL_PROTOCOL_SIGNATURE to
		VISOR_VSWITCH_CHANNEL_SIGNATURE
* ULTRA_VHBA_CHANNEL_PROTOCOL_VERSIONID to
		VISOR_VHBA_CHANNEL_VERSIONID
* ULTRA_VNIC_CHANNEL_PROTOCOL_VERSIONID to
		VISOR_VNIC_CHANNEL_VERSIONID
* ULTRA_VSWITCH_CHANNEL_PROTOCOL_VERSIONID to
		VISOR_VSWITCH_CHANNEL_VERSIONID
* SPAR_VHBA_CHANNEL_OK_CLIENT to VISOR_VHBA_CHANNEL_OK_CLIENT
* SPAR_VNIC_CHANNEL_OK_CLIENT to VISOR_VNIC_CHANNEL_OK_CLIENT

Signed-off-by: default avatarSameer Wadgaonkar <sameer.wadgaonkar@unisys.com>
Signed-off-by: default avatarDavid Kershner <david.kershner@unisys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c75ebe5e
Loading
Loading
Loading
Loading
+14 −14
Original line number Diff line number Diff line
@@ -34,9 +34,9 @@
#include <linux/dma-direction.h>
#include "channel.h"

#define ULTRA_VHBA_CHANNEL_PROTOCOL_SIGNATURE VISOR_CHANNEL_SIGNATURE
#define ULTRA_VNIC_CHANNEL_PROTOCOL_SIGNATURE VISOR_CHANNEL_SIGNATURE
#define ULTRA_VSWITCH_CHANNEL_PROTOCOL_SIGNATURE VISOR_CHANNEL_SIGNATURE
#define VISOR_VHBA_CHANNEL_SIGNATURE VISOR_CHANNEL_SIGNATURE
#define VISOR_VNIC_CHANNEL_SIGNATURE VISOR_CHANNEL_SIGNATURE
#define VISOR_VSWITCH_CHANNEL_SIGNATURE VISOR_CHANNEL_SIGNATURE

/*
 * Must increment these whenever you insert or delete fields within this channel
@@ -45,21 +45,21 @@
 * usually add fields to the END of the channel struct without needing to
 * increment this.
 */
#define ULTRA_VHBA_CHANNEL_PROTOCOL_VERSIONID 2
#define ULTRA_VNIC_CHANNEL_PROTOCOL_VERSIONID 2
#define ULTRA_VSWITCH_CHANNEL_PROTOCOL_VERSIONID 1
#define VISOR_VHBA_CHANNEL_VERSIONID 2
#define VISOR_VNIC_CHANNEL_VERSIONID 2
#define VISOR_VSWITCH_CHANNEL_VERSIONID 1

#define SPAR_VHBA_CHANNEL_OK_CLIENT(ch) \
#define VISOR_VHBA_CHANNEL_OK_CLIENT(ch) \
	(visor_check_channel(ch, visor_vhba_channel_uuid, \
			     "vhba", MIN_IO_CHANNEL_SIZE, \
			    ULTRA_VHBA_CHANNEL_PROTOCOL_VERSIONID, \
			    ULTRA_VHBA_CHANNEL_PROTOCOL_SIGNATURE))
			     VISOR_VHBA_CHANNEL_VERSIONID, \
			     VISOR_VHBA_CHANNEL_SIGNATURE))

#define SPAR_VNIC_CHANNEL_OK_CLIENT(ch) \
#define VISOR_VNIC_CHANNEL_OK_CLIENT(ch) \
	(visor_check_channel(ch, visor_vnic_channel_uuid, \
			     "vnic", MIN_IO_CHANNEL_SIZE, \
			    ULTRA_VNIC_CHANNEL_PROTOCOL_VERSIONID, \
			    ULTRA_VNIC_CHANNEL_PROTOCOL_SIGNATURE))
			     VISOR_VNIC_CHANNEL_VERSIONID, \
			     VISOR_VNIC_CHANNEL_SIGNATURE))

/*
 * Everything necessary to handle SCSI & NIC traffic between Guest Partition and