Skip to content

Commit 63d8e4e

Browse files
GoldenBugfacebook-github-bot
authored andcommitted
Fix Formatting with clang-format.
Summary: Some un-formatted files seem to have gotten through and been merged. Fix them in this fixup patch. Reviewed By: doranand Differential Revision: D38228276 fbshipit-source-id: 8b47a2a7ca5e7d39824598828ef4cff3b1ea1e24
1 parent 3f832b1 commit 63d8e4e

3 files changed

Lines changed: 114 additions & 106 deletions

File tree

‎common/service/ipmi/include/ipmi.h‎

Lines changed: 113 additions & 104 deletions
Original file line numberDiff line numberDiff line change
@@ -94,133 +94,142 @@ enum {
9494
};
9595

9696
// Network Function Codes (IPMI/Section 5.1)
97-
enum { NETFN_CHASSIS_REQ = 0x00,
98-
NETFN_CHASSIS_RES,
99-
NETFN_BRIDGE_REQ,
100-
NETFN_BRIDGE_RES,
101-
NETFN_SENSOR_REQ,
102-
NETFN_SENSOR_RES,
103-
NETFN_APP_REQ,
104-
NETFN_APP_RES,
105-
NETFN_FIRMWARE_REQ,
106-
NETFN_FIRMWARE_RES,
107-
NETFN_STORAGE_REQ,
108-
NETFN_STORAGE_RES,
109-
NETFN_TRANSPORT_REQ,
110-
NETFN_TRANSPORT_RES,
111-
NETFN_DCMI_REQ = 0x2C,
112-
NETFN_DCMI_RES = 0x2D,
113-
NETFN_NM_REQ = 0x2E,
114-
NETFN_NM_RES = 0x2F,
115-
NETFN_OEM_REQ = 0x30,
116-
NETFN_OEM_RES = 0x31,
117-
NETFN_OEM_STORAGE_REQ = 0x32,
118-
NETFN_OEM_STORAGE_RES = 0x33,
119-
NETFN_OEM_Q_REQ = 0x36,
120-
NETFN_OEM_Q_RES = 0x37,
121-
NETFN_OEM_1S_REQ = 0x38,
122-
NETFN_OEM_1S_RES = 0x39,
123-
NETFN_OEM_ZION_REQ = 0x3A,
124-
NETFN_OEM_ZION_RES = 0x3B,
125-
NETFN_OEM_USB_DBG_REQ = 0x3C,
126-
NETFN_OEM_USB_DBG_RES = 0x3D,
97+
enum {
98+
NETFN_CHASSIS_REQ = 0x00,
99+
NETFN_CHASSIS_RES,
100+
NETFN_BRIDGE_REQ,
101+
NETFN_BRIDGE_RES,
102+
NETFN_SENSOR_REQ,
103+
NETFN_SENSOR_RES,
104+
NETFN_APP_REQ,
105+
NETFN_APP_RES,
106+
NETFN_FIRMWARE_REQ,
107+
NETFN_FIRMWARE_RES,
108+
NETFN_STORAGE_REQ,
109+
NETFN_STORAGE_RES,
110+
NETFN_TRANSPORT_REQ,
111+
NETFN_TRANSPORT_RES,
112+
NETFN_DCMI_REQ = 0x2C,
113+
NETFN_DCMI_RES = 0x2D,
114+
NETFN_NM_REQ = 0x2E,
115+
NETFN_NM_RES = 0x2F,
116+
NETFN_OEM_REQ = 0x30,
117+
NETFN_OEM_RES = 0x31,
118+
NETFN_OEM_STORAGE_REQ = 0x32,
119+
NETFN_OEM_STORAGE_RES = 0x33,
120+
NETFN_OEM_Q_REQ = 0x36,
121+
NETFN_OEM_Q_RES = 0x37,
122+
NETFN_OEM_1S_REQ = 0x38,
123+
NETFN_OEM_1S_RES = 0x39,
124+
NETFN_OEM_ZION_REQ = 0x3A,
125+
NETFN_OEM_ZION_RES = 0x3B,
126+
NETFN_OEM_USB_DBG_REQ = 0x3C,
127+
NETFN_OEM_USB_DBG_RES = 0x3D,
127128
};
128129

129130
// Application Command Codes (0x06)
130-
enum { CMD_APP_GET_DEVICE_ID = 0x01,
131-
CMD_APP_COLD_RESET = 0x02,
132-
CMD_APP_WARM_RESET = 0x03,
133-
CMD_APP_GET_SELFTEST_RESULTS = 0x04,
134-
CMD_APP_GET_SYSTEM_GUID = 0x37,
135-
CMD_APP_MASTER_WRITE_READ = 0x52,
131+
enum {
132+
CMD_APP_GET_DEVICE_ID = 0x01,
133+
CMD_APP_COLD_RESET = 0x02,
134+
CMD_APP_WARM_RESET = 0x03,
135+
CMD_APP_GET_SELFTEST_RESULTS = 0x04,
136+
CMD_APP_GET_SYSTEM_GUID = 0x37,
137+
CMD_APP_MASTER_WRITE_READ = 0x52,
136138
};
137139

138140
// Chassis Command Codes (0x00)
139-
enum { CMD_CHASSIS_GET_CHASSIS_STATUS = 0x01,
141+
enum {
142+
CMD_CHASSIS_GET_CHASSIS_STATUS = 0x01,
140143
};
141144

142145
// Sensor Command Codes (0x04)
143-
enum { CMD_SENSOR_GET_SENSOR_READING = 0x2D,
146+
enum {
147+
CMD_SENSOR_GET_SENSOR_READING = 0x2D,
144148
};
145149

146150
// Storage Command Codes (0x0A)
147-
enum { CMD_STORAGE_GET_FRUID_INFO = 0x10,
148-
CMD_STORAGE_READ_FRUID_DATA = 0x11,
149-
CMD_STORAGE_WRITE_FRUID_DATA = 0x12,
150-
CMD_STORAGE_RSV_SDR = 0x22,
151-
CMD_STORAGE_GET_SDR = 0x23,
152-
CMD_STORAGE_GET_SEL_INFO = 0x40,
153-
CMD_STORAGE_RSV_SEL = 0x42,
154-
CMD_STORAGE_GET_SEL = 0x43,
155-
CMD_STORAGE_ADD_SEL = 0x44,
151+
enum {
152+
CMD_STORAGE_GET_FRUID_INFO = 0x10,
153+
CMD_STORAGE_READ_FRUID_DATA = 0x11,
154+
CMD_STORAGE_WRITE_FRUID_DATA = 0x12,
155+
CMD_STORAGE_RSV_SDR = 0x22,
156+
CMD_STORAGE_GET_SDR = 0x23,
157+
CMD_STORAGE_GET_SEL_INFO = 0x40,
158+
CMD_STORAGE_RSV_SEL = 0x42,
159+
CMD_STORAGE_GET_SEL = 0x43,
160+
CMD_STORAGE_ADD_SEL = 0x44,
156161
};
157162

158163
// OEM NM Command Codes (0x2E)
159-
enum { CMD_OEM_NM_FORCE_ME_RECOVERY = 0xDF,
164+
enum {
165+
CMD_OEM_NM_FORCE_ME_RECOVERY = 0xDF,
160166
};
161167

162168
// OEM Command Codes (0x30)
163-
enum { CMD_OEM_CABLE_DETECTION = 0xCB,
164-
CMD_OEM_NM_SENSOR_READ = 0xE2,
165-
CMD_OEM_SET_SYSTEM_GUID = 0xEF,
166-
CMD_OEM_GET_MB_INDEX = 0xF0,
167-
CMD_OEM_SET_FAN_DUTY_MANUAL = 0xF1,
168-
CMD_OEM_GET_SET_FAN_CTRL_MODE = 0xF2,
169+
enum {
170+
CMD_OEM_CABLE_DETECTION = 0xCB,
171+
CMD_OEM_NM_SENSOR_READ = 0xE2,
172+
CMD_OEM_SET_SYSTEM_GUID = 0xEF,
173+
CMD_OEM_GET_MB_INDEX = 0xF0,
174+
CMD_OEM_SET_FAN_DUTY_MANUAL = 0xF1,
175+
CMD_OEM_GET_SET_FAN_CTRL_MODE = 0xF2,
169176
};
170177

171178
// OEM 1S Command Codes (0x38)
172-
enum { CMD_OEM_1S_MSG_IN = 0x1,
173-
CMD_OEM_1S_MSG_OUT = 0x2,
174-
CMD_OEM_1S_GET_GPIO = 0x3,
175-
CMD_OEM_1S_SET_GPIO = 0x4,
176-
CMD_OEM_1S_GET_GPIO_CONFIG = 0x5,
177-
CMD_OEM_1S_SET_GPIO_CONFIG = 0x6,
178-
CMD_OEM_1S_SEND_INTERRUPT_TO_BMC = 0x7,
179-
CMD_OEM_1S_SEND_POST_CODE_TO_BMC = 0x8,
180-
CMD_OEM_1S_FW_UPDATE = 0x9,
181-
CMD_OEM_1S_GET_FW_VERSION = 0xB,
182-
CMD_OEM_1S_GET_POST_CODE = 0x12,
183-
CMD_OEM_1S_SET_VR_MONITOR_STATUS = 0x14,
184-
CMD_OEM_1S_GET_VR_MONITOR_STATUS = 0x15,
185-
CMD_OEM_1S_RESET_BMC = 0x16,
186-
CMD_OEM_1S_SET_JTAG_TAP_STA = 0x21,
187-
CMD_OEM_1S_JTAG_DATA_SHIFT = 0x22,
188-
CMD_OEM_1S_ACCURACY_SENSOR_READING = 0x23,
189-
CMD_OEM_1S_CLEAR_CMOS = 0x25,
190-
CMD_OEM_1S_ASD_INIT = 0x28,
191-
CMD_OEM_1S_PECI_ACCESS = 0x29,
192-
CMD_OEM_1S_APML_READ = 0x2C,
193-
CMD_OEM_1S_APML_WRITE = 0x2D,
194-
CMD_OEM_1S_SEND_APML_REQUEST = 0x2E,
195-
CMD_OEM_1S_GET_APML_RESPONSE = 0x2F,
196-
197-
CMD_OEM_1S_SENSOR_POLL_EN = 0x30,
198-
CMD_OEM_1S_GET_BIC_STATUS = 0x31,
199-
CMD_OEM_1S_RESET_BIC = 0x32,
200-
CMD_OEM_1S_GET_SET_GPIO = 0x41,
201-
CMD_OEM_1S_CONTROL_SENSOR_POLLING = 0x45,
202-
CMD_OEM_1S_SET_FAN_DUTY_AUTO = 0x50,
203-
CMD_OEM_1S_GET_FAN_DUTY = 0x51,
204-
CMD_OEM_1S_GET_FAN_RPM = 0x52,
205-
// Debug command
206-
CMD_OEM_1S_I2C_DEV_SCAN = 0x60,
207-
208-
CMD_OEM_1S_12V_CYCLE_SLOT = 0x64,
209-
CMD_OEM_1S_INFORM_PEER_SLED_CYCLE = 0x66,
210-
CMD_OEM_1S_READ_BIC_REGISTER = 0x68,
211-
CMD_OEM_1S_WRITE_BIC_REGISTER = 0x69,
212-
213-
CMD_OEM_1S_PEX_FLASH_READ = 0x72,
214-
CMD_OEM_1S_GET_FPGA_USER_CODE = 0x73,
215-
CMD_OEM_1S_BRIDGE_I2C_MSG_BY_COMPNT = 0x74,
216-
217-
CMD_OEM_1S_MULTI_ACCURACY_SENSOR_READING = 0x88,
218-
CMD_OEM_1S_GET_BOARD_ID = 0xA0,
219-
CMD_OEM_1S_GET_CARD_TYPE = 0xA1,
179+
enum {
180+
CMD_OEM_1S_MSG_IN = 0x1,
181+
CMD_OEM_1S_MSG_OUT = 0x2,
182+
CMD_OEM_1S_GET_GPIO = 0x3,
183+
CMD_OEM_1S_SET_GPIO = 0x4,
184+
CMD_OEM_1S_GET_GPIO_CONFIG = 0x5,
185+
CMD_OEM_1S_SET_GPIO_CONFIG = 0x6,
186+
CMD_OEM_1S_SEND_INTERRUPT_TO_BMC = 0x7,
187+
CMD_OEM_1S_SEND_POST_CODE_TO_BMC = 0x8,
188+
CMD_OEM_1S_FW_UPDATE = 0x9,
189+
CMD_OEM_1S_GET_FW_VERSION = 0xB,
190+
CMD_OEM_1S_GET_POST_CODE = 0x12,
191+
CMD_OEM_1S_SET_VR_MONITOR_STATUS = 0x14,
192+
CMD_OEM_1S_GET_VR_MONITOR_STATUS = 0x15,
193+
CMD_OEM_1S_RESET_BMC = 0x16,
194+
CMD_OEM_1S_SET_JTAG_TAP_STA = 0x21,
195+
CMD_OEM_1S_JTAG_DATA_SHIFT = 0x22,
196+
CMD_OEM_1S_ACCURACY_SENSOR_READING = 0x23,
197+
CMD_OEM_1S_CLEAR_CMOS = 0x25,
198+
CMD_OEM_1S_ASD_INIT = 0x28,
199+
CMD_OEM_1S_PECI_ACCESS = 0x29,
200+
CMD_OEM_1S_APML_READ = 0x2C,
201+
CMD_OEM_1S_APML_WRITE = 0x2D,
202+
CMD_OEM_1S_SEND_APML_REQUEST = 0x2E,
203+
CMD_OEM_1S_GET_APML_RESPONSE = 0x2F,
204+
205+
CMD_OEM_1S_SENSOR_POLL_EN = 0x30,
206+
CMD_OEM_1S_GET_BIC_STATUS = 0x31,
207+
CMD_OEM_1S_RESET_BIC = 0x32,
208+
CMD_OEM_1S_GET_SET_GPIO = 0x41,
209+
CMD_OEM_1S_CONTROL_SENSOR_POLLING = 0x45,
210+
CMD_OEM_1S_SET_FAN_DUTY_AUTO = 0x50,
211+
CMD_OEM_1S_GET_FAN_DUTY = 0x51,
212+
CMD_OEM_1S_GET_FAN_RPM = 0x52,
213+
// Debug command
214+
CMD_OEM_1S_I2C_DEV_SCAN = 0x60,
215+
216+
CMD_OEM_1S_12V_CYCLE_SLOT = 0x64,
217+
CMD_OEM_1S_INFORM_PEER_SLED_CYCLE = 0x66,
218+
CMD_OEM_1S_READ_BIC_REGISTER = 0x68,
219+
CMD_OEM_1S_WRITE_BIC_REGISTER = 0x69,
220+
221+
CMD_OEM_1S_PEX_FLASH_READ = 0x72,
222+
CMD_OEM_1S_GET_FPGA_USER_CODE = 0x73,
223+
CMD_OEM_1S_BRIDGE_I2C_MSG_BY_COMPNT = 0x74,
224+
225+
CMD_OEM_1S_MULTI_ACCURACY_SENSOR_READING = 0x88,
226+
CMD_OEM_1S_GET_BOARD_ID = 0xA0,
227+
CMD_OEM_1S_GET_CARD_TYPE = 0xA1,
220228
};
221229

222-
enum { INDEX_SLOT1 = 0x01,
223-
INDEX_SLOT3 = 0x03,
230+
enum {
231+
INDEX_SLOT1 = 0x01,
232+
INDEX_SLOT3 = 0x03,
224233
};
225234

226235
#endif

‎common/service/ipmi/oem_1s_handler.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -915,7 +915,7 @@ __weak void OEM_1S_CONTROL_SENSOR_POLLING(ipmi_msg *msg)
915915
// Enable or Disable sensor polling
916916
sensor_config[control_sensor_index].is_enable_polling =
917917
((operation == DISABLE_SENSOR_POLLING) ? DISABLE_SENSOR_POLLING :
918-
ENABLE_SENSOR_POLLING);
918+
ENABLE_SENSOR_POLLING);
919919
msg->data[return_data_index + 1] =
920920
sensor_config[control_sensor_index].is_enable_polling;
921921
} else {

‎meta-facebook/yv35-cl/src/platform/plat_sensor_table.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -497,4 +497,3 @@ uint8_t get_hsc_pwr_reading(int *reading)
497497
{
498498
return get_sensor_reading(SENSOR_NUM_PWR_HSCIN, reading, GET_FROM_CACHE);
499499
}
500-

0 commit comments

Comments
 (0)