[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 19/40] pc-bios/s390-ccw: Move ebc2asc to sclp.c
From: |
Christian Borntraeger |
Subject: |
[Qemu-devel] [PULL 19/40] pc-bios/s390-ccw: Move ebc2asc to sclp.c |
Date: |
Fri, 14 Jul 2017 12:40:46 +0200 |
From: Thomas Huth <address@hidden>
We will later need this array in a file that we will link to the
netboot code, too. Since there is some ebcdic conversion done
in sclp_get_loadparm_ascii(), the sclp.c file seems to be a good
candidate.
Acked-by: Cornelia Huck <address@hidden>
Reviewed-by: David Hildenbrand <address@hidden>
Signed-off-by: Thomas Huth <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Christian Borntraeger <address@hidden>
---
pc-bios/s390-ccw/main.c | 11 -----------
pc-bios/s390-ccw/sclp.c | 11 +++++++++++
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/pc-bios/s390-ccw/main.c b/pc-bios/s390-ccw/main.c
index 40cba8d..0580eac 100644
--- a/pc-bios/s390-ccw/main.c
+++ b/pc-bios/s390-ccw/main.c
@@ -17,17 +17,6 @@ static SubChannelId blk_schid = { .one = 1 };
IplParameterBlock iplb __attribute__((__aligned__(PAGE_SIZE)));
static char loadparm[8] = { 0, 0, 0, 0, 0, 0, 0, 0 };
-const unsigned char ebc2asc[256] =
- /* 0123456789abcdef0123456789abcdef */
- "................................" /* 1F */
- "................................" /* 3F */
- " ...........<(+|&.........!$*);." /* 5F first.chr.here.is.real.space
*/
- "-/.........,%_>?.........`:#@'=\""/* 7F */
- ".abcdefghi.......jklmnopqr......" /* 9F */
- "..stuvwxyz......................" /* BF */
- ".ABCDEFGHI.......JKLMNOPQR......" /* DF */
- "..STUVWXYZ......0123456789......";/* FF */
-
/*
* Priniciples of Operations (SA22-7832-09) chapter 17 requires that
* a subsystem-identification is at 184-187 and bytes 188-191 are zero
diff --git a/pc-bios/s390-ccw/sclp.c b/pc-bios/s390-ccw/sclp.c
index aa1c862..2ee204a 100644
--- a/pc-bios/s390-ccw/sclp.c
+++ b/pc-bios/s390-ccw/sclp.c
@@ -14,6 +14,17 @@
static char _sccb[PAGE_SIZE] __attribute__((__aligned__(4096)));
+const unsigned char ebc2asc[256] =
+ /* 0123456789abcdef0123456789abcdef */
+ "................................" /* 1F */
+ "................................" /* 3F */
+ " ...........<(+|&.........!$*);." /* 5F first.chr.here.is.real.space
*/
+ "-/.........,%_>?.........`:#@'=\""/* 7F */
+ ".abcdefghi.......jklmnopqr......" /* 9F */
+ "..stuvwxyz......................" /* BF */
+ ".ABCDEFGHI.......JKLMNOPQR......" /* DF */
+ "..STUVWXYZ......0123456789......";/* FF */
+
/* Perform service call. Return 0 on success, non-zero otherwise. */
static int sclp_service_call(unsigned int command, void *sccb)
{
--
2.7.4
- [Qemu-devel] [PULL 35/40] s390x/cpumodel: we are always in zarchitecture mode, (continued)
- [Qemu-devel] [PULL 35/40] s390x/cpumodel: we are always in zarchitecture mode, Christian Borntraeger, 2017/07/14
- [Qemu-devel] [PULL 28/40] pc-bios/s390-ccw: Link libnet into the netboot image and do the TFTP load, Christian Borntraeger, 2017/07/14
- [Qemu-devel] [PULL 38/40] s390x/kvm: enable guarded storage, Christian Borntraeger, 2017/07/14
- [Qemu-devel] [PULL 40/40] s390x/gdb: add gs registers, Christian Borntraeger, 2017/07/14
- [Qemu-devel] [PULL 27/40] pc-bios/s390-ccw: Add virtio-net driver code, Christian Borntraeger, 2017/07/14
- [Qemu-devel] [PULL 26/40] pc-bios/s390-ccw: Add core files for the network bootloading program, Christian Borntraeger, 2017/07/14
- [Qemu-devel] [PULL 25/40] roms/SLOF: Update submodule to latest status, Christian Borntraeger, 2017/07/14
- [Qemu-devel] [PULL 22/40] pc-bios/s390-ccw: Move byteswap functions to a separate header, Christian Borntraeger, 2017/07/14
- [Qemu-devel] [PULL 19/40] pc-bios/s390-ccw: Move ebc2asc to sclp.c,
Christian Borntraeger <=
- [Qemu-devel] [PULL 23/40] pc-bios/s390-ccw: Remove unused structs from virtio.h, Christian Borntraeger, 2017/07/14
- [Qemu-devel] [PULL 36/40] s390x/cpumodel: add esop/esop2 to z12 model, Christian Borntraeger, 2017/07/14
- [Qemu-devel] [PULL 06/40] s390x/cpumodel: provide compat handling for new cpu features, Christian Borntraeger, 2017/07/14
- [Qemu-devel] [PULL 15/40] s390x/css: add ORB to SubchDev, Christian Borntraeger, 2017/07/14
- [Qemu-devel] [PULL 37/40] s390x/kvm: Enable KSS facility for nested virtualization, Christian Borntraeger, 2017/07/14
- [Qemu-devel] [PULL 14/40] s390x/css: add missing css state conditionally, Christian Borntraeger, 2017/07/14
- [Qemu-devel] [PULL 30/40] pc-bios/s390: rebuild s390-ccw.img, Christian Borntraeger, 2017/07/14
- [Qemu-devel] [PULL 13/40] s390x: add css_migration_enabled to machine class, Christian Borntraeger, 2017/07/14