Skip to content

Commit

Permalink
Final load of include simplifications
Browse files Browse the repository at this point in the history
  • Loading branch information
rhargreaves committed Sep 7, 2024
1 parent a4e1cc7 commit 3baefd6
Show file tree
Hide file tree
Showing 18 changed files with 14 additions and 28 deletions.
1 change: 0 additions & 1 deletion src/comm/applemidi.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#include "applemidi.h"
#include "rtpmidi.h"
#include "string.h"
#include "log.h"
#include "comm_megawifi.h"
#include "settings.h"
Expand Down
3 changes: 1 addition & 2 deletions src/comm/applemidi.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#pragma once
#include "types.h"
#include "ext/mw/megawifi.h"
#include "genesis.h"

#define ERR_BASE 100
#define ERR_INVALID_APPLE_MIDI_SIGNATURE ERR_BASE;
Expand Down
2 changes: 1 addition & 1 deletion src/comm/buffer.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include "types.h"
#include "genesis.h"

#define BUFFER_SIZE 4096

Expand Down
3 changes: 0 additions & 3 deletions src/comm/comm.c
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
#include "comm_megawifi.h"
#include "comm_serial.h"
#include "comm_demo.h"
#include "vdp.h"
#include "vdp_bg.h"
#include "string.h"
#include "settings.h"

static u16 idle = 0;
Expand Down
2 changes: 1 addition & 1 deletion src/comm/comm.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include "types.h"
#include "genesis.h"

typedef enum CommMode { Discovery, Everdrive, EverdrivePro, Serial, MegaWiFi, Demo } CommMode;

Expand Down
2 changes: 0 additions & 2 deletions src/comm/comm_demo.c
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
#include "comm_demo.h"
#include "joy.h"
#include "sys.h"
#include "midi_fm.h"
#include "log.h"
#include "scheduler.h"
Expand Down
2 changes: 1 addition & 1 deletion src/comm/comm_demo.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include "types.h"
#include "genesis.h"

void comm_demo_init(void);
bool comm_demo_is_present(void);
Expand Down
2 changes: 1 addition & 1 deletion src/comm/comm_everdrive.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include "types.h"
#include "genesis.h"

void comm_everdrive_init(void);
bool comm_everdrive_is_present(void);
Expand Down
2 changes: 1 addition & 1 deletion src/comm/comm_everdrive_pro.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include "types.h"
#include "genesis.h"

void comm_everdrive_pro_init(void);
bool comm_everdrive_pro_is_present(void);
Expand Down
5 changes: 0 additions & 5 deletions src/comm/comm_megawifi.c
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
#include "comm_megawifi.h"
#include "applemidi.h"
#include "log.h"
#include "ext/mw/megawifi.h"
#include "ext/mw/lsd.h"
#include "mw_uart.h"
#include "string.h"
#include "settings.h"
#include "buffer.h"
#include "memory.h"
#include "ip_util.h"
#include "task.h"
#include "scheduler.h"

#define UDP_CONTROL_PORT 5006
Expand Down
2 changes: 1 addition & 1 deletion src/comm/comm_megawifi.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include "types.h"
#include "genesis.h"

void comm_megawifi_init(void);
bool comm_megawifi_is_present(void);
Expand Down
2 changes: 1 addition & 1 deletion src/comm/comm_serial.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include "types.h"
#include "genesis.h"

void comm_serial_init(void);
bool comm_serial_is_present(void);
Expand Down
2 changes: 1 addition & 1 deletion src/comm/everdrive_led.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include "types.h"
#include "genesis.h"

void everdrive_led_init(void);
void everdrive_led_blink(void);
Expand Down
2 changes: 1 addition & 1 deletion src/comm/ip_util.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#pragma once
#include "types.h"
#include "genesis.h"

uint16_t uint8_to_str(uint8_t num, char* str);
int uint32_to_ip_str(uint32_t ip_u32, char* ip_str);
Expand Down
3 changes: 1 addition & 2 deletions src/comm/mw_uart.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#pragma once
#include "types.h"
#include "ext/mw/16c550.h"
#include "genesis.h"

bool mw_uart_is_present(void);
1 change: 1 addition & 0 deletions src/comm/rtpmidi.c
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#include "rtpmidi.h"
#include "applemidi.h"
#include "comm_megawifi.h"
#include "bits.h"

Expand Down
2 changes: 1 addition & 1 deletion src/comm/rtpmidi.h
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#pragma once
#include "applemidi.h"
#include "genesis.h"

enum mw_err rtpmidi_processRtpMidiPacket(char* buffer, u16 length, u16* lastSeqNum);
4 changes: 1 addition & 3 deletions src/comm/serial.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
#pragma once
#include "types.h"
#include "sys.h"
#include "vdp.h"
#include "genesis.h"

#define PORT2_CTRL 0xA1000B
#define PORT2_SCTRL 0xA10019
Expand Down

0 comments on commit 3baefd6

Please sign in to comment.