Revert 'Remove unused struct serial::name field'

[deliverable/binutils-gdb.git] / sim / mn10300 / dv-mn103iop.c

diff --git a/sim/mn10300/dv-mn103iop.c b/sim/mn10300/dv-mn103iop.c
index f1379fc9b8dcd019a28fc141366e8736c60e8085..25acbb0421642458cb3c15a7c07c7dd055379715 100644 (file)
--- a/sim/mn10300/dv-mn103iop.c
+++ b/sim/mn10300/dv-mn103iop.c
@@ -1,21 +1,20 @@
 /*  This file is part of the program GDB, the GNU debugger.
     
-    Copyright (C) 1998 Free Software Foundation, Inc.
+    Copyright (C) 1998-2020 Free Software Foundation, Inc.
     Contributed by Cygnus Solutions.
     
     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; either version 2 of the License, or
+    the Free Software Foundation; either version 3 of the License, or
     (at your option) any later version.
-    
+
     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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
     
     */
 
@@ -463,7 +462,7 @@ write_dedicated_control_reg (struct hw *me,
       /* select on io_port_reg: */
       if ( io_port_reg == P2SS )
        {
-         if ( (buf && 0xfc)  != 0 )
+         if ( (buf & 0xfc)  != 0 )
            {
              hw_abort(me, "Cannot write to read-only bits in p2ss.");
            }
@@ -474,7 +473,7 @@ write_dedicated_control_reg (struct hw *me,
        }
       else
        {
-         if ( (buf && 0xf0) != 0 )
+         if ( (buf & 0xf0) != 0 )
            {
              hw_abort(me, "Cannot write to read-only bits in p4ss.");
            }