---

yaml --- r: 162223 b: refs/heads/master c: eacb1b4 h: refs/heads/master i: 162221: 8643f77 162219: 4cab4b9 162215: f498c61 162207: 7c607e3 v: v3
git-mirror · Sep 15, 2009 · fbba53c · fbba53c
1 parent 1d2c690
commit fbba53c
Show file tree

Hide file tree

Showing 9 changed files with 91 additions and 101 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c786a84e9c7a3a342cda0aa19831417a64383444
+refs/heads/master: eacb1b4d24c2a8b7c1d73bb72e04920980ec8a4f
diff --git a/trunk/drivers/staging/hv/Channel.c b/trunk/drivers/staging/hv/Channel.c
@@ -42,7 +42,7 @@ static void VmbusChannelSetEvent(struct vmbus_channel *channel);
 #if 0
 static void
 DumpMonitorPage(
-	HV_MONITOR_PAGE *MonitorPage
+	struct hv_monitor_page *MonitorPage
 	)
 {
 	int i=0;
@@ -85,7 +85,7 @@ DumpMonitorPage(
 --*/
 static void VmbusChannelSetEvent(struct vmbus_channel *Channel)
 {
-	HV_MONITOR_PAGE *monitorPage;
+	struct hv_monitor_page *monitorPage;
 
 	DPRINT_ENTER(VMBUS);
 
@@ -96,7 +96,7 @@ static void VmbusChannelSetEvent(struct vmbus_channel *Channel)
 			(unsigned long *) gVmbusConnection.SendInterruptPage +
 			(Channel->OfferMsg.ChildRelId >> 5) );
 
-		monitorPage = (HV_MONITOR_PAGE*)gVmbusConnection.MonitorPages;
+		monitorPage = (struct hv_monitor_page *)gVmbusConnection.MonitorPages;
 		monitorPage++; /* Get the child to parent monitor page */
 
 		set_bit(Channel->MonitorBit,
@@ -114,7 +114,7 @@ static void VmbusChannelSetEvent(struct vmbus_channel *Channel)
 #if 0
 static void VmbusChannelClearEvent(struct vmbus_channel *channel)
 {
-	HV_MONITOR_PAGE *monitorPage;
+	struct hv_monitor_page *monitorPage;
 
 	DPRINT_ENTER(VMBUS);
 
@@ -124,7 +124,7 @@ static void VmbusChannelClearEvent(struct vmbus_channel *channel)
 		clear_bit(Channel->OfferMsg.ChildRelId & 31,
 			  (unsigned long *) gVmbusConnection.SendInterruptPage + (Channel->OfferMsg.ChildRelId >> 5));
 
-		monitorPage = (HV_MONITOR_PAGE*)gVmbusConnection.MonitorPages;
+		monitorPage = (struct hv_monitor_page *)gVmbusConnection.MonitorPages;
 		monitorPage++; /* Get the child to parent monitor page */
 
 		clear_bit(Channel->MonitorBit,
@@ -147,7 +147,7 @@ static void VmbusChannelClearEvent(struct vmbus_channel *channel)
 void VmbusChannelGetDebugInfo(struct vmbus_channel *Channel,
 			      struct vmbus_channel_debug_info *DebugInfo)
 {
-	HV_MONITOR_PAGE *monitorPage;
+	struct hv_monitor_page *monitorPage;
     u8 monitorGroup    = (u8)Channel->OfferMsg.MonitorId / 32;
     u8 monitorOffset   = (u8)Channel->OfferMsg.MonitorId % 32;
 	/* u32 monitorBit	= 1 << monitorOffset; */
@@ -157,7 +157,7 @@ void VmbusChannelGetDebugInfo(struct vmbus_channel *Channel,
 	memcpy(&DebugInfo->InterfaceType, &Channel->OfferMsg.Offer.InterfaceType, sizeof(struct hv_guid));
 	memcpy(&DebugInfo->InterfaceInstance, &Channel->OfferMsg.Offer.InterfaceInstance, sizeof(struct hv_guid));
 
-	monitorPage = (HV_MONITOR_PAGE*)gVmbusConnection.MonitorPages;
+	monitorPage = (struct hv_monitor_page *)gVmbusConnection.MonitorPages;
 
 	DebugInfo->MonitorId = Channel->OfferMsg.MonitorId;
 

diff --git a/trunk/drivers/staging/hv/ChannelMgmt.c b/trunk/drivers/staging/hv/ChannelMgmt.c
@@ -701,7 +701,7 @@ VmbusChannelOnVersionResponse(
 --*/
 void VmbusOnChannelMessage(void *Context)
 {
-	HV_MESSAGE *msg=(HV_MESSAGE*)Context;
+	struct hv_message *msg = Context;
 	VMBUS_CHANNEL_MESSAGE_HEADER* hdr;
 	int size;
 

diff --git a/trunk/drivers/staging/hv/Connection.c b/trunk/drivers/staging/hv/Connection.c
@@ -390,7 +390,7 @@ void VmbusOnEvents(void)
 int VmbusPostMessage(void *buffer, size_t bufferLen)
 {
 	int ret=0;
-	HV_CONNECTION_ID connId;
+	union hv_connection_id connId;
 
 
 	connId.Asu32 =0;

diff --git a/trunk/drivers/staging/hv/Hv.c b/trunk/drivers/staging/hv/Hv.c
@@ -385,8 +385,8 @@ void HvCleanup (void)
 
 --*/
 HV_STATUS HvPostMessage(
-	HV_CONNECTION_ID connectionId,
-	HV_MESSAGE_TYPE  messageType,
+	union hv_connection_id connectionId,
+	enum hv_message_type messageType,
 	void *            payload,
 	size_t           payloadSize
 	)
@@ -461,10 +461,10 @@ HV_STATUS HvSignalEvent(void)
 int HvSynicInit (u32 irqVector)
 {
 	u64			version;
-	HV_SYNIC_SIMP	simp;
-	HV_SYNIC_SIEFP	siefp;
-    HV_SYNIC_SINT	sharedSint;
-	HV_SYNIC_SCONTROL sctrl;
+	union hv_synic_simp simp;
+	union hv_synic_siefp siefp;
+	union hv_synic_sint sharedSint;
+	union hv_synic_scontrol sctrl;
 	u64			guestID;
 	int ret=0;
 
@@ -600,9 +600,9 @@ int HvSynicInit (u32 irqVector)
 --*/
 void HvSynicCleanup(void)
 {
-    HV_SYNIC_SINT	sharedSint;
-	HV_SYNIC_SIMP	simp;
-	HV_SYNIC_SIEFP	siefp;
+	union hv_synic_sint sharedSint;
+	union hv_synic_simp simp;
+	union hv_synic_siefp siefp;
 
 	DPRINT_ENTER(VMBUS);
 

diff --git a/trunk/drivers/staging/hv/Hv.h b/trunk/drivers/staging/hv/Hv.h
@@ -135,8 +135,8 @@ extern int HvInit(void);
 
 extern void HvCleanup(void);
 
-extern HV_STATUS HvPostMessage(HV_CONNECTION_ID connectionId,
-			       HV_MESSAGE_TYPE messageType,
+extern HV_STATUS HvPostMessage(union hv_connection_id connectionId,
+			       enum hv_message_type messageType,
 			       void *payload,
 			       size_t payloadSize);
 

diff --git a/trunk/drivers/staging/hv/Vmbus.c b/trunk/drivers/staging/hv/Vmbus.c
@@ -407,8 +407,8 @@ VmbusOnMsgDPC(
 {
 	void *page_addr = gHvContext.synICMessagePage[0];
 
-	HV_MESSAGE* msg = (HV_MESSAGE*)page_addr + VMBUS_MESSAGE_SINT;
-	HV_MESSAGE *copied;
+	struct hv_message *msg = (struct hv_message *)page_addr + VMBUS_MESSAGE_SINT;
+	struct hv_message *copied;
 	while (1)
 	{
 		if (msg->Header.MessageType == HvMessageTypeNone) /* no msg */
@@ -417,13 +417,13 @@ VmbusOnMsgDPC(
 		}
 		else
 		{
-			copied = kmalloc(sizeof(HV_MESSAGE), GFP_ATOMIC);
+			copied = kmalloc(sizeof(*copied), GFP_ATOMIC);
 			if (copied == NULL)
 			{
 				continue;
 			}
 
-			memcpy(copied, msg, sizeof(HV_MESSAGE));
+			memcpy(copied, msg, sizeof(*copied));
 			osd_schedule_callback(gVmbusConnection.WorkQueue,
 					      VmbusOnChannelMessage,
 					      (void *)copied);
@@ -490,13 +490,13 @@ VmbusOnISR(
 	int ret=0;
 	/* struct page* page; */
 	void *page_addr;
-	HV_MESSAGE* msg;
-	HV_SYNIC_EVENT_FLAGS* event;
+	struct hv_message *msg;
+	union hv_synic_event_flags *event;
 
 	/* page = SynICMessagePage[0]; */
 	/* page_addr = page_address(page); */
 	page_addr = gHvContext.synICMessagePage[0];
-	msg = (HV_MESSAGE*)page_addr + VMBUS_MESSAGE_SINT;
+	msg = (struct hv_message *)page_addr + VMBUS_MESSAGE_SINT;
 
 	DPRINT_ENTER(VMBUS);
 
@@ -509,7 +509,7 @@ VmbusOnISR(
 
 	/* TODO: Check if there are events to be process */
 	page_addr = gHvContext.synICEventPage[0];
-	event = (HV_SYNIC_EVENT_FLAGS*)page_addr + VMBUS_MESSAGE_SINT;
+	event = (union hv_synic_event_flags *)page_addr + VMBUS_MESSAGE_SINT;
 
 	/* Since we are a child, we only need to check bit 0 */
 	if (test_and_clear_bit(0, (unsigned long *) &event->Flags32[0]))

diff --git a/trunk/drivers/staging/hv/include/HvHcApi.h b/trunk/drivers/staging/hv/include/HvHcApi.h
@@ -32,16 +32,16 @@ enum hv_call_code {
 
 /* Definition of the HvPostMessage hypercall input structure. */
 struct hv_input_post_message {
-	HV_CONNECTION_ID ConnectionId;
+	union hv_connection_id ConnectionId;
 	u32 Reserved;
-	HV_MESSAGE_TYPE MessageType;
+	enum hv_message_type MessageType;
 	u32 PayloadSize;
 	u64 Payload[HV_MESSAGE_PAYLOAD_QWORD_COUNT];
 };
 
 /* Definition of the HvSignalEvent hypercall input structure. */
 struct hv_input_signal_event {
-	HV_CONNECTION_ID ConnectionId;
+	union hv_connection_id ConnectionId;
 	u16 FlagNumber;
 	u16 RsvdZ;
 };