From e26dff7f5fc9942bf93544cb22b4a9675bceae3b Mon Sep 17 00:00:00 2001
From: Oliver Schmidt
Date: Sat, 15 Jul 2023 20:13:23 +0200
Subject: [PATCH] Adjusted to the current A2retroNET hardware.
---
pipico/board.c | 2 +-
pipico/board.h | 2 --
pipico/bus.pio | 6 +++---
pipico/main.c | 26 --------------------------
4 files changed, 4 insertions(+), 32 deletions(-)
diff --git a/pipico/board.c b/pipico/board.c
index 071575f..6756ceb 100644
--- a/pipico/board.c
+++ b/pipico/board.c
@@ -30,7 +30,7 @@ SOFTWARE.
extern const __attribute__((aligned(4))) uint8_t firmware[];
-volatile bool active;
+static bool active;
static uint32_t command;
static uint32_t control;
diff --git a/pipico/board.h b/pipico/board.h
index ed3758f..b1ac9c5 100644
--- a/pipico/board.h
+++ b/pipico/board.h
@@ -27,8 +27,6 @@ SOFTWARE.
#ifndef _BOARD_H
#define _BOARD_H
-extern volatile bool active;
-
void board(void);
#endif
diff --git a/pipico/bus.pio b/pipico/bus.pio
index d708a8e..6dd012a 100644
--- a/pipico/bus.pio
+++ b/pipico/bus.pio
@@ -31,9 +31,9 @@ SOFTWARE.
.define public gpio_addr 2 // 12 pins
.define public gpio_rw 14
.define public gpio_data 15 // 8 pins
-.define public gpio_enbl 26 // DEVSEL | IOSEL | IOSTRB
-.define public gpio_irq 27
-.define public gpio_res 28
+.define public gpio_enbl 23 // DEVSEL | IOSEL | IOSTRB
+.define public gpio_irq 24
+.define public gpio_res 25
.define public size_addr 13 // incl. R/W
.define public size_data 8
diff --git a/pipico/main.c b/pipico/main.c
index e96692f..072d274 100644
--- a/pipico/main.c
+++ b/pipico/main.c
@@ -28,9 +28,6 @@ SOFTWARE.
#include "pico/printf.h"
#include "pico/stdlib.h"
#include "pico/multicore.h"
-#ifdef RASPBERRYPI_PICO_W
-#include "pico/cyw43_arch.h"
-#endif
#include "bus.pio.h"
#include "board.h"
@@ -49,25 +46,12 @@ void uart_printf(uart_inst_t *uart, const char *format, ...) {
}
#endif
-void res_callback(uint gpio, uint32_t events) {
-}
-
void main(void) {
multicore_launch_core1(board);
-#ifdef RASPBERRYPI_PICO_W
- cyw43_arch_init();
-#elif defined(PICO_DEFAULT_LED_PIN)
- gpio_init(PICO_DEFAULT_LED_PIN);
- gpio_set_dir(PICO_DEFAULT_LED_PIN, GPIO_OUT);
-#endif
-
gpio_init(gpio_irq);
gpio_pull_up(gpio_irq);
- gpio_init(gpio_res);
- gpio_set_irq_enabled_with_callback(gpio_res, GPIO_IRQ_EDGE_RISE, true, &res_callback);
-
stdio_init_all();
stdio_set_translate_crlf(&stdio_usb, false);
@@ -96,15 +80,5 @@ void main(void) {
#endif
}
}
-
-#ifdef RASPBERRYPI_PICO_W
- static bool last_active;
- if (active != last_active) {
- cyw43_arch_gpio_put(CYW43_WL_GPIO_LED_PIN, active);
- last_active = active;
- }
-#elif defined(PICO_DEFAULT_LED_PIN)
- gpio_put(PICO_DEFAULT_LED_PIN, active);
-#endif
}
}