Skip to content

L
linux-davinci
Commit caf26a31 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files
Options

Staging: hv: osd.h: remove GUID typedef 

GUID should not be a typedef.  As proof of the problem of typedefs,
look, we are passing 2 of these as a value in functions!  Bah...

Cc: Hank Janssen <hjanssen@microsoft.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0ccafb36
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 175 additions and 112 deletions
drivers/staging/hv/BlkVsc.c
View file @ caf26a31
...@@ -28,8 +28,11 @@ ...@@ -28,8 +28,11 @@
static const char* gBlkDriverName="blkvsc"; static const char* gBlkDriverName="blkvsc";
/* {32412632-86cb-44a2-9b5c-50d1417354f5} */ /* {32412632-86cb-44a2-9b5c-50d1417354f5} */
static const GUID gBlkVscDeviceType={ static const struct hv_guid gBlkVscDeviceType={
.Data = {0x32, 0x26, 0x41, 0x32, 0xcb, 0x86, 0xa2, 0x44, 0x9b, 0x5c, 0x50, 0xd1, 0x41, 0x73, 0x54, 0xf5} .data = {
0x32, 0x26, 0x41, 0x32, 0xcb, 0x86, 0xa2, 0x44,
0x9b, 0x5c, 0x50, 0xd1, 0x41, 0x73, 0x54, 0xf5
}
}; };
/* Static routines */ /* Static routines */
...@@ -54,7 +57,7 @@ BlkVscInitialize( ...@@ -54,7 +57,7 @@ BlkVscInitialize(
ASSERT(storDriver->RingBufferSize >= (PAGE_SIZE << 1)); ASSERT(storDriver->RingBufferSize >= (PAGE_SIZE << 1));
Driver->name = gBlkDriverName; Driver->name = gBlkDriverName;
memcpy(&Driver->deviceType, &gBlkVscDeviceType, sizeof(GUID)); memcpy(&Driver->deviceType, &gBlkVscDeviceType, sizeof(struct hv_guid));
storDriver->RequestExtSize = sizeof(STORVSC_REQUEST_EXTENSION); storDriver->RequestExtSize = sizeof(STORVSC_REQUEST_EXTENSION);
/* Divide the ring buffer data size (which is 1 page less than the ring buffer size since that page is reserved for the ring buffer indices) */ /* Divide the ring buffer data size (which is 1 page less than the ring buffer size since that page is reserved for the ring buffer indices) */
...@@ -98,10 +101,13 @@ BlkVscOnDeviceAdd( ...@@ -98,10 +101,13 @@ BlkVscOnDeviceAdd(
/* We need to use the device instance guid to set the path and target id. For IDE devices, the */ /* We need to use the device instance guid to set the path and target id. For IDE devices, the */
/* device instance id is formatted as <bus id> - <device id> - 8899 - 000000000000. */ /* device instance id is formatted as <bus id> - <device id> - 8899 - 000000000000. */
deviceInfo->PathId = Device->deviceInstance.Data[3] << 24 | Device->deviceInstance.Data[2] << 16 | deviceInfo->PathId = Device->deviceInstance.data[3] << 24 |
Device->deviceInstance.Data[1] << 8 |Device->deviceInstance.Data[0]; Device->deviceInstance.data[2] << 16 |
Device->deviceInstance.data[1] << 8 |
Device->deviceInstance.data[0];
deviceInfo->TargetId = Device->deviceInstance.Data[5] << 8 | Device->deviceInstance.Data[4]; deviceInfo->TargetId = Device->deviceInstance.data[5] << 8 |
Device->deviceInstance.data[4];
DPRINT_EXIT(BLKVSC); DPRINT_EXIT(BLKVSC);
......
drivers/staging/hv/Channel.c
View file @ caf26a31
...@@ -154,8 +154,8 @@ void VmbusChannelGetDebugInfo(struct vmbus_channel *Channel, ...@@ -154,8 +154,8 @@ void VmbusChannelGetDebugInfo(struct vmbus_channel *Channel,
DebugInfo->RelId = Channel->OfferMsg.ChildRelId; DebugInfo->RelId = Channel->OfferMsg.ChildRelId;
DebugInfo->State = Channel->State; DebugInfo->State = Channel->State;
memcpy(&DebugInfo->InterfaceType, &Channel->OfferMsg.Offer.InterfaceType, sizeof(GUID)); memcpy(&DebugInfo->InterfaceType, &Channel->OfferMsg.Offer.InterfaceType, sizeof(struct hv_guid));
memcpy(&DebugInfo->InterfaceInstance, &Channel->OfferMsg.Offer.InterfaceInstance, sizeof(GUID)); memcpy(&DebugInfo->InterfaceInstance, &Channel->OfferMsg.Offer.InterfaceInstance, sizeof(struct hv_guid));
monitorPage = (HV_MONITOR_PAGE*)gVmbusConnection.MonitorPages; monitorPage = (HV_MONITOR_PAGE*)gVmbusConnection.MonitorPages;
......
drivers/staging/hv/ChannelInterface.c
View file @ caf26a31
...@@ -190,8 +190,8 @@ void GetChannelInfo(struct hv_device *Device, DEVICE_INFO *DeviceInfo) ...@@ -190,8 +190,8 @@ void GetChannelInfo(struct hv_device *Device, DEVICE_INFO *DeviceInfo)
DeviceInfo->ChannelId = debugInfo.RelId; DeviceInfo->ChannelId = debugInfo.RelId;
DeviceInfo->ChannelState = debugInfo.State; DeviceInfo->ChannelState = debugInfo.State;
memcpy(&DeviceInfo->ChannelType, &debugInfo.InterfaceType, sizeof(GUID)); memcpy(&DeviceInfo->ChannelType, &debugInfo.InterfaceType, sizeof(struct hv_guid));
memcpy(&DeviceInfo->ChannelInstance, &debugInfo.InterfaceInstance, sizeof(GUID)); memcpy(&DeviceInfo->ChannelInstance, &debugInfo.InterfaceInstance, sizeof(struct hv_guid));
DeviceInfo->MonitorId = debugInfo.MonitorId; DeviceInfo->MonitorId = debugInfo.MonitorId;
......
drivers/staging/hv/ChannelMgmt.c
View file @ caf26a31
...@@ -89,16 +89,42 @@ VmbusChannelProcessRescindOffer( ...@@ -89,16 +89,42 @@ VmbusChannelProcessRescindOffer(
#define MAX_NUM_DEVICE_CLASSES_SUPPORTED 4 #define MAX_NUM_DEVICE_CLASSES_SUPPORTED 4
static const GUID gSupportedDeviceClasses[MAX_NUM_DEVICE_CLASSES_SUPPORTED]= { static const struct hv_guid gSupportedDeviceClasses[MAX_NUM_DEVICE_CLASSES_SUPPORTED] = {
/* {ba6163d9-04a1-4d29-b605-72e2ffb1dc7f} */ /* {ba6163d9-04a1-4d29-b605-72e2ffb1dc7f} */
{.Data = {0xd9, 0x63, 0x61, 0xba, 0xa1, 0x04, 0x29, 0x4d, 0xb6, 0x05, 0x72, 0xe2, 0xff, 0xb1, 0xdc, 0x7f}},/* Storage - SCSI */ /* Storage - SCSI */
{
.data = {
0xd9, 0x63, 0x61, 0xba, 0xa1, 0x04, 0x29, 0x4d,
0xb6, 0x05, 0x72, 0xe2, 0xff, 0xb1, 0xdc, 0x7f
}
},
/* {F8615163-DF3E-46c5-913F-F2D2F965ED0E} */ /* {F8615163-DF3E-46c5-913F-F2D2F965ED0E} */
{.Data = {0x63, 0x51, 0x61, 0xF8, 0x3E, 0xDF, 0xc5, 0x46, 0x91, 0x3F, 0xF2, 0xD2, 0xF9, 0x65, 0xED, 0x0E}}, /* Network */ /* Network */
{
.data = {
0x63, 0x51, 0x61, 0xF8, 0x3E, 0xDF, 0xc5, 0x46,
0x91, 0x3F, 0xF2, 0xD2, 0xF9, 0x65, 0xED, 0x0E
}
},
/* {CFA8B69E-5B4A-4cc0-B98B-8BA1A1F3F95A} */ /* {CFA8B69E-5B4A-4cc0-B98B-8BA1A1F3F95A} */
{.Data = {0x9E, 0xB6, 0xA8, 0xCF, 0x4A, 0x5B, 0xc0, 0x4c, 0xB9, 0x8B, 0x8B, 0xA1, 0xA1, 0xF3, 0xF9, 0x5A}}, /* Input */ /* Input */
/* {32412632-86cb-44a2-9b5c-50d1417354f5} */ {
{.Data = {0x32, 0x26, 0x41, 0x32, 0xcb, 0x86, 0xa2, 0x44, 0x9b, 0x5c, 0x50, 0xd1, 0x41, 0x73, 0x54, 0xf5}}, /* IDE */ .data = {
0x9E, 0xB6, 0xA8, 0xCF, 0x4A, 0x5B, 0xc0, 0x4c,
0xB9, 0x8B, 0x8B, 0xA1, 0xA1, 0xF3, 0xF9, 0x5A
}
},
/* {32412632-86cb-44a2-9b5c-50d1417354f5} */
/* IDE */
{
.data = {
0x32, 0x26, 0x41, 0x32, 0xcb, 0x86, 0xa2, 0x44,
0x9b, 0x5c, 0x50, 0xd1, 0x41, 0x73, 0x54, 0xf5
}
},
}; };
/* Channel message dispatch table */ /* Channel message dispatch table */
...@@ -233,8 +259,8 @@ VmbusChannelProcessOffer( ...@@ -233,8 +259,8 @@ VmbusChannelProcessOffer(
{ {
channel = CONTAINING_RECORD(curr, struct vmbus_channel, ListEntry); channel = CONTAINING_RECORD(curr, struct vmbus_channel, ListEntry);
if (!memcmp(&channel->OfferMsg.Offer.InterfaceType, &newChannel->OfferMsg.Offer.InterfaceType,sizeof(GUID)) && if (!memcmp(&channel->OfferMsg.Offer.InterfaceType, &newChannel->OfferMsg.Offer.InterfaceType,sizeof(struct hv_guid)) &&
!memcmp(&channel->OfferMsg.Offer.InterfaceInstance, &newChannel->OfferMsg.Offer.InterfaceInstance, sizeof(GUID))) !memcmp(&channel->OfferMsg.Offer.InterfaceInstance, &newChannel->OfferMsg.Offer.InterfaceInstance, sizeof(struct hv_guid)))
{ {
fNew = false; fNew = false;
break; break;
...@@ -337,8 +363,8 @@ VmbusChannelOnOffer( ...@@ -337,8 +363,8 @@ VmbusChannelOnOffer(
VMBUS_CHANNEL_OFFER_CHANNEL* offer = (VMBUS_CHANNEL_OFFER_CHANNEL*)hdr; VMBUS_CHANNEL_OFFER_CHANNEL* offer = (VMBUS_CHANNEL_OFFER_CHANNEL*)hdr;
struct vmbus_channel *newChannel; struct vmbus_channel *newChannel;
GUID *guidType; struct hv_guid *guidType;
GUID *guidInstance; struct hv_guid *guidInstance;
int i; int i;
int fSupported=0; int fSupported=0;
...@@ -346,7 +372,7 @@ VmbusChannelOnOffer( ...@@ -346,7 +372,7 @@ VmbusChannelOnOffer(
for (i=0; i<MAX_NUM_DEVICE_CLASSES_SUPPORTED; i++) for (i=0; i<MAX_NUM_DEVICE_CLASSES_SUPPORTED; i++)
{ {
if (memcmp(&offer->Offer.InterfaceType, &gSupportedDeviceClasses[i], sizeof(GUID)) == 0) if (memcmp(&offer->Offer.InterfaceType, &gSupportedDeviceClasses[i], sizeof(struct hv_guid)) == 0)
{ {
fSupported = 1; fSupported = 1;
break; break;
...@@ -370,8 +396,14 @@ VmbusChannelOnOffer( ...@@ -370,8 +396,14 @@ VmbusChannelOnOffer(
offer->ChildRelId, offer->ChildRelId,
offer->MonitorId, offer->MonitorId,
offer->MonitorAllocated, offer->MonitorAllocated,
guidType->Data[3], guidType->Data[2], guidType->Data[1], guidType->Data[0], guidType->Data[5], guidType->Data[4], guidType->Data[7], guidType->Data[6], guidType->Data[8], guidType->Data[9], guidType->Data[10], guidType->Data[11], guidType->Data[12], guidType->Data[13], guidType->Data[14], guidType->Data[15], guidType->data[3], guidType->data[2], guidType->data[1], guidType->data[0],
guidInstance->Data[3], guidInstance->Data[2], guidInstance->Data[1], guidInstance->Data[0], guidInstance->Data[5], guidInstance->Data[4], guidInstance->Data[7], guidInstance->Data[6], guidInstance->Data[8], guidInstance->Data[9], guidInstance->Data[10], guidInstance->Data[11], guidInstance->Data[12], guidInstance->Data[13], guidInstance->Data[14], guidInstance->Data[15]); guidType->data[5], guidType->data[4], guidType->data[7], guidType->data[6],
guidType->data[8], guidType->data[9], guidType->data[10], guidType->data[11],
guidType->data[12], guidType->data[13], guidType->data[14], guidType->data[15],
guidInstance->data[3], guidInstance->data[2], guidInstance->data[1], guidInstance->data[0],
guidInstance->data[5], guidInstance->data[4], guidInstance->data[7], guidInstance->data[6],
guidInstance->data[8], guidInstance->data[9], guidInstance->data[10], guidInstance->data[11],
guidInstance->data[12], guidInstance->data[13], guidInstance->data[14], guidInstance->data[15]);
/* Allocate the channel object and save this offer. */ /* Allocate the channel object and save this offer. */
newChannel = AllocVmbusChannel(); newChannel = AllocVmbusChannel();
......
drivers/staging/hv/ChannelMgmt.h
View file @ caf26a31
...@@ -78,8 +78,8 @@ struct vmbus_channel { ...@@ -78,8 +78,8 @@ struct vmbus_channel {
struct vmbus_channel_debug_info { struct vmbus_channel_debug_info {
u32 RelId; u32 RelId;
enum vmbus_channel_state State; enum vmbus_channel_state State;
GUID InterfaceType; struct hv_guid InterfaceType;
GUID InterfaceInstance; struct hv_guid InterfaceInstance;
u32 MonitorId; u32 MonitorId;
u32 ServerMonitorPending; u32 ServerMonitorPending;
u32 ServerMonitorLatency; u32 ServerMonitorLatency;
......
drivers/staging/hv/Hv.h
View file @ caf26a31
...@@ -92,8 +92,8 @@ enum { ...@@ -92,8 +92,8 @@ enum {
/* #define VMBUS_PORT_ID 11 */ /* #define VMBUS_PORT_ID 11 */
/* 628180B8-308D-4c5e-B7DB-1BEB62E62EF4 */ /* 628180B8-308D-4c5e-B7DB-1BEB62E62EF4 */
static const GUID VMBUS_SERVICE_ID = { static const struct hv_guid VMBUS_SERVICE_ID = {
.Data = { .data = {
0xb8, 0x80, 0x81, 0x62, 0x8d, 0x30, 0x5e, 0x4c, 0xb8, 0x80, 0x81, 0x62, 0x8d, 0x30, 0x5e, 0x4c,
0xb7, 0xdb, 0x1b, 0xeb, 0x62, 0xe6, 0x2e, 0xf4 0xb7, 0xdb, 0x1b, 0xeb, 0x62, 0xe6, 0x2e, 0xf4
}, },
......
drivers/staging/hv/NetVsc.c
View file @ caf26a31
...@@ -34,8 +34,11 @@ ...@@ -34,8 +34,11 @@
static const char* gDriverName="netvsc"; static const char* gDriverName="netvsc";
/* {F8615163-DF3E-46c5-913F-F2D2F965ED0E} */ /* {F8615163-DF3E-46c5-913F-F2D2F965ED0E} */
static const GUID gNetVscDeviceType={ static const struct hv_guid gNetVscDeviceType = {
.Data = {0x63, 0x51, 0x61, 0xF8, 0x3E, 0xDF, 0xc5, 0x46, 0x91, 0x3F, 0xF2, 0xD2, 0xF9, 0x65, 0xED, 0x0E} .data = {
0x63, 0x51, 0x61, 0xF8, 0x3E, 0xDF, 0xc5, 0x46,
0x91, 0x3F, 0xF2, 0xD2, 0xF9, 0x65, 0xED, 0x0E
}
}; };
...@@ -240,7 +243,7 @@ NetVscInitialize( ...@@ -240,7 +243,7 @@ NetVscInitialize(
ASSERT(driver->RingBufferSize >= (PAGE_SIZE << 1)); ASSERT(driver->RingBufferSize >= (PAGE_SIZE << 1));
drv->name = gDriverName; drv->name = gDriverName;
memcpy(&drv->deviceType, &gNetVscDeviceType, sizeof(GUID)); memcpy(&drv->deviceType, &gNetVscDeviceType, sizeof(struct hv_guid));
/* Make sure it is set by the caller */ /* Make sure it is set by the caller */
ASSERT(driver->OnReceiveCallback); ASSERT(driver->OnReceiveCallback);
......
drivers/staging/hv/StorVsc.c
View file @ caf26a31
...@@ -87,8 +87,11 @@ typedef struct _STORVSC_DEVICE{ ...@@ -87,8 +87,11 @@ typedef struct _STORVSC_DEVICE{
static const char* gDriverName="storvsc"; static const char* gDriverName="storvsc";
/* {ba6163d9-04a1-4d29-b605-72e2ffb1dc7f} */ /* {ba6163d9-04a1-4d29-b605-72e2ffb1dc7f} */
static const GUID gStorVscDeviceType={ static const struct hv_guid gStorVscDeviceType = {
.Data = {0xd9, 0x63, 0x61, 0xba, 0xa1, 0x04, 0x29, 0x4d, 0xb6, 0x05, 0x72, 0xe2, 0xff, 0xb1, 0xdc, 0x7f} .data = {
0xd9, 0x63, 0x61, 0xba, 0xa1, 0x04, 0x29, 0x4d,
0xb6, 0x05, 0x72, 0xe2, 0xff, 0xb1, 0xdc, 0x7f
}
}; };
...@@ -270,7 +273,7 @@ StorVscInitialize( ...@@ -270,7 +273,7 @@ StorVscInitialize(
ASSERT(storDriver->RingBufferSize >= (PAGE_SIZE << 1)); ASSERT(storDriver->RingBufferSize >= (PAGE_SIZE << 1));
Driver->name = gDriverName; Driver->name = gDriverName;
memcpy(&Driver->deviceType, &gStorVscDeviceType, sizeof(GUID)); memcpy(&Driver->deviceType, &gStorVscDeviceType, sizeof(struct hv_guid));
storDriver->RequestExtSize = sizeof(STORVSC_REQUEST_EXTENSION); storDriver->RequestExtSize = sizeof(STORVSC_REQUEST_EXTENSION);
......
drivers/staging/hv/Vmbus.c
View file @ caf26a31
...@@ -37,13 +37,19 @@ static const char* gDriverName="vmbus"; ...@@ -37,13 +37,19 @@ static const char* gDriverName="vmbus";
* We defined this to be consistent with other devices * We defined this to be consistent with other devices
*/ */
/* {c5295816-f63a-4d5f-8d1a-4daf999ca185} */ /* {c5295816-f63a-4d5f-8d1a-4daf999ca185} */
static const GUID gVmbusDeviceType={ static const struct hv_guid gVmbusDeviceType = {
.Data = {0x16, 0x58, 0x29, 0xc5, 0x3a, 0xf6, 0x5f, 0x4d, 0x8d, 0x1a, 0x4d, 0xaf, 0x99, 0x9c, 0xa1, 0x85} .data = {
0x16, 0x58, 0x29, 0xc5, 0x3a, 0xf6, 0x5f, 0x4d,
0x8d, 0x1a, 0x4d, 0xaf, 0x99, 0x9c, 0xa1, 0x85
}
}; };
/* {ac3760fc-9adf-40aa-9427-a70ed6de95c5} */ /* {ac3760fc-9adf-40aa-9427-a70ed6de95c5} */
static const GUID gVmbusDeviceId={ static const struct hv_guid gVmbusDeviceId = {
.Data = {0xfc, 0x60, 0x37, 0xac, 0xdf, 0x9a, 0xaa, 0x40, 0x94, 0x27, 0xa7, 0x0e, 0xd6, 0xde, 0x95, 0xc5} .data = {
0xfc, 0x60, 0x37, 0xac, 0xdf, 0x9a, 0xaa, 0x40,
0x94, 0x27, 0xa7, 0x0e, 0xd6, 0xde, 0x95, 0xc5
}
}; };
static struct hv_driver *gDriver; /* vmbus driver object */ static struct hv_driver *gDriver; /* vmbus driver object */
...@@ -130,7 +136,7 @@ VmbusInitialize( ...@@ -130,7 +136,7 @@ VmbusInitialize(
sizeof(struct VMBUS_CHANNEL_PACKET_PAGE_BUFFER), sizeof(struct VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER)); sizeof(struct VMBUS_CHANNEL_PACKET_PAGE_BUFFER), sizeof(struct VMBUS_CHANNEL_PACKET_MULITPAGE_BUFFER));
drv->name = gDriverName; drv->name = gDriverName;
memcpy(&drv->deviceType, &gVmbusDeviceType, sizeof(GUID)); memcpy(&drv->deviceType, &gVmbusDeviceType, sizeof(struct hv_guid));
/* Setup dispatch table */ /* Setup dispatch table */
driver->Base.OnDeviceAdd = VmbusOnDeviceAdd; driver->Base.OnDeviceAdd = VmbusOnDeviceAdd;
...@@ -225,8 +231,8 @@ Description: ...@@ -225,8 +231,8 @@ Description:
--*/ --*/
struct hv_device *VmbusChildDeviceCreate(GUID DeviceType, struct hv_device *VmbusChildDeviceCreate(struct hv_guid DeviceType,
GUID DeviceInstance, struct hv_guid DeviceInstance,
void *Context) void *Context)
{ {
VMBUS_DRIVER_OBJECT* vmbusDriver = (VMBUS_DRIVER_OBJECT*)gDriver; VMBUS_DRIVER_OBJECT* vmbusDriver = (VMBUS_DRIVER_OBJECT*)gDriver;
...@@ -315,8 +321,8 @@ VmbusOnDeviceAdd( ...@@ -315,8 +321,8 @@ VmbusOnDeviceAdd(
gDevice = dev; gDevice = dev;
memcpy(&gDevice->deviceType, &gVmbusDeviceType, sizeof(GUID)); memcpy(&gDevice->deviceType, &gVmbusDeviceType, sizeof(struct hv_guid));
memcpy(&gDevice->deviceInstance, &gVmbusDeviceId, sizeof(GUID)); memcpy(&gDevice->deviceInstance, &gVmbusDeviceId, sizeof(struct hv_guid));
/* strcpy(dev->name, "vmbus"); */ /* strcpy(dev->name, "vmbus"); */
/* SynIC setup... */ /* SynIC setup... */
......
drivers/staging/hv/VmbusPrivate.h
View file @ caf26a31
...@@ -103,8 +103,8 @@ extern struct VMBUS_CONNECTION gVmbusConnection; ...@@ -103,8 +103,8 @@ extern struct VMBUS_CONNECTION gVmbusConnection;
/* General vmbus interface */ /* General vmbus interface */
struct hv_device *VmbusChildDeviceCreate(GUID deviceType, struct hv_device *VmbusChildDeviceCreate(struct hv_guid deviceType,
GUID deviceInstance, struct hv_guid deviceInstance,
void *context); void *context);
int VmbusChildDeviceAdd(struct hv_device *Device); int VmbusChildDeviceAdd(struct hv_device *Device);
......
drivers/staging/hv/blkvsc_drv.c
View file @ caf26a31
...@@ -186,7 +186,7 @@ static int blkvsc_drv_init(PFN_DRIVERINITIALIZE pfn_drv_init) ...@@ -186,7 +186,7 @@ static int blkvsc_drv_init(PFN_DRIVERINITIALIZE pfn_drv_init)
pfn_drv_init(&storvsc_drv_obj->Base); pfn_drv_init(&storvsc_drv_obj->Base);
drv_ctx->driver.name = storvsc_drv_obj->Base.name; drv_ctx->driver.name = storvsc_drv_obj->Base.name;
memcpy(&drv_ctx->class_id, &storvsc_drv_obj->Base.deviceType, sizeof(GUID)); memcpy(&drv_ctx->class_id, &storvsc_drv_obj->Base.deviceType, sizeof(struct hv_guid));
drv_ctx->probe = blkvsc_probe; drv_ctx->probe = blkvsc_probe;
drv_ctx->remove = blkvsc_remove; drv_ctx->remove = blkvsc_remove;
......
drivers/staging/hv/include/List.h
View file @ caf26a31
...@@ -32,15 +32,10 @@ ...@@ -32,15 +32,10 @@
* *
*/ */
typedef DLIST_ENTRY LIST_ENTRY; typedef struct _LIST_ENTRY {
typedef DLIST_ENTRY *PLIST_ENTRY; struct _LIST_ENTRY *Flink;
struct _LIST_ENTRY *Blink;
/* typedef struct LIST_ENTRY { */ } LIST_ENTRY, *PLIST_ENTRY;
/* struct LIST_ENTRY * volatile Flink; */
/* struct LIST_ENTRY * volatile Blink; */
/* } LIST_ENTRY, *PLIST_ENTRY; */
/* /*
* void * void
......
drivers/staging/hv/include/NetVscApi.h
View file @ caf26a31
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#define _NETVSC_API_H_ #define _NETVSC_API_H_
#include "VmbusApi.h" #include "VmbusApi.h"
#include "List.h"
/* Defines */ /* Defines */
...@@ -56,7 +56,7 @@ typedef void (*PFN_ON_LINKSTATUS_CHANGED)(struct hv_device *dev, u32 Status); ...@@ -56,7 +56,7 @@ typedef void (*PFN_ON_LINKSTATUS_CHANGED)(struct hv_device *dev, u32 Status);
/* Represent the xfer page packet which contains 1 or more netvsc packet */ /* Represent the xfer page packet which contains 1 or more netvsc packet */
typedef struct _XFERPAGE_PACKET { typedef struct _XFERPAGE_PACKET {
DLIST_ENTRY ListEntry; LIST_ENTRY ListEntry;
/* # of netvsc packets this xfer packet contains */ /* # of netvsc packets this xfer packet contains */
u32 Count; u32 Count;
...@@ -72,7 +72,7 @@ typedef struct _XFERPAGE_PACKET { ...@@ -72,7 +72,7 @@ typedef struct _XFERPAGE_PACKET {
*/ */
struct hv_netvsc_packet { struct hv_netvsc_packet {
/* Bookkeeping stuff */ /* Bookkeeping stuff */
DLIST_ENTRY ListEntry; LIST_ENTRY ListEntry;
struct hv_device *Device; struct hv_device *Device;
bool IsDataPacket; bool IsDataPacket;
......
drivers/staging/hv/include/VmbusApi.h
View file @ caf26a31
...@@ -76,7 +76,7 @@ typedef int (*PFN_ON_ISR)(struct hv_driver *drv); ...@@ -76,7 +76,7 @@ typedef int (*PFN_ON_ISR)(struct hv_driver *drv);
typedef void (*PFN_ON_DPC)(struct hv_driver *drv); typedef void (*PFN_ON_DPC)(struct hv_driver *drv);
typedef void (*PFN_GET_CHANNEL_OFFERS)(void); typedef void (*PFN_GET_CHANNEL_OFFERS)(void);
typedef struct hv_device *(*PFN_ON_CHILDDEVICE_CREATE)(GUID DeviceType, GUID DeviceInstance, void *Context); typedef struct hv_device *(*PFN_ON_CHILDDEVICE_CREATE)(struct hv_guid DeviceType, struct hv_guid DeviceInstance, void *Context);
typedef void (*PFN_ON_CHILDDEVICE_DESTROY)(struct hv_device *Device); typedef void (*PFN_ON_CHILDDEVICE_DESTROY)(struct hv_device *Device);
typedef int (*PFN_ON_CHILDDEVICE_ADD)(struct hv_device *RootDevice, struct hv_device *ChildDevice); typedef int (*PFN_ON_CHILDDEVICE_ADD)(struct hv_device *RootDevice, struct hv_device *ChildDevice);
typedef void (*PFN_ON_CHILDDEVICE_REMOVE)(struct hv_device *Device); typedef void (*PFN_ON_CHILDDEVICE_REMOVE)(struct hv_device *Device);
...@@ -165,8 +165,8 @@ typedef struct _PORT_INFO { ...@@ -165,8 +165,8 @@ typedef struct _PORT_INFO {
typedef struct _DEVICE_INFO { typedef struct _DEVICE_INFO {
u32 ChannelId; u32 ChannelId;
u32 ChannelState; u32 ChannelState;
GUID ChannelType; struct hv_guid ChannelType;
GUID ChannelInstance; struct hv_guid ChannelInstance;
u32 MonitorId; u32 MonitorId;
u32 ServerMonitorPending; u32 ServerMonitorPending;
...@@ -200,7 +200,7 @@ typedef void (*VMBUS_GET_CHANNEL_INTERFACE)(VMBUS_CHANNEL_INTERFACE *Interface); ...@@ -200,7 +200,7 @@ typedef void (*VMBUS_GET_CHANNEL_INTERFACE)(VMBUS_CHANNEL_INTERFACE *Interface);
/* Base driver object */ /* Base driver object */
struct hv_driver { struct hv_driver {
const char* name; const char* name;
GUID deviceType; /* the device type supported by this driver */ struct hv_guid deviceType; /* the device type supported by this driver */
PFN_ON_DEVICEADD OnDeviceAdd; PFN_ON_DEVICEADD OnDeviceAdd;
PFN_ON_DEVICEREMOVE OnDeviceRemove; PFN_ON_DEVICEREMOVE OnDeviceRemove;
...@@ -215,8 +215,8 @@ struct hv_driver { ...@@ -215,8 +215,8 @@ struct hv_driver {
struct hv_device { struct hv_device {
struct hv_driver *Driver; /* the driver for this device */ struct hv_driver *Driver; /* the driver for this device */
char name[64]; char name[64];
GUID deviceType; /* the device type id of this device */ struct hv_guid deviceType; /* the device type id of this device */
GUID deviceInstance; /* the device instance id of this device */ struct hv_guid deviceInstance; /* the device instance id of this device */
void* context; void* context;
void* Extension; /* Device extension; */ void* Extension; /* Device extension; */
}; };
......
drivers/staging/hv/include/VmbusChannelInterface.h
View file @ caf26a31
...@@ -64,8 +64,8 @@ ...@@ -64,8 +64,8 @@
typedef struct typedef struct
{ {
GUID InterfaceType; struct hv_guid InterfaceType;
GUID InterfaceInstance; struct hv_guid InterfaceInstance;
u64 InterruptLatencyIn100nsUnits; u64 InterruptLatencyIn100nsUnits;
u32 InterfaceRevision; u32 InterfaceRevision;
u32 ServerContextAreaSize; /* in bytes */ u32 ServerContextAreaSize; /* in bytes */
......
drivers/staging/hv/include/vmbus.h
View file @ caf26a31
...@@ -37,7 +37,7 @@ typedef int (*PFN_DRIVERINITIALIZE)(struct hv_driver *drv); ...@@ -37,7 +37,7 @@ typedef int (*PFN_DRIVERINITIALIZE)(struct hv_driver *drv);
typedef int (*PFN_DRIVEREXIT)(struct hv_driver *drv); typedef int (*PFN_DRIVEREXIT)(struct hv_driver *drv);
struct driver_context { struct driver_context {
GUID class_id; struct hv_guid class_id;
struct device_driver driver; struct device_driver driver;
...@@ -49,8 +49,8 @@ struct driver_context { ...@@ -49,8 +49,8 @@ struct driver_context {
struct device_context { struct device_context {
struct work_struct probe_failed_work_item; struct work_struct probe_failed_work_item;
GUID class_id; struct hv_guid class_id;
GUID device_id; struct hv_guid device_id;
int probe_error; int probe_error;
struct device device; struct device device;
struct hv_device device_obj; struct hv_device device_obj;
......
drivers/staging/hv/netvsc_drv.c
View file @ caf26a31
...@@ -109,7 +109,7 @@ static int netvsc_drv_init(PFN_DRIVERINITIALIZE pfn_drv_init) ...@@ -109,7 +109,7 @@ static int netvsc_drv_init(PFN_DRIVERINITIALIZE pfn_drv_init)
pfn_drv_init(&net_drv_obj->Base); pfn_drv_init(&net_drv_obj->Base);
drv_ctx->driver.name = net_drv_obj->Base.name; drv_ctx->driver.name = net_drv_obj->Base.name;
memcpy(&drv_ctx->class_id, &net_drv_obj->Base.deviceType, sizeof(GUID)); memcpy(&drv_ctx->class_id, &net_drv_obj->Base.deviceType, sizeof(struct hv_guid));
drv_ctx->probe = netvsc_probe; drv_ctx->probe = netvsc_probe;
drv_ctx->remove = netvsc_remove; drv_ctx->remove = netvsc_remove;
......
drivers/staging/hv/osd.h
View file @ caf26a31
...@@ -38,14 +38,9 @@ ...@@ -38,14 +38,9 @@
#define LOWORD(dw) ((unsigned short)(dw)) #define LOWORD(dw) ((unsigned short)(dw))
#define HIWORD(dw) ((unsigned short)(((unsigned int) (dw) >> 16) & 0xFFFF)) #define HIWORD(dw) ((unsigned short)(((unsigned int) (dw) >> 16) & 0xFFFF))
typedef struct _DLIST_ENTRY { struct hv_guid {
struct _DLIST_ENTRY *Flink; unsigned char data[16];
struct _DLIST_ENTRY *Blink; };
} DLIST_ENTRY;
typedef struct {
unsigned char Data[16];
} GUID;
struct osd_waitevent { struct osd_waitevent {
int condition; int condition;
......
drivers/staging/hv/storvsc_drv.c
View file @ caf26a31
...@@ -156,7 +156,7 @@ static int storvsc_drv_init(PFN_DRIVERINITIALIZE pfn_drv_init) ...@@ -156,7 +156,7 @@ static int storvsc_drv_init(PFN_DRIVERINITIALIZE pfn_drv_init)
} }
drv_ctx->driver.name = storvsc_drv_obj->Base.name; drv_ctx->driver.name = storvsc_drv_obj->Base.name;
memcpy(&drv_ctx->class_id, &storvsc_drv_obj->Base.deviceType, sizeof(GUID)); memcpy(&drv_ctx->class_id, &storvsc_drv_obj->Base.deviceType, sizeof(struct hv_guid));
drv_ctx->probe = storvsc_probe; drv_ctx->probe = storvsc_probe;
drv_ctx->remove = storvsc_remove; drv_ctx->remove = storvsc_remove;
......
drivers/staging/hv/vmbus_drv.c
View file @ caf26a31
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment