From owner-p4-projects@FreeBSD.ORG Sat Aug 23 17:26:31 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 8CF0C16A4C1; Sat, 23 Aug 2003 17:26:31 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3A34716A4BF for ; Sat, 23 Aug 2003 17:26:31 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id BB0D043FA3 for ; Sat, 23 Aug 2003 17:26:30 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7O0QU0U078117 for ; Sat, 23 Aug 2003 17:26:30 -0700 (PDT) (envelope-from marcel@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7O0QUGr078114 for perforce@freebsd.org; Sat, 23 Aug 2003 17:26:30 -0700 (PDT) Date: Sat, 23 Aug 2003 17:26:30 -0700 (PDT) Message-Id: <200308240026.h7O0QUGr078114@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to marcel@freebsd.org using -f From: Marcel Moolenaar To: Perforce Change Reviews Subject: PERFORCE change 36796 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 24 Aug 2003 00:26:32 -0000 http://perforce.freebsd.org/chv.cgi?CH=36796 Change 36796 by marcel@marcel_nfs on 2003/08/23 17:25:44 Fix DTR: The state of DTR is inverted. To set DTR we need to clear the DTR bit in PVR. While here, fix RTS as well. The documentation states that if SAB_MODE_RTS is set, SAB_MODE_FRTS controls the state of the RTS signal. This too is inverted. Affected files ... .. //depot/projects/uart/dev/uart/uart_dev_sab82532.c#13 edit Differences ... ==== //depot/projects/uart/dev/uart/uart_dev_sab82532.c#13 (text+ko) ==== @@ -185,8 +185,13 @@ if (bas->rclk == 0) bas->rclk = DEFAULT_RCLK; - /* Set all pins, except DTR pins to be inputs. */ - uart_setreg(bas, SAB_PCR, ~(SAB_PVR_DTR_A | SAB_PVR_DTR_B)); + /* + * Set all pins, except the DTR pins (pin 1 and 2) to be inputs. + * Pin 4 is magical, meaning that I don't know what it does, but + * it too has to be set to output. + */ + uart_setreg(bas, SAB_PCR, + ~(SAB_PVR_DTR_A|SAB_PVR_DTR_B|SAB_PVR_MAGIC)); uart_barrier(bas); /* Disable port interrupts. */ uart_setreg(bas, SAB_PIM, 0xff); @@ -196,8 +201,8 @@ uart_barrier(bas); /* Set DTR. */ pvr = uart_getreg(bas, SAB_PVR); - pvr |= IS_CHANNEL_A(bas) ? SAB_PVR_DTR_A : SAB_PVR_DTR_B; - uart_setreg(bas, SAB_PVR, pvr); + pvr &= IS_CHANNEL_A(bas) ? ~SAB_PVR_DTR_A : ~SAB_PVR_DTR_B; + uart_setreg(bas, SAB_PVR, pvr | SAB_PVR_MAGIC); uart_barrier(bas); /* power down */ @@ -216,7 +221,7 @@ uart_barrier(bas); uart_setreg(bas, SAB_CCR4, SAB_CCR4_MCK4|SAB_CCR4_EBRG|SAB_CCR4_ICD); uart_barrier(bas); - uart_setreg(bas, SAB_MODE, SAB_MODE_RTS|SAB_MODE_FCTS|SAB_MODE_RAC); + uart_setreg(bas, SAB_MODE, SAB_MODE_RTS|SAB_MODE_RAC); uart_barrier(bas); uart_setreg(bas, SAB_RFC, SAB_RFC_DPS|SAB_RFC_RFDF| SAB_RFC_RFTH_32CHAR); @@ -252,7 +257,7 @@ uint8_t pvr; pvr = uart_getreg(bas, SAB_PVR); - pvr &= IS_CHANNEL_A(bas) ? ~SAB_PVR_DTR_A : ~SAB_PVR_DTR_B; + pvr |= IS_CHANNEL_A(bas) ? SAB_PVR_DTR_A : SAB_PVR_DTR_B; uart_setreg(bas, SAB_PVR, pvr); uart_barrier(bas); } @@ -546,15 +551,15 @@ } pvr = uart_getreg(bas, SAB_PVR); if (sc->sc_hwsig & UART_SIG_DTR) + pvr &= (IS_CHANNEL_A(bas)) ? ~SAB_PVR_DTR_A : ~SAB_PVR_DTR_B; + else pvr |= (IS_CHANNEL_A(bas)) ? SAB_PVR_DTR_A : SAB_PVR_DTR_B; - else - pvr &= (IS_CHANNEL_A(bas)) ? ~SAB_PVR_DTR_A : ~SAB_PVR_DTR_B; uart_setreg(bas, SAB_PVR, pvr); mode = uart_getreg(bas, SAB_MODE); if (sc->sc_hwsig & UART_SIG_RTS) - mode |= SAB_MODE_RTS; + mode &= ~SAB_MODE_FRTS; else - mode &= ~SAB_MODE_RTS; + mode |= SAB_MODE_FRTS; uart_setreg(bas, SAB_MODE, mode); uart_barrier(bas); if (sig & UART_SIG_DBREAK) {