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

Jump to bottom

Dynamic card reading in I650 #392

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Dynamic card reading in I650 #392

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f895896
I650: adjust carddeck split and join commands
Rhialto Jun 16, 2024
04b5ae5
SIM_CARD: count cards available to read with OK status
Rhialto Jun 17, 2024
9a3be89
I650: streaming implementation of carddeck print, split and join.
Rhialto Jun 16, 2024
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 I650/i650_cdp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1403,7 +1403,7 @@ uint32 cdp_cmd(UNIT * uptr, uint16 cmd, uint16 addr)
image[i] = 0;
} else {
// punch char
h = sim_ascii_to_hol(c);
h = ascii_to_hol(c);
image[i] = h;
}
}
Expand Down
22 changes: 11 additions & 11 deletions I650/i650_cdr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ int decode_8word_wiring(uint16 image[80], int bCheckForHiPunch)
// read word digits
for (iDigit=0;iDigit<10;iDigit++) {
c1 = image[iCol++];
c2 = sim_hol_to_ascii(c1); // convert to ascii
c2 = hol_to_ascii(c1); // convert to ascii
if ((c1 == 0xA00) || (c2 == '?')) {
c1 = 0xA00; c2 = '?'; // the punched value +0 should be represented by ascii ?
}
Expand All @@ -120,7 +120,7 @@ int decode_8word_wiring(uint16 image[80], int bCheckForHiPunch)
if ((iCol==10) &&
(c2 == '-')) NegPunch= 1; // allow a minus on col 10
c1 = c1 & 0x3FF; // remove X and Y punches
c2 = sim_hol_to_ascii(c1); // convert to ascii again
c2 = hol_to_ascii(c1); // convert to ascii again
c2 = c2 - '0'; // convert ascii to binary digit
if (c2 > 9) c2 = 0; // nondigits chars interpreted as zero
d = d * 10 + c2;
Expand Down Expand Up @@ -174,7 +174,7 @@ void decode_soap_symb_info(uint16 image[80])
i2=0;
for (i=40;i<80;i++) {
c1 = image[i];
c2 = sim_hol_to_ascii(c1);
c2 = hol_to_ascii(c1);
c2 = (strchr(mem_to_ascii, toupper(c2))) ? c2:' ';
if (c2 == '~') c2 = ' ';
if ((i==47) || (i==50) || (i==56)) buf[i2++] = ' '; // add space separation between op, da, ia fields
Expand Down Expand Up @@ -267,7 +267,7 @@ void decode_soap_wiring(uint16 image[80], int bMultiPass)
// keep 026 fortran charset
for (i=0;i<80;i++) {
c1 = image[i];
c2 = sim_hol_to_ascii(c1);
c2 = hol_to_ascii(c1);
c2 = (strchr(mem_to_ascii, toupper(c2))) ? c2:' ';
if (c2 == '~') c2 = ' ';
buf[i] = (char) c2;
Expand Down Expand Up @@ -348,7 +348,7 @@ void decode_supersoap_wiring(uint16 image[80])
// keep 026 fortran charset
for (i=0;i<80;i++) {
c1 = image[i];
c2 = sim_hol_to_ascii(c1);
c2 = hol_to_ascii(c1);
c2 = (strchr(mem_to_ascii, toupper(c2))) ? c2:' ';
if (c2 == '~') c2 = ' ';
buf[i] = (char) c2;
Expand Down Expand Up @@ -456,7 +456,7 @@ void decode_is_wiring(uint16 image[80])
// keep 0..9,+,-,<space>, replace anything else by <space>
for (i=0;i<80;i++) {
c1 = image[i];
c2 = sim_hol_to_ascii(c1);
c2 = hol_to_ascii(c1);
buf[i] = (strchr("+-0123456789", c2)) ? ((char) (c2)):' ';
}
buf[80] = 0; // terminate string
Expand Down Expand Up @@ -582,7 +582,7 @@ void decode_it_wiring(uint16 image[80])
// keep 026 fortran charset
for (i=0;i<80;i++) {
c1 = image[i];
c2 = sim_hol_to_ascii(c1);
c2 = hol_to_ascii(c1);
c2 = (strchr(mem_to_ascii, toupper(c2))) ? c2:' ';
if (c2 == '~') c2 = ' ';
buf[i] = (char) c2;
Expand Down Expand Up @@ -732,7 +732,7 @@ int decode_ra_wiring(uint16 image[80], int HiPunch)
for (i=0;i<80;i++) {
IsNeg = hbuf[i]=0;
c1 = image[i];
c2 = sim_hol_to_ascii(c1);
c2 = hol_to_ascii(c1);
c2 = toupper(c2);
if ((c1 == 0xA00) || (c2 == '?') || c2 == '+') {
hbuf[i]=1; c2='0'; // '0' or blank + HiPunch Y(12)
Expand Down Expand Up @@ -888,7 +888,7 @@ int decode_fds_wiring(uint16 image[80], int HiPunch)
for (i=0;i<80;i++) {
IsNeg =0;
c1 = image[i];
c2 = sim_hol_to_ascii(c1);
c2 = hol_to_ascii(c1);
c2 = toupper(c2);
if ((c1 == 0xA00) || (c2 == '?') || c2 == '+') {
c2='0'; // '0' or blank + HiPunch Y(12)
Expand Down Expand Up @@ -1063,7 +1063,7 @@ void decode_fortransit_wiring(uint16 image[80])
// keep 026 fortran charset
for (i=0;i<80;i++) {
c1 = image[i];
c2 = sim_hol_to_ascii(c1);
c2 = hol_to_ascii(c1);
c2 = toupper(c2);
c2 = (strchr(mem_to_ascii, c2)) ? c2:' ';
if (c2 == '~') c2 = ' ';
Expand Down Expand Up @@ -1156,7 +1156,7 @@ uint32 cdr_cmd(UNIT * uptr, uint16 cmd, uint16 addr)

// make local copy of card for debug output
for (i=0; i<80; i++)
cbuf[i] = sim_hol_to_ascii(image[i]);
cbuf[i] = hol_to_ascii(image[i]);
cbuf[80] = 0; // terminate string
sim_debug(DEBUG_DETAIL, &cpu_dev, "Read Card: %s\n", sim_trim_endspc(cbuf));

Expand Down
4 changes: 2 additions & 2 deletions I650/i650_defs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,8 @@ extern struct card_wirings {
extern char digits_ascii[31];
extern char mem_to_ascii[101];
extern int ascii_to_NN(int ch);
extern uint16 sim_ascii_to_hol(char c);
extern char sim_hol_to_ascii(uint16 hol);
extern uint16 ascii_to_hol(char c);
extern char hol_to_ascii(uint16 hol);

/* Generic devices common to all */
extern DEVICE cpu_dev;
Expand Down
Loading
Loading