Skip to content

Move the daplink.c contents into its header file & force inline. #1097

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 0 additions & 41 deletions source/daplink/bootloader/daplink.c

This file was deleted.

41 changes: 38 additions & 3 deletions source/daplink/daplink.h
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,46 @@ COMPILER_ASSERT(DAPLINK_RAM_SHARED_START + DAPLINK_RAM_SHARED_SIZE == DAPLINK_RA
// Macro with the name of the main application header file.
#if defined(DAPLINK_BL)
#define DAPLINK_MAIN_HEADER "main_bootloader.h"

#include "virtual_fs.h"

COMPILER_ASSERT(DAPLINK_BUILD_KEY == DAPLINK_BUILD_KEY_BL);

// daplink_mode_file_name, daplink_url_name and
// daplink_drive_name strings must be 11 characters
// excluding the null terminated character
static const char daplink_mode_file_name[11] = "START_IFACT";

__STATIC_FORCEINLINE bool daplink_is_bootloader()
{
return true;
}

__STATIC_FORCEINLINE bool daplink_is_interface()
{
return false;
}

#elif defined(DAPLINK_IF)
#define DAPLINK_MAIN_HEADER "main_interface.h"

#ifdef DRAG_N_DROP_SUPPORT
#include "virtual_fs.h"
COMPILER_ASSERT(DAPLINK_BUILD_KEY == DAPLINK_BUILD_KEY_IF);

static const vfs_filename_t daplink_mode_file_name = "START_BLACT";
#endif //DRAG_N_DROP_SUPPORT

__STATIC_FORCEINLINE bool daplink_is_bootloader()
{
return false;
}

__STATIC_FORCEINLINE bool daplink_is_interface()
{
return true;
}

#else
#error "Neither DAPLINK_BL nor DAPLINK_IF are defined!"
#endif
Expand All @@ -87,9 +125,6 @@ typedef struct {
uint32_t version;
} daplink_info_t;

bool daplink_is_bootloader(void);
bool daplink_is_interface(void);

#ifdef __cplusplus
}
#endif
Expand Down
3 changes: 0 additions & 3 deletions source/daplink/drag-n-drop/vfs_manager.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,6 @@
extern "C" {
#endif


extern const vfs_filename_t daplink_mode_file_name;

/* Callable from anywhere */

// Enable or disable the virtual filesystem
Expand Down
43 changes: 0 additions & 43 deletions source/daplink/interface/daplink.c

This file was deleted.

Loading