Skip to content

Commit

Permalink
pc-bios/s390-ccw: Add a write() function for stdio
Browse files Browse the repository at this point in the history
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>
Reviewed-by: David Hildenbrand <david@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
Message-Id: <1499863793-18627-5-git-send-email-thuth@redhat.com>
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
  • Loading branch information
huth authored and borntraeger committed Jul 14, 2017
1 parent 867e039 commit 3639f93
Showing 1 changed file with 14 additions and 2 deletions.
16 changes: 14 additions & 2 deletions pc-bios/s390-ccw/sclp.c
Expand Up @@ -12,6 +12,8 @@
#include "s390-ccw.h"
#include "sclp.h"

long write(int fd, const void *str, size_t len);

static char _sccb[PAGE_SIZE] __attribute__((__aligned__(4096)));

const unsigned char ebc2asc[256] =
Expand Down Expand Up @@ -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;
Expand All @@ -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)
Expand Down

0 comments on commit 3639f93

Please sign in to comment.