From 45d3a3a22ff58290b4b172eb479025b90e33573b Mon Sep 17 00:00:00 2001 From: Josef 'Jeff' Sipek Date: Tue, 6 Aug 2019 12:25:38 -0400 Subject: [PATCH] loader: remove shouting from ORB's variable name Signed-off-by: Josef 'Jeff' Sipek --- loader/loader/loader.h | 2 +- loader/loader/loader_asm.s | 2 +- loader/loader/loader_c.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/loader/loader/loader.h b/loader/loader/loader.h index c53e1dc..6ee7c0e 100644 --- a/loader/loader/loader.h +++ b/loader/loader/loader.h @@ -52,7 +52,7 @@ extern void PGMHANDLER(); extern void load_nucleus(void); -extern struct orb ORB; +extern struct orb orb; extern struct irb irb; /* diff --git a/loader/loader/loader_asm.s b/loader/loader/loader_asm.s index ab1b804..99b4eb0 100644 --- a/loader/loader/loader_asm.s +++ b/loader/loader/loader_asm.s @@ -39,7 +39,7 @@ __do_io: L %r1, 0xb8 # load subsystem ID - SSCH ORB(%r4) # issue IO + SSCH orb(%r4) # issue IO /* 7) Enable the PSW for I/O interrupts and go into wait state (you need bits 6, 12 & 14 set to 1 in the PSW : X'020A000000000000' is a good example) diff --git a/loader/loader/loader_c.c b/loader/loader/loader_c.c index 5ae4dd7..4b6eb1d 100644 --- a/loader/loader/loader_c.c +++ b/loader/loader/loader_c.c @@ -28,7 +28,7 @@ static unsigned char seek_data[6]; static unsigned char search_data[5]; static struct ccw ccw[4]; -struct orb ORB = { +struct orb orb = { .param = 0x12345678, .f = 1, .lpm = 0xff, @@ -120,7 +120,7 @@ static void read_blk(void *ptr, u32 lba) r = (lba % RECORDS_PER_CYL) % RECORDS_PER_TRACK; r++; - ORB.addr = ADDR31(ccw); + orb.addr = ADDR31(ccw); /* SEEK */ ccw[0].cmd = 0x07; -- 2.11.4.GIT