| Message ID | 1499700760-4777-5-git-send-email-thuth@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 10.07.2017 17:32, Thomas Huth wrote: > The stdio functions from the SLOF libc need a write() function for > printing text to stdout/stderr. Let's implement this function by > refactoring the code from sclp_print(). > > Acked-by: Cornelia Huck <cohuck@redhat.com> > Signed-off-by: Thomas Huth <thuth@redhat.com> > --- > pc-bios/s390-ccw/sclp.c | 16 ++++++++++++++-- > 1 file changed, 14 insertions(+), 2 deletions(-) > > diff --git a/pc-bios/s390-ccw/sclp.c b/pc-bios/s390-ccw/sclp.c > index 2ee204a..f6466db 100644 > --- a/pc-bios/s390-ccw/sclp.c > +++ b/pc-bios/s390-ccw/sclp.c > @@ -12,6 +12,8 @@ > #include "s390-ccw.h" > #include "sclp.h" > > +long write(int fd, const void *buf, size_t len); > + > static char _sccb[PAGE_SIZE] __attribute__((__aligned__(4096))); > > const unsigned char ebc2asc[256] = > @@ -71,11 +73,14 @@ static int _strlen(const char *str) > return i; > } > > -void sclp_print(const char *str) > +long write(int fd, const void *str, size_t len) "buf" (above) vs. "str" here > { > - int len = _strlen(str); > WriteEventData *sccb = (void *)_sccb; > > + if (fd != 1 && fd != 2) { > + return -EIO; > + } > + > sccb->h.length = sizeof(WriteEventData) + len; > sccb->h.function_code = SCLP_FC_NORMAL_WRITE; > sccb->ebh.length = sizeof(EventBufferHeader) + len; > @@ -84,6 +89,13 @@ void sclp_print(const char *str) > memcpy(sccb->data, str, len); > > sclp_service_call(SCLP_CMD_WRITE_EVENT_DATA, sccb); > + > + return len; > +} > + > +void sclp_print(const char *str) > +{ > + write(1, str, _strlen(str)); > } > > void sclp_get_loadparm_ascii(char *loadparm) > Reviewed-by: David Hildenbrand <david@redhat.com>
diff --git a/pc-bios/s390-ccw/sclp.c b/pc-bios/s390-ccw/sclp.c index 2ee204a..f6466db 100644 --- a/pc-bios/s390-ccw/sclp.c +++ b/pc-bios/s390-ccw/sclp.c @@ -12,6 +12,8 @@ #include "s390-ccw.h" #include "sclp.h" +long write(int fd, const void *buf, size_t len); + static char _sccb[PAGE_SIZE] __attribute__((__aligned__(4096))); const unsigned char ebc2asc[256] = @@ -71,11 +73,14 @@ static int _strlen(const char *str) return i; } -void sclp_print(const char *str) +long write(int fd, const void *str, size_t len) { - int len = _strlen(str); WriteEventData *sccb = (void *)_sccb; + if (fd != 1 && fd != 2) { + return -EIO; + } + sccb->h.length = sizeof(WriteEventData) + len; sccb->h.function_code = SCLP_FC_NORMAL_WRITE; sccb->ebh.length = sizeof(EventBufferHeader) + len; @@ -84,6 +89,13 @@ void sclp_print(const char *str) memcpy(sccb->data, str, len); sclp_service_call(SCLP_CMD_WRITE_EVENT_DATA, sccb); + + return len; +} + +void sclp_print(const char *str) +{ + write(1, str, _strlen(str)); } void sclp_get_loadparm_ascii(char *loadparm)