Make the firmware depend of the wormhole.[ch] files of the bootloader. Remove local wormhole.[ch] files.

This commit is contained in:
László Monda
2017-10-13 22:09:52 +02:00
parent ef34094004
commit d4200524d7
8 changed files with 24 additions and 40 deletions

View File

@@ -12,7 +12,7 @@
#include "bus_pal_hardware.h"
#include "bootloader_config.h"
#include "command.h"
#include "wormhole.h"
#include "bootloader/wormhole.h"
#include "eeprom.h"
key_matrix_t KeyMatrix = {

View File

@@ -4,7 +4,7 @@
#include "usb_descriptors/usb_descriptor_strings.h"
#include "bootloader_config.h"
#include "bus_pal_hardware.h"
#include "wormhole.h"
#include "bootloader/wormhole.h"
static usb_status_t UsbDeviceCallback(usb_device_handle handle, uint32_t event, void *param);
usb_composite_device_t UsbCompositeDevice;

View File

@@ -9,7 +9,7 @@
#include "led_pwm.h"
#include "slave_scheduler.h"
#include "slave_drivers/uhk_module_driver.h"
#include "wormhole.h"
#include "bootloader/wormhole.h"
#include "peripherals/adc.h"
#include "eeprom.h"
#include "keymaps.h"

View File

@@ -1,3 +0,0 @@
#include "wormhole.h"
wormhole_t ATTR_NO_INIT Wormhole;

View File

@@ -1,31 +0,0 @@
#ifndef __WORMHOLE_H__
#define __WORMHOLE_H__
// Includes:
#include <stdint.h>
#include "attributes.h"
// Macros:
#define WORMHOLE_MAGIC_NUMBER 0x3b04cd9e94521f9a
// Typedefs:
typedef enum {
EnumerationMode_Bootloader,
EnumerationMode_NormalKeyboard,
EnumerationMode_CompatibleKeyboard,
EnumerationMode_BusPal,
} enumeration_mode_t;
typedef struct {
uint64_t magicNumber;
uint8_t enumerationMode;
} wormhole_t;
// Variables:
extern wormhole_t ATTR_NO_INIT Wormhole;
#endif