Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 236247
b: refs/heads/master
c: 0ce815d
h: refs/heads/master
i:
  236245: 867e44f
  236243: ffbb6f6
  236239: 086792d
v: v3
  • Loading branch information
Greg Kroah-Hartman committed Mar 3, 2011
1 parent 07d9b19 commit d2c9703
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 32ad38f7d529c31566533bb9433b8d1bf1a04ec1
refs/heads/master: 0ce815d54e55611e1567e17c08f57d1b2e0ab0d9
26 changes: 13 additions & 13 deletions trunk/drivers/staging/hv/hv_mouse.c
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ struct synthhid_msg_hdr {
};

struct synthhid_msg {
struct synthhid_msg_hdr Header;
struct synthhid_msg_hdr header;
char Data[1]; /* Enclosed message */
};

Expand All @@ -105,29 +105,29 @@ union synthhid_version {
* Protocol messages
*/
struct synthhid_protocol_request {
struct synthhid_msg_hdr Header;
struct synthhid_msg_hdr header;
union synthhid_version VersionRequested;
};

struct synthhid_protocol_response {
struct synthhid_msg_hdr Header;
struct synthhid_msg_hdr header;
union synthhid_version VersionRequested;
unsigned char Approved;
};

struct synthhid_device_info {
struct synthhid_msg_hdr Header;
struct synthhid_msg_hdr header;
struct hv_input_dev_info HidDeviceAttributes;
unsigned char HidDescriptorInformation[1];
};

struct synthhid_device_info_ack {
struct synthhid_msg_hdr Header;
struct synthhid_msg_hdr header;
unsigned char Reserved;
};

struct synthhid_input_report {
struct synthhid_msg_hdr Header;
struct synthhid_msg_hdr header;
char ReportBuffer[1];
};

Expand Down Expand Up @@ -386,8 +386,8 @@ static void MousevscOnReceiveDeviceInfo(struct mousevsc_dev *InputDevice, struct
ack.PacketType = PipeMessageData;
ack.DataSize = sizeof(struct synthhid_device_info_ack);

ack.u.Ack.Header.type = SynthHidInitialDeviceInfoAck;
ack.u.Ack.Header.size = 1;
ack.u.Ack.header.type = SynthHidInitialDeviceInfoAck;
ack.u.Ack.header.size = 1;
ack.u.Ack.Reserved = 0;

ret = vmbus_sendpacket(InputDevice->Device->channel,
Expand Down Expand Up @@ -437,7 +437,7 @@ static void MousevscOnReceiveInputReport(struct mousevsc_dev *InputDevice, struc

inputreport_callback(InputDevice->Device,
InputReport->ReportBuffer,
InputReport->Header.size);
InputReport->header.size);
}

static void MousevscOnReceive(struct hv_device *Device, struct vmpacket_descriptor *Packet)
Expand All @@ -463,7 +463,7 @@ static void MousevscOnReceive(struct hv_device *Device, struct vmpacket_descript

hidMsg = (struct synthhid_msg *)&pipeMsg->Data[0];

switch (hidMsg->Header.type) {
switch (hidMsg->header.type) {
case SynthHidProtocolResponse:
memcpy(&inputDevice->ProtocolResp, pipeMsg, pipeMsg->DataSize+sizeof(struct pipe_prt_msg) - sizeof(unsigned char));
inputDevice->protocol_wait_condition = 1;
Expand All @@ -487,7 +487,7 @@ static void MousevscOnReceive(struct hv_device *Device, struct vmpacket_descript
break;
default:
pr_err("unsupported hid msg type - type %d len %d",
hidMsg->Header.type, hidMsg->Header.size);
hidMsg->header.type, hidMsg->header.size);
break;
}

Expand Down Expand Up @@ -609,8 +609,8 @@ static int MousevscConnectToVsp(struct hv_device *Device)
request->PacketType = PipeMessageData;
request->DataSize = sizeof(struct synthhid_protocol_request);

request->u.Request.Header.type = SynthHidProtocolRequest;
request->u.Request.Header.size = sizeof(unsigned long);
request->u.Request.header.type = SynthHidProtocolRequest;
request->u.Request.header.size = sizeof(unsigned long);
request->u.Request.VersionRequested.AsDWord =
SYNTHHID_INPUT_VERSION_DWORD;

Expand Down

0 comments on commit d2c9703

Please sign in to comment.