Skip to content

Commit 85b38bb

Browse files
FozzTexxFozzTexx
authored
Move fuji device constants and structs to fuji.h (#1054)
1 parent abf3118 commit 85b38bb

File tree

17 files changed

+80
-581
lines changed

17 files changed

+80
-581
lines changed

‎lib/bus/iec/iec.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifdef BUILD_IEC
22

33
#include "iec.h"
4-
#include "../../device/iec/iecFuji.h"
4+
#include "fuji.h"
55

66
#include <cstring>
77
#include <memory>

‎lib/bus/iwm/iwm.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,6 +353,6 @@ class systemBus
353353

354354
extern systemBus SYSTEM_BUS;
355355

356-
#define IWM_ACTIVE_DISK2 ((iwmDisk2 *) theFuji.get_disk_dev(MAX_SP_DEVICES + diskii_xface.iwm_active_drive() - 1))
356+
#define IWM_ACTIVE_DISK2 ((iwmDisk2 *) theFuji.get_disk_dev(MAX_SPDISK_DEVICES + diskii_xface.iwm_active_drive() - 1))
357357
#endif // guard
358358
#endif /* BUILD_APPLE */

‎lib/device/adamnet/adamFuji.h‎

Lines changed: 2 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef FUJI_H
22
#define FUJI_H
33

4+
#include "fuji.h"
5+
46
#include <cstdint>
57

68
#include "network.h"
@@ -10,47 +12,6 @@
1012
#include "fujiHost.h"
1113
#include "fujiDisk.h"
1214

13-
#define MAX_HOSTS 8
14-
#define MAX_DISK_DEVICES 8
15-
#define MAX_NETWORK_DEVICES 4
16-
17-
#define MAX_WIFI_PASS_LEN 64
18-
19-
#define MAX_APPKEY_LEN 64
20-
21-
#define READ_DEVICE_SLOTS_DISKS1 0x00
22-
#define READ_DEVICE_SLOTS_TAPE 0x10
23-
24-
typedef struct
25-
{
26-
char ssid[33];
27-
char hostname[64];
28-
unsigned char localIP[4];
29-
unsigned char gateway[4];
30-
unsigned char netmask[4];
31-
unsigned char dnsIP[4];
32-
unsigned char macAddress[6];
33-
unsigned char bssid[6];
34-
char fn_version[15];
35-
} AdapterConfig;
36-
37-
enum appkey_mode : int8_t
38-
{
39-
APPKEYMODE_INVALID = -1,
40-
APPKEYMODE_READ = 0,
41-
APPKEYMODE_WRITE,
42-
APPKEYMODE_READ_256
43-
};
44-
45-
struct appkey
46-
{
47-
uint16_t creator = 0;
48-
uint8_t app = 0;
49-
uint8_t key = 0;
50-
appkey_mode mode = APPKEYMODE_INVALID;
51-
uint8_t reserved = 0;
52-
} __attribute__((packed));
53-
5415
class adamFuji : public virtualDevice
5516
{
5617
private:

‎lib/device/comlynx/lynxFuji.h‎

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -10,47 +10,6 @@
1010
#include "fujiHost.h"
1111
#include "fujiDisk.h"
1212

13-
#define MAX_HOSTS 8
14-
#define MAX_DISK_DEVICES 8
15-
#define MAX_NETWORK_DEVICES 4
16-
17-
#define MAX_WIFI_PASS_LEN 64
18-
19-
#define MAX_APPKEY_LEN 64
20-
21-
#define READ_DEVICE_SLOTS_DISKS1 0x00
22-
#define READ_DEVICE_SLOTS_TAPE 0x10
23-
24-
typedef struct
25-
{
26-
char ssid[33];
27-
char hostname[64];
28-
unsigned char localIP[4];
29-
unsigned char gateway[4];
30-
unsigned char netmask[4];
31-
unsigned char dnsIP[4];
32-
unsigned char macAddress[6];
33-
unsigned char bssid[6];
34-
char fn_version[15];
35-
} AdapterConfig;
36-
37-
enum appkey_mode : int8_t
38-
{
39-
APPKEYMODE_INVALID = -1,
40-
APPKEYMODE_READ = 0,
41-
APPKEYMODE_WRITE,
42-
APPKEYMODE_READ_256
43-
};
44-
45-
struct appkey
46-
{
47-
uint16_t creator = 0;
48-
uint8_t app = 0;
49-
uint8_t key = 0;
50-
appkey_mode mode = APPKEYMODE_INVALID;
51-
uint8_t reserved = 0;
52-
} __attribute__((packed));
53-
5413
class lynxFuji : public virtualDevice
5514
{
5615
private:

‎lib/device/cx16_i2c/cx16Fuji.h‎

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -12,47 +12,6 @@
1212
#include "fujiHost.h"
1313
#include "fujiDisk.h"
1414

15-
#define MAX_HOSTS 8
16-
#define MAX_DISK_DEVICES 8
17-
#define MAX_NETWORK_DEVICES 8
18-
19-
#define MAX_WIFI_PASS_LEN 64
20-
21-
#define MAX_APPKEY_LEN 64
22-
23-
#define READ_DEVICE_SLOTS_DISKS1 0x00
24-
#define READ_DEVICE_SLOTS_TAPE 0x10
25-
26-
typedef struct
27-
{
28-
char ssid[33];
29-
char hostname[64];
30-
unsigned char localIP[4];
31-
unsigned char gateway[4];
32-
unsigned char netmask[4];
33-
unsigned char dnsIP[4];
34-
unsigned char macAddress[6];
35-
unsigned char bssid[6];
36-
char fn_version[15];
37-
} AdapterConfig;
38-
39-
enum appkey_mode : int8_t
40-
{
41-
APPKEYMODE_INVALID = -1,
42-
APPKEYMODE_READ = 0,
43-
APPKEYMODE_WRITE,
44-
APPKEYMODE_READ_256
45-
};
46-
47-
struct appkey
48-
{
49-
uint16_t creator = 0;
50-
uint8_t app = 0;
51-
uint8_t key = 0;
52-
appkey_mode mode = APPKEYMODE_INVALID;
53-
uint8_t reserved = 0;
54-
} __attribute__((packed));
55-
5615
class cx16Fuji : public virtualDevice
5716
{
5817
private:

‎lib/device/drivewire/drivewireFuji.h‎

Lines changed: 2 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef FUJI_H
22
#define FUJI_H
33

4+
#include "fuji.h"
5+
46
#include <cstdint>
57
#include <cstring>
68
#include <compat_string.h>
@@ -14,72 +16,11 @@
1416

1517
#include "hash.h"
1618

17-
#define MAX_HOSTS 8
18-
#define MAX_DISK_DEVICES 4
19-
#define MAX_NETWORK_DEVICES 8
20-
2119
#ifdef ESP32_PLATFORM
2220
#else
2321
#define ESP_OK 0
2422
#endif
2523

26-
#define MAX_SSID_LEN 32
27-
#define MAX_WIFI_PASS_LEN 64
28-
29-
#define MAX_APPKEY_LEN 64
30-
31-
#define READ_DEVICE_SLOTS_DISKS1 0x00
32-
#define READ_DEVICE_SLOTS_TAPE 0x10
33-
34-
typedef struct
35-
{
36-
char ssid[33];
37-
char hostname[64];
38-
unsigned char localIP[4];
39-
unsigned char gateway[4];
40-
unsigned char netmask[4];
41-
unsigned char dnsIP[4];
42-
unsigned char macAddress[6];
43-
unsigned char bssid[6];
44-
char fn_version[15];
45-
} AdapterConfig;
46-
47-
typedef struct
48-
{
49-
char ssid[33];
50-
char hostname[64];
51-
unsigned char localIP[4];
52-
unsigned char gateway[4];
53-
unsigned char netmask[4];
54-
unsigned char dnsIP[4];
55-
unsigned char macAddress[6];
56-
unsigned char bssid[6];
57-
char fn_version[15];
58-
char sLocalIP[16];
59-
char sGateway[16];
60-
char sNetmask[16];
61-
char sDnsIP[16];
62-
char sMacAddress[18];
63-
char sBssid[18];
64-
} AdapterConfigExtended;
65-
66-
enum appkey_mode : int8_t
67-
{
68-
APPKEYMODE_INVALID = -1,
69-
APPKEYMODE_READ = 0,
70-
APPKEYMODE_WRITE,
71-
APPKEYMODE_READ_256
72-
};
73-
74-
struct appkey
75-
{
76-
uint16_t creator = 0;
77-
uint8_t app = 0;
78-
uint8_t key = 0;
79-
appkey_mode mode = APPKEYMODE_INVALID;
80-
uint8_t reserved = 0;
81-
} __attribute__((packed));
82-
8324
class drivewireFuji : public virtualDevice
8425
{
8526
private:

‎lib/device/fuji.h‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,64 @@
11
#ifndef DEVICE_FUJI_H
22
#define DEVICE_FUJI_H
33

4+
#include <stdint.h>
5+
6+
#define MAX_HOSTS 8
7+
#define MAX_DISK_DEVICES 8
8+
#define MAX_NETWORK_DEVICES 4
9+
10+
#define MAX_SSID_LEN 32
11+
#define MAX_WIFI_PASS_LEN 64
12+
13+
#define READ_DEVICE_SLOTS_DISKS1 0x00
14+
#define READ_DEVICE_SLOTS_TAPE 0x10
15+
16+
#define MAX_APPKEY_LEN 64
17+
18+
enum appkey_mode : int8_t
19+
{
20+
APPKEYMODE_INVALID = -1,
21+
APPKEYMODE_READ = 0,
22+
APPKEYMODE_WRITE,
23+
APPKEYMODE_READ_256
24+
};
25+
26+
struct appkey
27+
{
28+
uint16_t creator = 0;
29+
uint8_t app = 0;
30+
uint8_t key = 0;
31+
appkey_mode mode = APPKEYMODE_INVALID;
32+
uint8_t reserved = 0;
33+
} __attribute__((packed));
34+
35+
#define ADAPTER_CONFIG_FIELDS \
36+
char ssid[33]; \
37+
char hostname[64]; \
38+
unsigned char localIP[4]; \
39+
unsigned char gateway[4]; \
40+
unsigned char netmask[4]; \
41+
unsigned char dnsIP[4]; \
42+
unsigned char macAddress[6]; \
43+
unsigned char bssid[6]; \
44+
char fn_version[15]
45+
46+
typedef struct
47+
{
48+
ADAPTER_CONFIG_FIELDS;
49+
} __attribute__((packed)) AdapterConfig;
50+
51+
typedef struct
52+
{
53+
ADAPTER_CONFIG_FIELDS;
54+
char sLocalIP[16];
55+
char sGateway[16];
56+
char sNetmask[16];
57+
char sDnsIP[16];
58+
char sMacAddress[18];
59+
char sBssid[18];
60+
} __attribute__((packed)) AdapterConfigExtended;
61+
462
#ifdef BUILD_ATARI
563
# include "sio/sioFuji.h"
664
#endif

‎lib/device/h89/H89Fuji.h‎

Lines changed: 0 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -9,48 +9,6 @@
99
#include "fujiHost.h"
1010
#include "fujiDisk.h"
1111

12-
#define MAX_HOSTS 8
13-
#define MAX_DISK_DEVICES 8
14-
#define MAX_NETWORK_DEVICES 4
15-
16-
#define MAX_SSID_LEN 32
17-
#define MAX_WIFI_PASS_LEN 64
18-
19-
#define MAX_APPKEY_LEN 64
20-
21-
#define READ_DEVICE_SLOTS_DISKS1 0x00
22-
#define READ_DEVICE_SLOTS_TAPE 0x10
23-
24-
typedef struct
25-
{
26-
char ssid[32];
27-
char hostname[64];
28-
unsigned char localIP[4];
29-
unsigned char gateway[4];
30-
unsigned char netmask[4];
31-
unsigned char dnsIP[4];
32-
unsigned char macAddress[6];
33-
unsigned char bssid[6];
34-
char fn_version[15];
35-
} AdapterConfig;
36-
37-
enum appkey_mode : int8_t
38-
{
39-
APPKEYMODE_INVALID = -1,
40-
APPKEYMODE_READ = 0,
41-
APPKEYMODE_WRITE,
42-
APPKEYMODE_READ_256
43-
};
44-
45-
struct appkey
46-
{
47-
uint16_t creator = 0;
48-
uint8_t app = 0;
49-
uint8_t key = 0;
50-
appkey_mode mode = APPKEYMODE_INVALID;
51-
uint8_t reserved = 0;
52-
} __attribute__((packed));
53-
5412
class H89Fuji : public virtualDevice
5513
{
5614
private:

0 commit comments

Comments
 (0)