s390x: Rename and cleanup sclp-ascii.c
PATCH v6 2/11 s390x: Rename and cleanup sclp-ascii.c
Let's rename to the more fitting name sclp-console.c and fix some indentation problems.
Signed-off-by Janosch Frank <[email protected]>
Reviewed-by David Hildenbrand <[email protected]>
Reviewed-by Thomas Huth <[email protected]>
---
lib/s390x/io.c | 2 +-
lib/s390x/{sclp-ascii.c => sclp-console.c} | 38 +++++++++++++++---------------
lib/s390x/sclp.h | 2 +-
s390x/Makefile | 2 +-
4 files changed, 22 insertions(+), 22 deletions(-)
rename lib/s390x/{sclp-ascii.c => sclp-console.c} (54%)lib/s390x/io.c +1 -1
@@ -35,7 +35,7 @@ void setup(void) {setup_args_progname (ipl_args);setup_facilities (); -sclp_ascii_setup (); +sclp_console_setup ();sclp_memory_setup (); }
lib/s390x/sclp-console.c renamed from lib/s390x/sclp-ascii.c +19 -19
@@ -35,34 +35,34 @@ int sclp_service_call(unsigned int command, void *sccb)static void sclp_set_write_mask (void ) { -WriteEventMask *sccb = (void *)_sccb; +WriteEventMask *sccb = (void *)_sccb; - sccb->h.length =sizeof (WriteEventMask); - sccb->mask_length =sizeof (unsigned int ); - sccb->receive_mask =SCLP_EVENT_MASK_MSG_ASCII ; - sccb->cp_receive_mask =SCLP_EVENT_MASK_MSG_ASCII ; - sccb->send_mask =SCLP_EVENT_MASK_MSG_ASCII ; - sccb->cp_send_mask =SCLP_EVENT_MASK_MSG_ASCII ; + sccb->h.length =sizeof (WriteEventMask); + sccb->mask_length =sizeof (unsigned int ); + sccb->receive_mask =SCLP_EVENT_MASK_MSG_ASCII ; + sccb->cp_receive_mask =SCLP_EVENT_MASK_MSG_ASCII ; + sccb->send_mask =SCLP_EVENT_MASK_MSG_ASCII ; + sccb->cp_send_mask =SCLP_EVENT_MASK_MSG_ASCII ; -sclp_service_call (SCLP_CMD_WRITE_EVENT_MASK , sccb); +sclp_service_call (SCLP_CMD_WRITE_EVENT_MASK , sccb); } -void sclp_ascii_setup (void ) +void sclp_console_setup (void ) { -sclp_set_write_mask (); +sclp_set_write_mask (); }void sclp_print (const char *str) { -int len =strlen (str); -WriteEventData *sccb = (void *)_sccb; +int len =strlen (str); +WriteEventData *sccb = (void *)_sccb; - sccb->h.length =sizeof (WriteEventData) + len; - sccb->h.function_code =SCLP_FC_NORMAL_WRITE ; - sccb->ebh.length =sizeof (EventBufferHeader) + len; - sccb->ebh.type =SCLP_EVENT_ASCII_CONSOLE_DATA ; - sccb->ebh.flags =0 ; -memcpy (sccb->data, str, len); + sccb->h.length =sizeof (WriteEventData) + len; + sccb->h.function_code =SCLP_FC_NORMAL_WRITE ; + sccb->ebh.length =sizeof (EventBufferHeader) + len; + sccb->ebh.type =SCLP_EVENT_ASCII_CONSOLE_DATA ; + sccb->ebh.flags =0 ; +memcpy (sccb->data, str, len); -sclp_service_call (SCLP_CMD_WRITE_EVENT_DATA , sccb); +sclp_service_call (SCLP_CMD_WRITE_EVENT_DATA , sccb); }
lib/s390x/sclp.h +1 -1
@@ -212,7 +212,7 @@ typedef struct ReadEventData {uint32_t mask; } __attribute__((packed)) ReadEventData; -void sclp_ascii_setup (void ); +void sclp_console_setup (void );void sclp_print (const char *str);extern char _sccb[];int sclp_service_call (unsigned int command,void *sccb);
s390x/Makefile +1 -1
@@ -38,7 +38,7 @@ cflatobjs += lib/alloc_phys.o cflatobjs += lib/s390x/io.o cflatobjs += lib/s390x/stack.o cflatobjs += lib/s390x/sclp.o -cflatobjs += lib/s390x/sclp-ascii.o +cflatobjs += lib/s390x/sclp-console.o cflatobjs += lib/s390x/interrupt.o cflatobjs += lib/s390x/mmu.o
Signature · 1 line
2.14.3