Skip to content

Commit ef70dcd

Browse files
Change some more internal MTRDeviceControllerFactory APIs to use MTRDeviceController_Concrete.
These always return concrete controllers. getRunningControllers was already claiming the right signature in the implementation, just not the header.
1 parent 8750c55 commit ef70dcd

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/darwin/Framework/CHIP/MTRDeviceControllerFactory.mm

+4-4
Original file line numberDiff line numberDiff line change
@@ -975,9 +975,9 @@ - (void)controllerShuttingDown:(MTRDeviceController_Concrete *)controller
975975
return [_controllers copy];
976976
}
977977

978-
- (nullable MTRDeviceController *)runningControllerForFabricIndex:(FabricIndex)fabricIndex
979-
includeControllerStartingUp:(BOOL)includeControllerStartingUp
980-
includeControllerShuttingDown:(BOOL)includeControllerShuttingDown
978+
- (nullable MTRDeviceController_Concrete *)runningControllerForFabricIndex:(FabricIndex)fabricIndex
979+
includeControllerStartingUp:(BOOL)includeControllerStartingUp
980+
includeControllerShuttingDown:(BOOL)includeControllerShuttingDown
981981
{
982982
assertChipStackLockedByCurrentThread();
983983

@@ -1006,7 +1006,7 @@ - (nullable MTRDeviceController *)runningControllerForFabricIndex:(FabricIndex)f
10061006
return nil;
10071007
}
10081008

1009-
- (nullable MTRDeviceController *)runningControllerForFabricIndex:(chip::FabricIndex)fabricIndex
1009+
- (nullable MTRDeviceController_Concrete *)runningControllerForFabricIndex:(chip::FabricIndex)fabricIndex
10101010
{
10111011
return [self runningControllerForFabricIndex:fabricIndex includeControllerStartingUp:YES includeControllerShuttingDown:YES];
10121012
}

src/darwin/Framework/CHIP/MTRDeviceControllerFactory_Internal.h

+5-5
Original file line numberDiff line numberDiff line change
@@ -57,21 +57,21 @@ MTR_DIRECT_MEMBERS
5757
* Get the list of running controllers. This will include controllers that are
5858
* in the middle of starting up or shutting down.
5959
*/
60-
- (NSArray<MTRDeviceController *> *)getRunningControllers;
60+
- (NSArray<MTRDeviceController_Concrete *> *)getRunningControllers;
6161

6262
/**
6363
* Find a running controller, if any, for the given fabric index.
6464
*/
65-
- (nullable MTRDeviceController *)runningControllerForFabricIndex:(chip::FabricIndex)fabricIndex;
65+
- (nullable MTRDeviceController_Concrete *)runningControllerForFabricIndex:(chip::FabricIndex)fabricIndex;
6666

6767
/**
6868
* Find a running controller, if any, for the given fabric index. Allows
6969
* controlling whether to include a controller that is in the middle of startup
7070
* or shutdown.
7171
*/
72-
- (nullable MTRDeviceController *)runningControllerForFabricIndex:(chip::FabricIndex)fabricIndex
73-
includeControllerStartingUp:(BOOL)includeControllerStartingUp
74-
includeControllerShuttingDown:(BOOL)includeControllerShuttingDown;
72+
- (nullable MTRDeviceController_Concrete *)runningControllerForFabricIndex:(chip::FabricIndex)fabricIndex
73+
includeControllerStartingUp:(BOOL)includeControllerStartingUp
74+
includeControllerShuttingDown:(BOOL)includeControllerShuttingDown;
7575

7676
/**
7777
* Notify the controller factory that a new operational instance with the given

0 commit comments

Comments
 (0)