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

Feature/fix weird kermit thing #396

Merged
merged 2 commits into from
Dec 16, 2023
Merged

Feature/fix weird kermit thing #396

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bcaaf4c
We've been lucky - it won't last. Fix it 😅
roscopeco Dec 16, 2023
bfc03ba
Also include header
roscopeco Dec 16, 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
2 changes: 1 addition & 1 deletion code/firmware/rosco_m68k_firmware/include/serial.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ void DISABLE_XMIT();
void ENABLE_XMIT();

uint8_t RECVCHAR();
void SENDCHAR(uint8_t);
void SENDCHAR_C(uint8_t);


#endif
Expand Down
4 changes: 2 additions & 2 deletions code/firmware/rosco_m68k_firmware/stage2/kermit/kermit_support.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* |_| |___|___|___|___|_____|_|_|_|___|___|_,_|
* |_____| firmware v2
* ------------------------------------------------------------
* Copyright (c)2019-2021 Ross Bamford and contributors
* Copyright (c)2019-2023 Ross Bamford and contributors
* See top-level LICENSE.md for licence information.
*
* Stage 2 Kermit loader
Expand Down Expand Up @@ -70,7 +70,7 @@ static int readpkt(struct k_data * k, UCHAR *p, int len) {

static int tx_data(struct k_data * k, UCHAR *p, int n) {
for (int i = 0; i < n; i++) {
SENDCHAR(*p++);
SENDCHAR_C(*p++);
}

return(X_OK); /* Success */
Expand Down
6 changes: 5 additions & 1 deletion code/firmware/rosco_m68k_firmware/stage2/serial.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
; |_| |___|___|___|___|_____|_|_|_|___|___|_,_|
; |_____| firmware v2
;------------------------------------------------------------
; Copyright (c)2019-2021 Ross Bamford and contributors
; Copyright (c)2019-2023 Ross Bamford and contributors
; See top-level LICENSE.md for licence information.
;
; This is low-level UART stuff and exception handlers for the
Expand All @@ -16,6 +16,10 @@

section .text

; Send a single character via UART from C
SENDCHAR_C::
move.l 4(A7),D0

; Send a single character via UART
;
; Trashes: MFP_UDR
Expand Down