Skip to content

Commit 6d2e808

Browse files
authored
Merge pull request #30 from choco-technologies/copilot/add-dmod-log-step-macros
Add DMOD_LOG_STEP macros to driver configuration
2 parents f284e6a + 88fb544 commit 6d2e808

1 file changed

Lines changed: 11 additions & 2 deletions

File tree

src/dmdevfs.c

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -901,20 +901,24 @@ static int configure_drivers(dmfsi_context_t ctx, const char* driver_name, const
901901
*/
902902
static driver_node_t* configure_driver(const char* driver_name, dmini_context_t config_ctx)
903903
{
904-
DMOD_LOG_VERBOSE("Configuring driver: %s\n", driver_name);
904+
DMOD_LOG_STEP_BEGIN("Configuring driver: %s\n", driver_name);
905905
bool was_loaded = false;
906906
bool was_enabled = false;
907+
DMOD_LOG_STEP_PROGRESS(25, "Loading driver module: %s\n", driver_name);
907908
Dmod_Context_t* driver = prepare_driver_module(driver_name, &was_loaded, &was_enabled);
908909
if (driver == NULL)
909910
{
911+
DMOD_LOG_STEP(1, "Failed to configure driver: %s\n", driver_name);
910912
return NULL;
911913
}
912914

915+
DMOD_LOG_STEP_PROGRESS(50, "Resolving driver interface: %s\n", driver_name);
913916
dmod_dmdrvi_create_t dmdrvi_create = Dmod_GetDifFunction(driver, dmod_dmdrvi_create_sig);
914917
if (dmdrvi_create == NULL)
915918
{
916919
DMOD_LOG_ERROR("Driver module does not implement dmdrvi_create: %s\n", driver_name);
917920
cleanup_driver_module(driver_name, was_loaded, was_enabled);
921+
DMOD_LOG_STEP(1, "Failed to configure driver: %s\n", driver_name);
918922
return NULL;
919923
}
920924

@@ -923,9 +927,11 @@ static driver_node_t* configure_driver(const char* driver_name, dmini_context_t
923927
{
924928
DMOD_LOG_ERROR("Failed to allocate memory for driver node: %s\n", driver_name);
925929
cleanup_driver_module(driver_name, was_loaded, was_enabled);
930+
DMOD_LOG_STEP(1, "Failed to configure driver: %s\n", driver_name);
926931
return NULL;
927932
}
928933

934+
DMOD_LOG_STEP_PROGRESS(75, "Creating driver context: %s\n", driver_name);
929935
driver_node->was_loaded = was_loaded;
930936
driver_node->was_enabled = was_enabled;
931937
driver_node->driver = driver;
@@ -935,8 +941,10 @@ static driver_node_t* configure_driver(const char* driver_name, dmini_context_t
935941
DMOD_LOG_ERROR("Failed to create driver context: %s\n", driver_name);
936942
cleanup_driver_module(driver_name, was_loaded, was_enabled);
937943
Dmod_Free(driver_node);
944+
DMOD_LOG_STEP(1, "Failed to configure driver: %s\n", driver_name);
938945
return NULL;
939946
}
947+
DMOD_LOG_STEP_PROGRESS(90, "Reading driver node path: %s\n", driver_name);
940948
if(read_driver_node_path( driver_node, driver_node->path, sizeof(driver_node->path) ) != 0)
941949
{
942950
DMOD_LOG_ERROR("Failed to read driver node path: %s\n", driver_name);
@@ -947,10 +955,11 @@ static driver_node_t* configure_driver(const char* driver_name, dmini_context_t
947955
}
948956
cleanup_driver_module(driver_name, was_loaded, was_enabled);
949957
Dmod_Free(driver_node);
958+
DMOD_LOG_STEP(1, "Failed to configure driver: %s\n", driver_name);
950959
return NULL;
951960
}
952961

953-
DMOD_LOG_INFO("Configured driver: %s (path: %s)\n", driver_name, driver_node->path);
962+
DMOD_LOG_STEP(0, "Configured driver: %s (path: %s)\n", driver_name, driver_node->path);
954963

955964
return driver_node;
956965
}

0 commit comments

Comments
 (0)