Skip to content

Commit

Permalink
Move bootloader_hal.h to the openlcb directory. (#821)
Browse files Browse the repository at this point in the history
Cleans up conditional compilation.

This would normally create breakages in applications that depend on openmrn, so we leave behind a symlink.

===

* Move bootlaoder_hal.h to the openlcb directory.
Clean up conditional compilation.

* Adds symlink for backwards compatibility.
  • Loading branch information
balazsracz authored Feb 6, 2025
1 parent c435be5 commit 4cf3803
Show file tree
Hide file tree
Showing 5 changed files with 242 additions and 249 deletions.
236 changes: 0 additions & 236 deletions include/freertos/bootloader_hal.h

This file was deleted.

1 change: 1 addition & 0 deletions include/freertos/bootloader_hal.h
6 changes: 1 addition & 5 deletions src/openlcb/ApplicationChecksum.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,7 @@
#ifndef _OPENLCB_APPLICATIONCHECKSUM_HXX_
#define _OPENLCB_APPLICATIONCHECKSUM_HXX_

#ifdef ESP_PLATFORM
#include "bootloader_hal.h"
#else
#include "freertos/bootloader_hal.h"
#endif
#include "openlcb/bootloader_hal.h"

extern "C" {
/** @returns true if the application checksum currently in flash is correct. */
Expand Down
10 changes: 3 additions & 7 deletions src/openlcb/Bootloader.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -43,16 +43,12 @@
#include <string.h>
#include <unistd.h>

#ifdef ESP_PLATFORM
#include "bootloader_hal.h"
#else
#include "freertos/bootloader_hal.h"
#endif
#include "openlcb/Defs.hxx"
#include "openlcb/ApplicationChecksum.hxx"
#include "openlcb/CanDefs.hxx"
#include "openlcb/DatagramDefs.hxx"
#include "openlcb/Defs.hxx"
#include "openlcb/MemoryConfig.hxx"
#include "openlcb/ApplicationChecksum.hxx"
#include "openlcb/bootloader_hal.h"
#include "can_frame.h"

namespace openlcb
Expand Down
Loading

0 comments on commit 4cf3803

Please sign in to comment.