diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-20 15:02:00 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-07-20 15:02:00 -0400 |
commit | ab2b8c7383caf6b071930e4e1d4a8b4bf1708f38 (patch) | |
tree | 96d542a4936b338250a0f1232ec773862993f697 /drivers/staging/csr/csr_wifi_hip_sigs.h | |
parent | 8c87f69acf942222d8e2ead6d0ca144957141284 (diff) |
staging: csr: remove CsrInt16 typedef
Use the in-kernel s16 type instead.
Cc: Mikko Virkkilä <mikko.virkkila@bluegiga.com>
Cc: Lauri Hintsala <Lauri.Hintsala@bluegiga.com>
Cc: Riku Mettälä <riku.mettala@bluegiga.com>
Cc: Veli-Pekka Peltola <veli-pekka.peltola@bluegiga.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/csr/csr_wifi_hip_sigs.h')
-rw-r--r-- | drivers/staging/csr/csr_wifi_hip_sigs.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/staging/csr/csr_wifi_hip_sigs.h b/drivers/staging/csr/csr_wifi_hip_sigs.h index a649e14dc70..d9c9d1ed45c 100644 --- a/drivers/staging/csr/csr_wifi_hip_sigs.h +++ b/drivers/staging/csr/csr_wifi_hip_sigs.h | |||
@@ -20,7 +20,7 @@ | |||
20 | extern "C" { | 20 | extern "C" { |
21 | #endif | 21 | #endif |
22 | 22 | ||
23 | typedef CsrInt16 csr_place_holding_type; | 23 | typedef s16 csr_place_holding_type; |
24 | 24 | ||
25 | typedef u16 CSR_ASSOCIATION_ID; | 25 | typedef u16 CSR_ASSOCIATION_ID; |
26 | 26 | ||
@@ -71,7 +71,7 @@ typedef enum CSR_CONNECTION_STATUS | |||
71 | CSR_CONNECTED_AWAKE = 0x0001 | 71 | CSR_CONNECTED_AWAKE = 0x0001 |
72 | } CSR_CONNECTION_STATUS; | 72 | } CSR_CONNECTION_STATUS; |
73 | 73 | ||
74 | typedef CsrInt16 CSR_DECIBELS; | 74 | typedef s16 CSR_DECIBELS; |
75 | 75 | ||
76 | typedef enum CSR_DIRECTION | 76 | typedef enum CSR_DIRECTION |
77 | { | 77 | { |
@@ -542,7 +542,7 @@ typedef struct CSR_MLME_RESET_REQUEST | |||
542 | CSR_DATAREF Dummydataref1; | 542 | CSR_DATAREF Dummydataref1; |
543 | CSR_DATAREF Dummydataref2; | 543 | CSR_DATAREF Dummydataref2; |
544 | CSR_MACADDRESS StaAddress; | 544 | CSR_MACADDRESS StaAddress; |
545 | CsrInt16 SetDefaultMib; | 545 | s16 SetDefaultMib; |
546 | } CSR_MLME_RESET_REQUEST; | 546 | } CSR_MLME_RESET_REQUEST; |
547 | 547 | ||
548 | typedef struct CSR_MLME_SET_CONFIRM | 548 | typedef struct CSR_MLME_SET_CONFIRM |
@@ -582,7 +582,7 @@ typedef u16 CSR_SEQUENCE_NUMBER; | |||
582 | 582 | ||
583 | typedef struct CSR_SIGNAL_PRIMITIVE_HEADER | 583 | typedef struct CSR_SIGNAL_PRIMITIVE_HEADER |
584 | { | 584 | { |
585 | CsrInt16 SignalId; | 585 | s16 SignalId; |
586 | CSR_PROCESS_ID ReceiverProcessId; | 586 | CSR_PROCESS_ID ReceiverProcessId; |
587 | CSR_PROCESS_ID SenderProcessId; | 587 | CSR_PROCESS_ID SenderProcessId; |
588 | } CSR_SIGNAL_PRIMITIVE_HEADER; | 588 | } CSR_SIGNAL_PRIMITIVE_HEADER; |
@@ -685,7 +685,7 @@ typedef struct CSR_MA_VIF_AVAILABILITY_INDICATION | |||
685 | CSR_DATAREF Dummydataref1; | 685 | CSR_DATAREF Dummydataref1; |
686 | CSR_DATAREF Dummydataref2; | 686 | CSR_DATAREF Dummydataref2; |
687 | CSR_VIF_IDENTIFIER VirtualInterfaceIdentifier; | 687 | CSR_VIF_IDENTIFIER VirtualInterfaceIdentifier; |
688 | CsrInt16 Multicast; | 688 | s16 Multicast; |
689 | } CSR_MA_VIF_AVAILABILITY_INDICATION; | 689 | } CSR_MA_VIF_AVAILABILITY_INDICATION; |
690 | 690 | ||
691 | typedef struct CSR_MA_VIF_AVAILABILITY_RESPONSE | 691 | typedef struct CSR_MA_VIF_AVAILABILITY_RESPONSE |
@@ -776,7 +776,7 @@ typedef struct CSR_MLME_ADD_PERIODIC_REQUEST | |||
776 | CSR_PERIODIC_ID PeriodicId; | 776 | CSR_PERIODIC_ID PeriodicId; |
777 | CSR_MICROSECONDS32 MaximumLatency; | 777 | CSR_MICROSECONDS32 MaximumLatency; |
778 | CSR_PERIODIC_SCHEDULING_MODE PeriodicSchedulingMode; | 778 | CSR_PERIODIC_SCHEDULING_MODE PeriodicSchedulingMode; |
779 | CsrInt16 WakeHost; | 779 | s16 WakeHost; |
780 | CSR_PRIORITY UserPriority; | 780 | CSR_PRIORITY UserPriority; |
781 | } CSR_MLME_ADD_PERIODIC_REQUEST; | 781 | } CSR_MLME_ADD_PERIODIC_REQUEST; |
782 | 782 | ||
@@ -1108,7 +1108,7 @@ typedef struct CSR_MLME_PAUSE_AUTONOMOUS_SCAN_REQUEST | |||
1108 | CSR_DATAREF Dummydataref2; | 1108 | CSR_DATAREF Dummydataref2; |
1109 | CSR_VIF_IDENTIFIER VirtualInterfaceIdentifier; | 1109 | CSR_VIF_IDENTIFIER VirtualInterfaceIdentifier; |
1110 | CSR_AUTONOMOUS_SCAN_ID AutonomousScanId; | 1110 | CSR_AUTONOMOUS_SCAN_ID AutonomousScanId; |
1111 | CsrInt16 Pause; | 1111 | s16 Pause; |
1112 | } CSR_MLME_PAUSE_AUTONOMOUS_SCAN_REQUEST; | 1112 | } CSR_MLME_PAUSE_AUTONOMOUS_SCAN_REQUEST; |
1113 | 1113 | ||
1114 | typedef struct CSR_MLME_POWERMGT_CONFIRM | 1114 | typedef struct CSR_MLME_POWERMGT_CONFIRM |
@@ -1125,7 +1125,7 @@ typedef struct CSR_MLME_POWERMGT_REQUEST | |||
1125 | CSR_DATAREF Dummydataref2; | 1125 | CSR_DATAREF Dummydataref2; |
1126 | CSR_VIF_IDENTIFIER VirtualInterfaceIdentifier; | 1126 | CSR_VIF_IDENTIFIER VirtualInterfaceIdentifier; |
1127 | CSR_POWER_MANAGEMENT_MODE PowerManagementMode; | 1127 | CSR_POWER_MANAGEMENT_MODE PowerManagementMode; |
1128 | CsrInt16 ReceiveDtims; | 1128 | s16 ReceiveDtims; |
1129 | CSR_BEACON_PERIODS ListenInterval; | 1129 | CSR_BEACON_PERIODS ListenInterval; |
1130 | CSR_TRAFFIC_WINDOW TrafficWindow; | 1130 | CSR_TRAFFIC_WINDOW TrafficWindow; |
1131 | } CSR_MLME_POWERMGT_REQUEST; | 1131 | } CSR_MLME_POWERMGT_REQUEST; |
@@ -1229,7 +1229,7 @@ typedef struct CSR_MLME_SET_TIM_REQUEST | |||
1229 | CSR_DATAREF Dummydataref2; | 1229 | CSR_DATAREF Dummydataref2; |
1230 | CSR_VIF_IDENTIFIER VirtualInterfaceIdentifier; | 1230 | CSR_VIF_IDENTIFIER VirtualInterfaceIdentifier; |
1231 | CSR_ASSOCIATION_ID AssociationId; | 1231 | CSR_ASSOCIATION_ID AssociationId; |
1232 | CsrInt16 TimValue; | 1232 | s16 TimValue; |
1233 | } CSR_MLME_SET_TIM_REQUEST; | 1233 | } CSR_MLME_SET_TIM_REQUEST; |
1234 | 1234 | ||
1235 | typedef struct CSR_MLME_SM_START_CONFIRM | 1235 | typedef struct CSR_MLME_SM_START_CONFIRM |