mirror of
https://github.com/openharmony/drivers_framework.git
synced 2026-08-27 02:42:28 -04:00
!830 fix:modify Chip adaptation
Merge pull request !830 from 王有刚/master
This commit is contained in:
@@ -339,16 +339,24 @@ static void ReleaseWlanDevice(struct HdfWlanDevice *device)
|
||||
|
||||
static struct HdfWlanDevice *ProbeDevice(struct HdfConfigWlanDevInst *deviceConfig)
|
||||
{
|
||||
if (deviceConfig == NULL) {
|
||||
return NULL;
|
||||
}
|
||||
struct HdfWlanDevice *device = NULL;
|
||||
int32_t ret;
|
||||
if (deviceConfig == NULL) {
|
||||
struct HdfConfigWlanChipList *tmpChipList = NULL;
|
||||
struct HdfConfigWlanRoot *rootConfig = HdfWlanGetModuleConfigRoot();
|
||||
if (rootConfig == NULL) {
|
||||
HDF_LOGE("%s:ProbeDevice rootConfig NULL", __func__);
|
||||
return NULL;
|
||||
}
|
||||
device = (struct HdfWlanDevice *)OsalMemCalloc(sizeof(struct HdfWlanDevice));
|
||||
if (device == NULL) {
|
||||
HDF_LOGE("%s:oom", __func__);
|
||||
HDF_LOGE("%s:ProbeDevice device NULL", __func__);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
tmpChipList = &rootConfig->wlanConfig.chipList;
|
||||
do {
|
||||
device->powers = HdfWlanCreatePowerManager(&deviceConfig->powers);
|
||||
device->reset = HdfWlanCreateResetManager(&deviceConfig->reset, deviceConfig->bootUpTimeOut);
|
||||
@@ -371,7 +379,7 @@ static struct HdfWlanDevice *ProbeDevice(struct HdfConfigWlanDevInst *deviceConf
|
||||
ret = HDF_SUCCESS;
|
||||
OsalMSleep(SLEEPTIME);
|
||||
device->bus = NULL;
|
||||
device->driverName = "hisi"; // from BDH6_DRIVER_NAME
|
||||
device->driverName = tmpChipList->chipInst[0].driverName; // from BDH6_DRIVER_NAME
|
||||
HDF_LOGW("Do not call GPIO and HdfWlanBusInit");
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user