Skip to content

Commit 5590828

Browse files
committed
Modules: export module info
1 parent 6f8d276 commit 5590828

146 files changed

Lines changed: 295 additions & 147 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/modules/battery/battery.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ void ffGenerateBatteryJsonResult(FFBatteryOptions* options, yyjson_mut_doc* doc,
245245
}
246246
}
247247

248-
static FFModuleBaseInfo ffModuleInfo = {
248+
FFModuleBaseInfo ffBatteryModuleInfo = {
249249
.name = FF_BATTERY_MODULE_NAME,
250250
.description = "Print battery capacity, status, etc",
251251
.initOptions = (void*) ffInitBatteryOptions,
@@ -275,7 +275,7 @@ static FFModuleBaseInfo ffModuleInfo = {
275275

276276
void ffInitBatteryOptions(FFBatteryOptions* options)
277277
{
278-
options->moduleInfo = ffModuleInfo;
278+
options->moduleInfo = ffBatteryModuleInfo;
279279
ffOptionInitModuleArg(&options->moduleArgs, "");
280280
options->temp = false;
281281
options->tempConfig = (FFColorRangeConfig) { 60, 80 };

src/modules/battery/battery.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@
77
void ffPrintBattery(FFBatteryOptions* options);
88
void ffInitBatteryOptions(FFBatteryOptions* options);
99
void ffDestroyBatteryOptions(FFBatteryOptions* options);
10+
11+
extern FFModuleBaseInfo ffBatteryModuleInfo;

src/modules/bios/bios.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ void ffGenerateBiosJsonResult(FF_MAYBE_UNUSED FFBiosOptions* options, yyjson_mut
128128
ffStrbufDestroy(&bios.type);
129129
}
130130

131-
static FFModuleBaseInfo ffModuleInfo = {
131+
FFModuleBaseInfo ffBiosModuleInfo = {
132132
.name = FF_BIOS_MODULE_NAME,
133133
.description = "Print information of 1st-stage bootloader (name, version, release date, etc)",
134134
.initOptions = (void*) ffInitBiosOptions,
@@ -148,7 +148,7 @@ static FFModuleBaseInfo ffModuleInfo = {
148148

149149
void ffInitBiosOptions(FFBiosOptions* options)
150150
{
151-
options->moduleInfo = ffModuleInfo;
151+
options->moduleInfo = ffBiosModuleInfo;
152152
ffOptionInitModuleArg(&options->moduleArgs, "");
153153
}
154154

src/modules/bios/bios.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@
77
void ffPrintBios(FFBiosOptions* options);
88
void ffInitBiosOptions(FFBiosOptions* options);
99
void ffDestroyBiosOptions(FFBiosOptions* options);
10+
11+
extern FFModuleBaseInfo ffBiosModuleInfo;

src/modules/bluetooth/bluetooth.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ void ffGenerateBluetoothJsonResult(FFBluetoothOptions* options, yyjson_mut_doc*
163163
}
164164
}
165165

166-
static FFModuleBaseInfo ffModuleInfo = {
166+
FFModuleBaseInfo ffBluetoothModuleInfo = {
167167
.name = FF_BLUETOOTH_MODULE_NAME,
168168
.description = "List (connected) bluetooth devices",
169169
.initOptions = (void*) ffInitBluetoothOptions,
@@ -184,7 +184,7 @@ static FFModuleBaseInfo ffModuleInfo = {
184184

185185
void ffInitBluetoothOptions(FFBluetoothOptions* options)
186186
{
187-
options->moduleInfo = ffModuleInfo;
187+
options->moduleInfo = ffBluetoothModuleInfo;
188188
ffOptionInitModuleArg(&options->moduleArgs, "");
189189
options->showDisconnected = false;
190190
options->percent = (FFPercentageModuleConfig) { 50, 20, 0 };

src/modules/bluetooth/bluetooth.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@
77
void ffPrintBluetooth(FFBluetoothOptions* options);
88
void ffInitBluetoothOptions(FFBluetoothOptions* options);
99
void ffDestroyBluetoothOptions(FFBluetoothOptions* options);
10+
11+
extern FFModuleBaseInfo ffBluetoothModuleInfo;

src/modules/bluetoothradio/bluetoothradio.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ void ffGenerateBluetoothRadioJsonResult(FF_MAYBE_UNUSED FFBluetoothRadioOptions*
166166
}
167167
}
168168

169-
static FFModuleBaseInfo ffModuleInfo = {
169+
FFModuleBaseInfo ffBluetoothRadioModuleInfo = {
170170
.name = FF_BLUETOOTHRADIO_MODULE_NAME,
171171
.description = "List bluetooth radios width supported version and vendor",
172172
.initOptions = (void*) ffInitBluetoothRadioOptions,
@@ -189,7 +189,7 @@ static FFModuleBaseInfo ffModuleInfo = {
189189

190190
void ffInitBluetoothRadioOptions(FFBluetoothRadioOptions* options)
191191
{
192-
options->moduleInfo = ffModuleInfo;
192+
options->moduleInfo = ffBluetoothRadioModuleInfo;
193193
ffOptionInitModuleArg(&options->moduleArgs, "󰐻");
194194
}
195195

src/modules/bluetoothradio/bluetoothradio.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@
77
void ffPrintBluetoothRadio(FFBluetoothRadioOptions* options);
88
void ffInitBluetoothRadioOptions(FFBluetoothRadioOptions* options);
99
void ffDestroyBluetoothRadioOptions(FFBluetoothRadioOptions* options);
10+
11+
extern FFModuleBaseInfo ffBluetoothRadioModuleInfo;

src/modules/board/board.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ void ffGenerateBoardJsonResult(FF_MAYBE_UNUSED FFBoardOptions* options, yyjson_m
106106
ffStrbufDestroy(&board.serial);
107107
}
108108

109-
static FFModuleBaseInfo ffModuleInfo = {
109+
FFModuleBaseInfo ffBoardModuleInfo = {
110110
.name = FF_BOARD_MODULE_NAME,
111111
.description = "Print motherboard name and other info",
112112
.initOptions = (void*) ffInitBoardOptions,
@@ -125,7 +125,7 @@ static FFModuleBaseInfo ffModuleInfo = {
125125

126126
void ffInitBoardOptions(FFBoardOptions* options)
127127
{
128-
options->moduleInfo = ffModuleInfo;
128+
options->moduleInfo = ffBoardModuleInfo;
129129
ffOptionInitModuleArg(&options->moduleArgs, "");
130130
}
131131

src/modules/board/board.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,5 @@
77
void ffPrintBoard(FFBoardOptions* options);
88
void ffInitBoardOptions(FFBoardOptions* options);
99
void ffDestroyBoardOptions(FFBoardOptions* options);
10+
11+
extern FFModuleBaseInfo ffBoardModuleInfo;

0 commit comments

Comments
 (0)