From patchwork Tue Mar 24 02:01:18 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Frysinger X-Patchwork-Id: 5771 Received: (qmail 8963 invoked by alias); 24 Mar 2015 02:01:24 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 8954 invoked by uid 89); 24 Mar 2015 02:01:23 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, SPF_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: smtp.gentoo.org Received: from smtp.gentoo.org (HELO smtp.gentoo.org) (140.211.166.183) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Tue, 24 Mar 2015 02:01:22 +0000 Received: from localhost.localdomain (localhost [127.0.0.1]) by smtp.gentoo.org (Postfix) with ESMTP id 3183E3408EC for ; Tue, 24 Mar 2015 02:01:20 +0000 (UTC) From: Mike Frysinger To: gdb-patches@sourceware.org Subject: [PATCH] sim: frv: delete UART device support Date: Mon, 23 Mar 2015 22:01:18 -0400 Message-Id: <1427162478-2194-1-git-send-email-vapier@gentoo.org> X-IsSubscribed: yes This looks like copy & paste logic from the m32r port (and history suggests this as well). Since building with hw & device support enabled leads to failures: sim/frv/devices.c: In function 'device_io_read_buffer': sim/frv/devices.c:39:15: error: 'UART_INCHAR_ADDR' undeclared (first use in this function) Delete it entirely. We leave device support in place as it is used to flush the scache. Committed. --- sim/frv/ChangeLog | 6 ++++++ sim/frv/devices.c | 37 ------------------------------------- 2 files changed, 6 insertions(+), 37 deletions(-) diff --git a/sim/frv/ChangeLog b/sim/frv/ChangeLog index 6957942..1ae319c 100644 --- a/sim/frv/ChangeLog +++ b/sim/frv/ChangeLog @@ -1,5 +1,11 @@ 2015-03-23 Mike Frysinger + * devices.c: Delete dv-sockser.h include. + (device_io_read_buffer): Delete uart code. + (device_io_write_buffer): Likewise. + +2015-03-23 Mike Frysinger + * configure: Regenerate. 2015-03-16 Mike Frysinger diff --git a/sim/frv/devices.c b/sim/frv/devices.c index 5a3336d..e417963 100644 --- a/sim/frv/devices.c +++ b/sim/frv/devices.c @@ -21,10 +21,6 @@ along with this program. If not, see . */ #include "sim-main.h" -#ifdef HAVE_DV_SOCKSER -#include "dv-sockser.h" -#endif - device frv_devices; int @@ -35,31 +31,6 @@ device_io_read_buffer (device *me, void *source, int space, if (STATE_ENVIRONMENT (sd) != OPERATING_ENVIRONMENT) return nr_bytes; -#ifdef HAVE_DV_SOCKSER - if (addr == UART_INCHAR_ADDR) - { - int c = dv_sockser_read (sd); - if (c == -1) - return 0; - *(char *) source = c; - return 1; - } - if (addr == UART_STATUS_ADDR) - { - int status = dv_sockser_status (sd); - unsigned char *p = source; - p[0] = 0; - p[1] = (((status & DV_SOCKSER_INPUT_EMPTY) -#ifdef UART_INPUT_READY0 - ? UART_INPUT_READY : 0) -#else - ? 0 : UART_INPUT_READY) -#endif - + ((status & DV_SOCKSER_OUTPUT_EMPTY) ? UART_OUTPUT_READY : 0)); - return 2; - } -#endif - return nr_bytes; } @@ -81,14 +52,6 @@ device_io_write_buffer (device *me, const void *source, int space, if (STATE_ENVIRONMENT (sd) != OPERATING_ENVIRONMENT) return nr_bytes; -#if HAVE_DV_SOCKSER - if (addr == UART_OUTCHAR_ADDR) - { - int rc = dv_sockser_write (sd, *(char *) source); - return rc == 1; - } -#endif - return nr_bytes; }