# HG changeset patch # User Josef 'Jeff' Sipek # Date 1565108738 14400 # Tue Aug 06 12:25:38 2019 -0400 # Node ID 5874e9bc3f8afb0f365cdc849123e38ed210f89d # Parent f83f27397a01cd884b90f5120c670f76d13f86ef loader: remove shouting from ORB's variable name Signed-off-by: Josef 'Jeff' Sipek diff --git a/loader/loader/loader.h b/loader/loader/loader.h --- a/loader/loader/loader.h +++ b/loader/loader/loader.h @@ -52,7 +52,7 @@ 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 --- a/loader/loader/loader_asm.s +++ b/loader/loader/loader_asm.s @@ -39,7 +39,7 @@ 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 --- a/loader/loader/loader_c.c +++ b/loader/loader/loader_c.c @@ -28,7 +28,7 @@ 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 @@ r = (lba % RECORDS_PER_CYL) % RECORDS_PER_TRACK; r++; - ORB.addr = ADDR31(ccw); + orb.addr = ADDR31(ccw); /* SEEK */ ccw[0].cmd = 0x07;