Skip to content
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.

Sign up for GitHub

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

Add SCSI ethernet support, emulating a Dayna SCSI/Link #59

Merged
merged 18 commits into from
Oct 12, 2023
Merged

Add SCSI ethernet support, emulating a Dayna SCSI/Link #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
f895a6d
BlueSCSI_platform_RP2040: uart_init to 115200 to work through picoprobe
jcs May 18, 2023
d99b40a
log: add log_f and log_buf
jcs May 18, 2023
f810a21
PlatformIO Setup
androda May 27, 2023
79ccf7e
Missed a few steps
androda May 27, 2023
30ce435
Fixing up some things that cause crashes
androda May 27, 2023
7c0fde6
Leave GPIO 25 alone, it's not the LED
androda Jun 1, 2023
8842560
PlatformIO: Rebuilt libpico
jcs Jun 5, 2023
85f4699
Booting from SD, and comms with CYW43 working
androda Jun 2, 2023
487374b
build: Change board and core to upstream
jcs Jun 2, 2023
04b1e96
BlueSCSI_platform_RP2040: don't hard-code watchdog timer id
jcs May 18, 2023
02eaf2f
BlueSCSI_platform_RP2040: don't assign to unused variables
jcs May 23, 2023
858a45e
BlueSCSI_platform_RP2040: partially revert LED change
jcs Aug 9, 2023
868f4e7
network: Add SCSI ethernet support emulating a Dayna SCSI/Link
jcs May 18, 2023
e3aac81
network: Use an outbound queue
jcs Aug 18, 2023
9fece06
network: Store queue data together as structs
jcs Aug 24, 2023
59f6665
network: Don't configure new SCSI devices if network isn't supported
jcs Aug 24, 2023
f5dce26
Re-enable LED for status, disable for activity.
mactcp Oct 7, 2023
003b0da
config: Use "Dayna"/"SCSI/Link" as the default for all network devices
jcs Oct 12, 2023
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
65 changes: 53 additions & 12 deletions lib/BlueSCSI_platform_RP2040/BlueSCSI_platform.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,25 @@
#include <hardware/flash.h>
#include <hardware/structs/xip_ctrl.h>
#include <hardware/structs/usb.h>
#ifdef MBED
#include <platform/mbed_error.h>
#include <multicore.h>
#include <USB/PluggableUSBSerial.h>
#include "audio.h"
#endif
#include <pico/multicore.h>
#include "scsi_accel_rp2040.h"

extern "C" {
#include <pico/cyw43_arch.h>

const char *g_platform_name = PLATFORM_NAME;
static bool g_scsi_initiator = false;
static uint32_t g_flash_chip_size = 0;
static bool g_uart_initialized = false;

#ifdef MBED
void mbed_error_hook(const mbed_error_ctx * error_context);
#endif

/***************/
/* GPIO init */
Expand Down Expand Up @@ -103,14 +108,16 @@ void platform_init()
gpio_conf(SCSI_IN_ACK, GPIO_FUNC_SIO, false, false, false, false, false);
gpio_conf(SCSI_IN_ATN, GPIO_FUNC_SIO, false, false, false, false, false);
delay(10); /// Settle time
bool optionS1 = !gpio_get(SCSI_IN_ATN);
bool optionS2 = !gpio_get(SCSI_IN_ACK);
(void)!gpio_get(SCSI_IN_ATN); // S1
(void)!gpio_get(SCSI_IN_ACK); // S2

/* Initialize logging to SWO pin (UART0) */
gpio_conf(SWO_PIN, GPIO_FUNC_UART,false,false, true, false, true);
uart_init(uart0, 1000000);
uart_init(uart0, 115200);
g_uart_initialized = true;
#ifdef MBED
mbed_set_error_hook(mbed_error_hook);
#endif

//log("DIP switch settings: debug log ", (int)dbglog, ", termination ", (int)termination);
log("Platform: ", g_platform_name);
Expand Down Expand Up @@ -152,8 +159,10 @@ void platform_init()
gpio_conf(SDIO_D1, GPIO_FUNC_SIO, true, false, false, true, true);
gpio_conf(SDIO_D2, GPIO_FUNC_SIO, true, false, false, true, true);

// LED pin
gpio_conf(LED_PIN, GPIO_FUNC_SIO, false,false, true, false, false);
if (!platform_network_supported()) {
// LED pin
gpio_conf(LED_PIN, GPIO_FUNC_SIO, false,false, true, false, false);
}

#ifndef ENABLE_AUDIO_OUTPUT
#ifdef GPIO_I2C_SDA
Expand Down Expand Up @@ -297,9 +306,11 @@ bool platform_is_initiator_mode_enabled()
}

void platform_disable_led(void)
{
// pin function pup pdown out state fast
gpio_conf(LED_PIN, GPIO_FUNC_SIO, false,false, false, false, false);
{
if (!platform_network_supported()) {
// pin function pup pdown out state fast
gpio_conf(LED_PIN, GPIO_FUNC_SIO, false,false, false, false, false);
}
log("Disabling status LED");
}

Expand Down Expand Up @@ -333,6 +344,7 @@ void platform_emergency_log_save()
crashfile.close();
}

#ifdef MBED
void mbed_error_hook(const mbed_error_ctx * error_context)
{
log("--------------");
Expand Down Expand Up @@ -376,6 +388,7 @@ void mbed_error_hook(const mbed_error_ctx * error_context)
for (int j = 0; j < base_delay * 10; j++) delay_ns(100000);
}
}
#endif

/*****************************************/
/* Debug logging and watchdog */
Expand All @@ -390,6 +403,7 @@ void mbed_error_hook(const mbed_error_ctx * error_context)
// also starts calling this after 2 seconds.
// This ensures that log messages get passed even if code hangs,
// but does not unnecessarily delay normal execution.
#ifdef MBED
static void usb_log_poll()
{
static uint32_t logpos = 0;
Expand All @@ -412,6 +426,7 @@ static void usb_log_poll()
logpos -= available - actual;
}
}
#endif

// Use ADC to implement supply voltage monitoring for the +3.0V rail.
// This works by sampling the temperature sensor channel, which has
Expand Down Expand Up @@ -492,11 +507,13 @@ static void watchdog_callback(unsigned alarm_num)
{
g_watchdog_timeout -= 1000;

#ifdef MBED
if (g_watchdog_timeout < WATCHDOG_CRASH_TIMEOUT - 1000)
{
// Been stuck for at least a second, start dumping USB log
usb_log_poll();
}
#endif

if (g_watchdog_timeout <= WATCHDOG_CRASH_TIMEOUT - WATCHDOG_BUS_RESET_TIMEOUT)
{
Expand Down Expand Up @@ -543,7 +560,9 @@ static void watchdog_callback(unsigned alarm_num)
p += 4;
}

#ifdef MBED
usb_log_poll();
#endif
platform_emergency_log_save();

platform_boot_to_main_firmware();
Expand All @@ -561,22 +580,40 @@ void platform_reset_watchdog()

if (!g_watchdog_initialized)
{
hardware_alarm_claim(3);
hardware_alarm_set_callback(3, &watchdog_callback);
hardware_alarm_set_target(3, delayed_by_ms(get_absolute_time(), 1000));
int alarm_num = -1;
for (int i = 0; i < NUM_TIMERS; i++)
{
if (!hardware_alarm_is_claimed(i))
{
alarm_num = i;
break;
}
}
if (alarm_num == -1)
{
log("No free watchdog hardware alarms to claim");
return;
}
hardware_alarm_claim(alarm_num);
hardware_alarm_set_callback(alarm_num, &watchdog_callback);
hardware_alarm_set_target(alarm_num, delayed_by_ms(get_absolute_time(), 1000));
g_watchdog_initialized = true;
}

#ifdef MBED
// USB log is polled here also to make sure any log messages in fault states
// get passed to USB.
usb_log_poll();
#endif
}

// Poll function that is called every few milliseconds.
// Can be left empty or used for platform-specific processing.
void platform_poll()
{
#ifdef MBED
usb_log_poll();
#endif
adc_poll();

#ifdef ENABLE_AUDIO_OUTPUT
Expand Down Expand Up @@ -636,12 +673,14 @@ bool platform_rewrite_flash_page(uint32_t offset, uint8_t buffer[PLATFORM_FLASH_
}
}

#ifdef MBED
if (NVIC_GetEnableIRQ(USBCTRL_IRQn))
{
log("Disabling USB during firmware flashing");
NVIC_DisableIRQ(USBCTRL_IRQn);
usb_hw->main_ctrl = 0;
}
#endif

debuglog("Writing flash at offset ", offset, " data ", bytearray(buffer, 4));
assert(offset % PLATFORM_FLASH_PAGE_SIZE == 0);
Expand Down Expand Up @@ -874,6 +913,7 @@ const uint16_t g_scsi_parity_check_lookup[512] __attribute__((aligned(1024), sec

} /* extern "C" */

#ifdef MBED
/* Logging from mbed */

static class LogTarget: public mbed::FileHandle {
Expand All @@ -900,3 +940,4 @@ mbed::FileHandle *mbed::mbed_override_console(int fd)
{
return &g_LogTarget;
}
#endif
14 changes: 14 additions & 0 deletions lib/BlueSCSI_platform_RP2040/BlueSCSI_platform.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,20 @@ bool platform_write_romdrive(const uint8_t *data, uint32_t start, uint32_t count
extern const uint16_t g_scsi_parity_lookup[256];
extern const uint16_t g_scsi_parity_check_lookup[512];

// Network functions
bool platform_network_supported();
void platform_network_poll();
int platform_network_init(char *mac);
void platform_network_add_multicast_address(uint8_t *mac);
bool platform_network_wifi_join(char *ssid, char *password);
int platform_network_wifi_start_scan();
int platform_network_wifi_scan_finished();
void platform_network_wifi_dump_scan_list();
int platform_network_wifi_rssi();
char * platform_network_wifi_ssid();
char * platform_network_wifi_bssid();
int platform_network_wifi_channel();

// Below are GPIO access definitions that are used from scsiPhy.cpp.

// Write a single SCSI pin.
Expand Down
5 changes: 3 additions & 2 deletions lib/BlueSCSI_platform_RP2040/BlueSCSI_platform_gpio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#pragma once

#include <hardware/gpio.h>
#include <pico/cyw43_arch.h>

// SCSI data input/output port.
// The data bus uses external bidirectional buffer, with
Expand Down Expand Up @@ -53,8 +54,8 @@

// Status LED pins
#define LED_PIN 25
#define LED_ON() sio_hw->gpio_set = 1 << LED_PIN
#define LED_OFF() sio_hw->gpio_clr = 1 << LED_PIN
#define LED_ON() platform_network_supported() ? cyw43_gpio_set(&cyw43_state, 0, true) : sio_hw->gpio_set = 1 << LED_PIN
#define LED_OFF() platform_network_supported() ? cyw43_gpio_set(&cyw43_state, 0, false) : sio_hw->gpio_clr = 1 << LED_PIN

// SDIO and SPI block
#define SD_SPI_SCK 10
Expand Down
Loading