SerialICE November 2009

serialice@serialice.com

10 participants
42 discussions

r51 - trunk/qemu-0.11.0
by svn＠coresystems.de 19 Nov '09

19 Nov '09

Author: stepan Date: 2009-11-19 19:46:51 +0100 (Thu, 19 Nov 2009) New Revision: 51 Modified: trunk/qemu-0.11.0/serialice.c Log: This should fix the readback errors on MINGW Modified: trunk/qemu-0.11.0/serialice.c =================================================================== --- trunk/qemu-0.11.0/serialice.c 2009-11-19 16:31:15 UTC (rev 50) +++ trunk/qemu-0.11.0/serialice.c 2009-11-19 18:46:51 UTC (rev 51) @@ -405,7 +405,7 @@ int ret = 0; while (ret == 0) WriteFile(state->fd, buffer + i, 1, &ret, NULL); ret = 0; - while (ret == 0) ReadFile(state->fd, buffer + i, 1, &ret, NULL); + while (ret == 0) ReadFile(state->fd, &c, 1, &ret, NULL); #else while (write(state->fd, buffer + i, 1) != 1) ; while (read(state->fd, &c, 1) != 1) ;

1 0

r50 - in trunk/qemu-0.11.0: . audio block slirp
by svn＠coresystems.de 19 Nov '09

19 Nov '09

Author: stepan Date: 2009-11-19 17:31:15 +0100 (Thu, 19 Nov 2009) New Revision: 50 Modified: trunk/qemu-0.11.0/ trunk/qemu-0.11.0/audio/ trunk/qemu-0.11.0/block/ trunk/qemu-0.11.0/slirp/ Log: ignore temporary files. Property changes on: trunk/qemu-0.11.0 ___________________________________________________________________ Added: svn:ignore + *.d *.texi *.pod x86_64-softmmu i386-softmmu libhw32 libhw64 qemu.1 qemu-nbd.8 qemu-img.1 qemu-img qemu-img-cmds.h config-host.mak config-host.h qemu-tech.html qemu-doc.html Property changes on: trunk/qemu-0.11.0/audio ___________________________________________________________________ Added: svn:ignore + *.d Property changes on: trunk/qemu-0.11.0/block ___________________________________________________________________ Added: svn:ignore + *.d Property changes on: trunk/qemu-0.11.0/slirp ___________________________________________________________________ Added: svn:ignore + *.d

1 0

r49 - trunk/SerialICE
by svn＠coresystems.de 19 Nov '09

19 Nov '09

Author: stepan Date: 2009-11-19 14:06:33 +0100 (Thu, 19 Nov 2009) New Revision: 49 Modified: trunk/SerialICE/io.h trunk/SerialICE/types.h Log: Drop all occurences of uintXX_t types; only stick to uXX types instead. (consistency patch) Modified: trunk/SerialICE/io.h =================================================================== --- trunk/SerialICE/io.h 2009-11-19 13:05:10 UTC (rev 48) +++ trunk/SerialICE/io.h 2009-11-19 13:06:33 UTC (rev 49) @@ -82,38 +82,38 @@ return __builtin_inl(port); } #else -static inline void outb(uint8_t value, uint16_t port) +static inline void outb(u8 value, u16 port) { __asm__ __volatile__("outb %b0, %w1"::"a"(value), "Nd"(port)); } -static inline void outw(uint16_t value, uint16_t port) +static inline void outw(u16 value, u16 port) { __asm__ __volatile__("outw %w0, %w1"::"a"(value), "Nd"(port)); } -static inline void outl(uint32_t value, uint16_t port) +static inline void outl(u32 value, u16 port) { __asm__ __volatile__("outl %0, %w1"::"a"(value), "Nd"(port)); } -static inline uint8_t inb(uint16_t port) +static inline u8 inb(u16 port) { - uint8_t value; + u8 value; __asm__ __volatile__("inb %w1, %b0":"=a"(value): "Nd"(port)); return value; } -static inline uint16_t inw(uint16_t port) +static inline u16 inw(u16 port) { - uint16_t value; + u16 value; __asm__ __volatile__("inw %w1, %w0":"=a"(value): "Nd"(port)); return value; } -static inline uint32_t inl(uint16_t port) +static inline u32 inl(u16 port) { - uint32_t value; + u32 value; __asm__ __volatile__("inl %w1, %0":"=a"(value): "Nd"(port)); return value; } @@ -122,7 +122,7 @@ /* MSR functions */ #ifdef __GNUC__ -typedef struct { uint32_t lo, hi; } msr_t; +typedef struct { u32 lo, hi; } msr_t; static inline msr_t rdmsr(unsigned index) { Modified: trunk/SerialICE/types.h =================================================================== --- trunk/SerialICE/types.h 2009-11-19 13:05:10 UTC (rev 48) +++ trunk/SerialICE/types.h 2009-11-19 13:06:33 UTC (rev 49) @@ -17,11 +17,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -typedef unsigned char uint8_t; -typedef unsigned short uint16_t; -typedef unsigned int uint32_t; +typedef unsigned char u8; +typedef unsigned short u16; +typedef unsigned int u32; -typedef uint8_t u8; -typedef uint16_t u16; -typedef uint32_t u32; -

1 0

r48 - trunk/SerialICE/mainboard
by svn＠coresystems.de 19 Nov '09

19 Nov '09

Author: stepan Date: 2009-11-19 14:05:10 +0100 (Thu, 19 Nov 2009) New Revision: 48 Modified: trunk/SerialICE/mainboard/dell_s1850.c Log: Clean up DELL S1850 init code (cosmetical). It seems the BMC is an EC in the classical sense. Modified: trunk/SerialICE/mainboard/dell_s1850.c =================================================================== --- trunk/SerialICE/mainboard/dell_s1850.c 2009-11-19 12:55:28 UTC (rev 47) +++ trunk/SerialICE/mainboard/dell_s1850.c 2009-11-19 13:05:10 UTC (rev 48) @@ -45,8 +45,8 @@ #define nftransport 0xc -#define OBF 0 -#define IBF 1 +#define OBF (1 << 0) +#define IBF (1 << 1) #define ipmidata 0xca0 #define ipmicsr 0xca4 @@ -54,7 +54,7 @@ static inline void ibfzero(void) { - while(inb(ipmicsr) & (1<<IBF)) + while(inb(ipmicsr) & IBF) ; } static inline void clearobf(void) @@ -64,9 +64,10 @@ static inline void waitobf(void) { - while((inb(ipmicsr) & (1<<OBF)) == 0) + while((inb(ipmicsr) & OBF) == 0) ; } + /* quite possibly the stupidest interface ever designed. */ static inline void first_cmd_byte(unsigned char byte) { @@ -80,7 +81,6 @@ static inline void next_cmd_byte(unsigned char byte) { - ibfzero(); clearobf(); outb(byte, ipmidata); @@ -156,6 +156,5 @@ mainboard_set_ich5(); bmc_foad(); superio_init(); - outb('F', 0x3f8); }

1 0

r47 - in trunk/SerialICE: . patches
by svn＠coresystems.de 19 Nov '09

19 Nov '09

Author: stepan Date: 2009-11-19 13:55:28 +0100 (Thu, 19 Nov 2009) New Revision: 47 Removed: trunk/SerialICE/patches/serialice-cpuid-ecx.diff Modified: trunk/SerialICE/io.h trunk/SerialICE/serialice.c Log: Only a typo kept the CPUID fix from compiling with romcc. Found the typo so commit this per default: Some invocations of cpuid honor the ECX register in addition to the EAX register as an input parameter. This patch fixes cpuid in these (rare) cases. Modified: trunk/SerialICE/io.h =================================================================== --- trunk/SerialICE/io.h 2009-11-19 09:23:30 UTC (rev 46) +++ trunk/SerialICE/io.h 2009-11-19 12:55:28 UTC (rev 47) @@ -162,46 +162,46 @@ /* CPUID functions */ -static inline unsigned int cpuid_eax(unsigned int op) +static inline unsigned int cpuid_eax(unsigned int op, unsigned op2) { unsigned int eax; __asm__("cpuid" : "=a" (eax) - : "0" (op) + : "0" (op), "2" (op2) : "ebx", "ecx", "edx"); return eax; } -static inline unsigned int cpuid_ebx(unsigned int op) +static inline unsigned int cpuid_ebx(unsigned int op, unsigned op2) { unsigned int eax, ebx; __asm__("cpuid" : "=a" (eax), "=b" (ebx) - : "0" (op) + : "0" (op), "2" (op2) : "ecx", "edx" ); return ebx; } -static inline unsigned int cpuid_ecx(unsigned int op) +static inline unsigned int cpuid_ecx(unsigned int op, unsigned int op2) { unsigned int eax, ecx; __asm__("cpuid" : "=a" (eax), "=c" (ecx) - : "0" (op) + : "0" (op), "2" (op2) : "ebx", "edx" ); return ecx; } -static inline unsigned int cpuid_edx(unsigned int op) +static inline unsigned int cpuid_edx(unsigned int op, unsigned int op2) { unsigned int eax, edx; __asm__("cpuid" : "=a" (eax), "=d" (edx) - : "0" (op) + : "0" (op), "2" (op2) : "ebx", "ecx"); return edx; } Deleted: trunk/SerialICE/patches/serialice-cpuid-ecx.diff =================================================================== --- trunk/SerialICE/patches/serialice-cpuid-ecx.diff 2009-11-19 09:23:30 UTC (rev 46) +++ trunk/SerialICE/patches/serialice-cpuid-ecx.diff 2009-11-19 12:55:28 UTC (rev 47) @@ -1,87 +0,0 @@ -Index: serialice.c -=================================================================== ---- serialice.c (revision 18) -+++ serialice.c (working copy) -@@ -161,19 +161,19 @@ - * have to worry about running out of registers if we - * occupy eax, ebx, ecx, edx at the same time - */ -- reg32 = cpuid_eax(eax); -+ reg32 = cpuid_eax(eax, ecx); - sio_put32(reg32); - sio_putc('.'); - -- reg32 = cpuid_ebx(eax); -+ reg32 = cpuid_ebx(eax, ecx); - sio_put32(reg32); - sio_putc('.'); - -- reg32 = cpuid_ecx(eax); -+ reg32 = cpuid_ecx(eax, ecx); - sio_put32(reg32); - sio_putc('.'); - -- reg32 = cpuid_edx(eax); -+ reg32 = cpuid_edx(eax, ecx); - sio_put32(reg32); - } - -Index: io.h -=================================================================== ---- io.h (revision 12) -+++ io.h (working copy) -@@ -162,46 +162,46 @@ - - /* CPUID functions */ - --static inline unsigned int cpuid_eax(unsigned int op) -+static inline unsigned int cpuid_eax(unsigned int op, unsigned op2) - { - unsigned int eax; - - __asm__("cpuid" - : "=a" (eax) -- : "0" (op) -+ : "0" (op), "2" (op) - : "ebx", "ecx", "edx"); - return eax; - } - --static inline unsigned int cpuid_ebx(unsigned int op) -+static inline unsigned int cpuid_ebx(unsigned int op, unsigned op2) - { - unsigned int eax, ebx; - - __asm__("cpuid" - : "=a" (eax), "=b" (ebx) -- : "0" (op) -+ : "0" (op), "2" (op2) - : "ecx", "edx" ); - return ebx; - } - --static inline unsigned int cpuid_ecx(unsigned int op) -+static inline unsigned int cpuid_ecx(unsigned int op, unsigned int op2) - { - unsigned int eax, ecx; - - __asm__("cpuid" - : "=a" (eax), "=c" (ecx) -- : "0" (op) -+ : "0" (op), "2" (op2) - : "ebx", "edx" ); - return ecx; - } - --static inline unsigned int cpuid_edx(unsigned int op) -+static inline unsigned int cpuid_edx(unsigned int op, unsigned int op2) - { - unsigned int eax, edx; - - __asm__("cpuid" - : "=a" (eax), "=d" (edx) -- : "0" (op) -+ : "0" (op), "2" (op2) - : "ebx", "ecx"); - return edx; - } Modified: trunk/SerialICE/serialice.c =================================================================== --- trunk/SerialICE/serialice.c 2009-11-19 09:23:30 UTC (rev 46) +++ trunk/SerialICE/serialice.c 2009-11-19 12:55:28 UTC (rev 47) @@ -161,19 +161,19 @@ * have to worry about running out of registers if we * occupy eax, ebx, ecx, edx at the same time */ - reg32 = cpuid_eax(eax); + reg32 = cpuid_eax(eax, ecx); sio_put32(reg32); sio_putc('.'); - reg32 = cpuid_ebx(eax); + reg32 = cpuid_ebx(eax, ecx); sio_put32(reg32); sio_putc('.'); - reg32 = cpuid_ecx(eax); + reg32 = cpuid_ecx(eax, ecx); sio_put32(reg32); sio_putc('.'); - reg32 = cpuid_edx(eax); + reg32 = cpuid_edx(eax, ecx); sio_put32(reg32); }

1 0

Add support for the ASUS P2B maotherboard
by Mark Marshall 19 Nov '09

19 Nov '09

Hi. This small patch adds support for the ASUS P2B motherboard. Thanks for a cool tool. MM

2 1

r46 - in trunk/SerialICE: . mainboard
by svn＠coresystems.de 19 Nov '09

19 Nov '09

Author: stepan Date: 2009-11-19 10:23:30 +0100 (Thu, 19 Nov 2009) New Revision: 46 Added: trunk/SerialICE/mainboard/asus_p2b.c Modified: trunk/SerialICE/Kconfig Log: >From Mark Marshall <mark.marshall(a)csr.com>: Support for the ASUS P2B motherboard. Modified: trunk/SerialICE/Kconfig =================================================================== --- trunk/SerialICE/Kconfig 2009-11-18 20:30:57 UTC (rev 45) +++ trunk/SerialICE/Kconfig 2009-11-19 09:23:30 UTC (rev 46) @@ -50,6 +50,9 @@ config BOARD_THOMSON_IP1000 bool "Thomson IP1000" +config BOARD_ASUS_P2B + bool "ASUS P2B" + endchoice config BOARD_INIT @@ -61,6 +64,7 @@ default "msi_ms6178.c" if BOARD_MSI_MS6178 default "rca_rm4100.c" if BOARD_RCA_RM4100 default "thomson_ip1000.c" if BOARD_THOMSON_IP1000 + default "asus_p2b.c" if BOARD_ASUS_P2B choice prompt "Target communication" Added: trunk/SerialICE/mainboard/asus_p2b.c =================================================================== --- trunk/SerialICE/mainboard/asus_p2b.c (rev 0) +++ trunk/SerialICE/mainboard/asus_p2b.c 2009-11-19 09:23:30 UTC (rev 46) @@ -0,0 +1,45 @@ +/* + * SerialICE + * + * Copyright (C) 2009 Mark Marshall <mark.marshall(a)csr.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/* + * This is a chipset init file for the ASUS P2B mainboard. + */ + +#define PNP_PORT 0x3f0 + +static void superio_init(void) +{ + /* Enter the configuration state. */ + pnp_enter_ext_func_mode(PNP_PORT); + + /* COMA */ + pnp_set_logical_device(PNP_PORT, 2); + pnp_set_enable(PNP_PORT, 0); + pnp_set_iobase0(PNP_PORT, CONFIG_SERIAL_PORT); + pnp_set_irq0(PNP_PORT, 4); + pnp_set_enable(PNP_PORT, 1); + + /* Exit the configuration state. */ + pnp_exit_ext_func_mode(PNP_PORT); +} + +static void chipset_init(void) +{ + superio_init(); +}

1 0

r45 - trunk/qemu-0.11.0
by svn＠coresystems.de 18 Nov '09

18 Nov '09

Author: oxygene Date: 2009-11-18 21:30:57 +0100 (Wed, 18 Nov 2009) New Revision: 45 Modified: trunk/qemu-0.11.0/serialice.c Log: First part of win32 support. Compiles, it's properly #ifdef-guarded, and it might just work. However, it's untested. Modified: trunk/qemu-0.11.0/serialice.c =================================================================== --- trunk/qemu-0.11.0/serialice.c 2009-11-18 18:57:14 UTC (rev 44) +++ trunk/qemu-0.11.0/serialice.c 2009-11-18 20:30:57 UTC (rev 45) @@ -28,9 +28,14 @@ #include <stdint.h> #include <unistd.h> #include <string.h> +#ifdef WIN32 +#include <windows.h> +#include <conio.h> +#else #include <fcntl.h> #include <termios.h> #include <sys/ioctl.h> +#endif /* LUA includes */ #include <lua.h> @@ -46,7 +51,11 @@ #define SERIALICE_DEBUG 3 #define BUFFER_SIZE 1024 typedef struct { +#ifdef WIN32 + HANDLE fd; +#else int fd; +#endif char *buffer; } SerialICEState; @@ -55,7 +64,9 @@ int serialice_active = 0; const char *serialice_lua_script="serialice.lua"; +#ifndef WIN32 static struct termios options; +#endif static lua_State *L; @@ -359,6 +370,11 @@ int bytes_read = 0; while (1) { +#ifdef WIN32 + int ret; + if (!ReadFile(state->fd, buf, nbyte - bytes_read, &ret, NULL)) + break; +#else int ret = read(state->fd, buf, nbyte - bytes_read); if (ret == -1 && errno == EINTR) @@ -366,6 +382,7 @@ if (ret == -1) break; +#endif bytes_read += ret; buf += ret; @@ -384,8 +401,15 @@ int i; for (i = 0; i < (int)nbyte; i++) { +#ifdef WIN32 + int ret = 0; + while (ret == 0) WriteFile(state->fd, buffer + i, 1, &ret, NULL); + ret = 0; + while (ret == 0) ReadFile(state->fd, buffer + i, 1, &ret, NULL); +#else while (write(state->fd, buffer + i, 1) != 1) ; while (read(state->fd, &c, 1) != 1) ; +#endif if (c != buffer[i]) { printf("Readback error! %x/%x\n", c, buffer[i]); } @@ -805,7 +829,49 @@ } s = qemu_mallocz(sizeof(SerialICEState)); +#ifdef WIN32 + s->fd = CreateFile(serialice_device, GENERIC_READ | GENERIC_WRITE, + 0, NULL, OPEN_EXISTING, 0, NULL); + if (s->fd == INVALID_HANDLE_VALUE) { + perror("SerialICE: Could not connect to target TTY"); + exit(1); + } + + DCB dcb; + if (!GetCommState(s->fd, &dcb)) { + perror("SerialICE: Could not load config for target TTY"); + exit(1); + } + + dcb.BaudRate = 115200; + dcb.ByteSize = 8; + dcb.Parity = NOPARITY; + dcb.StopBits = ONESTOPBIT; + dcb.fDtrControl = DTR_CONTROL_DISABLE; + dcb.fInX = FALSE; + + if (!SetCommState(s->fd, &dcb)) { + perror("SerialICE: Could not store config for target TTY"); + exit(1); + } + + COMMTIMEOUTS to; + if (!GetCommTimeouts(s->fd, &to)) { + perror("SerialICE: Could not load timeouts for target TTY"); + exit(1); + } + + to.ReadIntervalTimeout = 1000; + to.ReadTotalTimeoutMultiplier = 0; + to.ReadTotalTimeoutConstant = 0; + + if (!SetCommTimeouts(s->fd, &to)) { + perror("SerialICE: Could not store timeouts for target TTY"); + exit(1); + } + +#else s->fd = open(serialice_device, O_RDWR | O_NOCTTY | O_NONBLOCK); if (s->fd == -1) { @@ -842,6 +908,7 @@ tcsetattr(s->fd, TCSANOW, &options); tcflush(s->fd, TCIOFLUSH); +#endif s->buffer = qemu_mallocz(BUFFER_SIZE);

1 0

Suggestion for www.serialice.com
by Joseph Smith 18 Nov '09

18 Nov '09

Hello, I have a small suggestion for the website. Can a small snip of the beginning of the log file and the shell output be shown so people know what to expect to see when they run SerialICE? -- Thanks, Joseph Smith Set-Top-Linux www.settoplinux.org

2 1

r44 - trunk/qemu-0.11.0
by svn＠coresystems.de 18 Nov '09

18 Nov '09

Author: stepan Date: 2009-11-18 19:57:14 +0100 (Wed, 18 Nov 2009) New Revision: 44 Modified: trunk/qemu-0.11.0/serialice.c Log: * read the prompt _before_ sending a command, not after. * when reading the prompt, read until there is a valid prompt These changes might slightly speed up emulation, but the real benefit is that SerialICE should survive all kinds of reset scenarios now without changing the shell. Modified: trunk/qemu-0.11.0/serialice.c =================================================================== --- trunk/qemu-0.11.0/serialice.c 2009-11-18 17:51:02 UTC (rev 43) +++ trunk/qemu-0.11.0/serialice.c 2009-11-18 18:57:14 UTC (rev 44) @@ -333,7 +333,6 @@ { int result; - lua_getfield(L, LUA_GLOBALSINDEX, "SerialICE_cpuid_log"); lua_pushinteger(L, eax); // input: eax @@ -360,7 +359,7 @@ int bytes_read = 0; while (1) { - int ret = read(state->fd, buf, nbyte); + int ret = read(state->fd, buf, nbyte - bytes_read); if (ret == -1 && errno == EINTR) continue; @@ -395,6 +394,31 @@ return nbyte; } +static int serialice_wait_prompt(void) +{ + char buf[3]; + int l; + + l = serialice_read(s, buf, 3); + + if (l == -1) { + perror("SerialICE: Could not read from target"); + exit(1); + } + + while (buf[0] != '\n' || buf[1] != '>' || buf[2] != ' ') { + buf[0] = buf[1]; + buf[1] = buf[2]; + l = serialice_read(s, buf + 2, 1); + if (l == -1) { + perror("SerialICE: Could not read from target"); + exit(1); + } + } + + return 0; +} + static void serialice_command(const char *command, int reply_len) { #if SERIALICE_DEBUG > 5 @@ -402,6 +426,8 @@ #endif int l; + serialice_wait_prompt(); + serialice_write(s, command, strlen(command)); memset(s->buffer, 0, reply_len + 1); // clear enough of the buffer @@ -440,8 +466,8 @@ return data & 0xff; sprintf(command, "*ri%04x.b", port); - // command read back: "\n00\n> " (6 characters) - serialice_command(command, 6); + // command read back: "\n00" (3 characters) + serialice_command(command, 3); ret = (uint8_t)strtoul(s->buffer + 1, (char **)NULL, 16); serialice_log(LOG_READ|LOG_IO, ret, port, 1); @@ -459,8 +485,8 @@ return data & 0xffff; sprintf(command, "*ri%04x.w", port); - // command read back: "\n0000\n> " (8 characters) - serialice_command(command, 8); + // command read back: "\n0000" (5 characters) + serialice_command(command, 5); ret = (uint16_t)strtoul(s->buffer + 1, (char **)NULL, 16); serialice_log(LOG_READ|LOG_IO, ret, port, 2); @@ -478,8 +504,8 @@ return data; sprintf(command, "*ri%04x.l", port); - // command read back: "\n00000000\n> " (12 characters) - serialice_command(command, 12); + // command read back: "\n00000000" (9 characters) + serialice_command(command, 9); ret = (uint32_t)strtoul(s->buffer + 1, (char **)NULL, 16); serialice_log(LOG_READ|LOG_IO, ret, port, 4); @@ -500,8 +526,7 @@ data = (uint8_t)filtered_data; sprintf(command, "*wi%04x.b=%02x", port, data); - // command read back: "\n> " (3 characters) - serialice_command(command, 3); + serialice_command(command, 0); } void serialice_outw(uint16_t data, uint16_t port) @@ -517,8 +542,7 @@ data = (uint16_t)filtered_data; sprintf(command, "*wi%04x.w=%04x", port, data); - // command read back: "\n> " (3 characters) - serialice_command(command, 3); + serialice_command(command, 0); } void serialice_outl(uint32_t data, uint16_t port) @@ -534,8 +558,7 @@ data = filtered_data; sprintf(command, "*wi%04x.l=%08x", port, data); - // command read back: "\n> " (3 characters) - serialice_command(command, 3); + serialice_command(command, 0); } uint8_t serialice_readb(uint32_t addr) @@ -543,8 +566,8 @@ uint8_t ret; char command[20]; sprintf(command, "*rm%08x.b", addr); - // command read back: "\n00\n> " (6 characters) - serialice_command(command, 6); + // command read back: "\n00" (3 characters) + serialice_command(command, 3); ret = (uint8_t)strtoul(s->buffer + 1, (char **)NULL, 16); return ret; } @@ -554,8 +577,8 @@ uint16_t ret; char command[20]; sprintf(command, "*rm%08x.w", addr); - // command read back: "\n0000\n> " (8 characters) - serialice_command(command, 8); + // command read back: "\n0000" (5 characters) + serialice_command(command, 5); ret = (uint16_t)strtoul(s->buffer + 1, (char **)NULL, 16); return ret; } @@ -565,8 +588,8 @@ uint32_t ret; char command[20]; sprintf(command, "*rm%08x.l", addr); - // command read back: "\n00000000\n> " (12 characters) - serialice_command(command, 12); + // command read back: "\n00000000" (9 characters) + serialice_command(command, 9); ret = (uint32_t)strtoul(s->buffer + 1, (char **)NULL, 16); return ret; } @@ -575,24 +598,21 @@ { char command[24]; sprintf(command, "*wm%08x.b=%02x", addr, data); - // command read back: "\n> " (3 characters) - serialice_command(command, 3); + serialice_command(command, 0); } void serialice_writew(uint16_t data, uint32_t addr) { char command[25]; sprintf(command, "*wm%08x.w=%04x", addr, data); - // command read back: "\n> " (3 characters) - serialice_command(command, 3); + serialice_command(command, 0); } void serialice_writel(uint32_t data, uint32_t addr) { char command[29]; sprintf(command, "*wm%08x.l=%08x", addr, data); - // command read back: "\n> " (3 characters) - serialice_command(command, 3); + serialice_command(command, 0); } uint64_t serialice_rdmsr(uint32_t addr) @@ -607,8 +627,8 @@ sprintf(command, "*rc%08x", addr); - // command read back: "\n00000000.00000000\n> " (21 characters) - serialice_command(command, 21); + // command read back: "\n00000000.00000000" (18 characters) + serialice_command(command, 18); s->buffer[9] = 0; // . -> \0 hi = (uint32_t)strtoul(s->buffer + 1, (char **)NULL, 16); @@ -637,8 +657,7 @@ if (!filtered) { char command[30]; sprintf(command, "*wc%08x=%08x.%08x", addr, hi, lo); - // command read back: "\n> " (3 characters) - serialice_command(command, 3); + serialice_command(command, 0); } serialice_msr_log(LOG_WRITE, addr, hi, lo, filtered); @@ -660,9 +679,9 @@ sprintf(command, "*ci%08x.%08x", eax, ecx); - // command read back: "\n000006f2.00000000.00001234.12340324\n> " - // (39 characters) - serialice_command(command, 39); + // command read back: "\n000006f2.00000000.00001234.12340324" + // (36 characters) + serialice_command(command, 36); s->buffer[9] = 0; // . -> \0 s->buffer[18] = 0; // . -> \0 @@ -827,15 +846,23 @@ s->buffer = qemu_mallocz(BUFFER_SIZE); printf("SerialICE: Waiting for handshake with target... "); - serialice_command("\n", 3); - if (!strncmp("\n> ", s->buffer, 3)) { + /* Trigger a prompt */ + serialice_write(s, "\n", 1); + + /* ... and wait for it to appear */ + if (serialice_wait_prompt() == 0) { printf("target alife!\n"); } else { - printf("target not ok! (%s)\n", s->buffer ); + printf("target not ok!\n" ); exit(1); } + /* Each serialice_command() waits for a prompt, so trigger one for the + * first command, as we consumed the last one for the handshake + */ + serialice_write(s, "\n", 1); + printf("SerialICE: LUA init...\n"); serialice_lua_init(); }

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

SerialICE November 2009