From owner-p4-projects@FreeBSD.ORG Mon Apr 9 15:05:30 2012 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 433851065672; Mon, 9 Apr 2012 15:05:30 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id D5C01106566C for ; Mon, 9 Apr 2012 15:05:29 +0000 (UTC) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [IPv6:2001:4f8:fff6::2d]) by mx1.freebsd.org (Postfix) with ESMTP id B68C98FC16 for ; Mon, 9 Apr 2012 15:05:29 +0000 (UTC) Received: from skunkworks.freebsd.org (localhost [127.0.0.1]) by skunkworks.freebsd.org (8.14.4/8.14.4) with ESMTP id q39F5TXu063978 for ; Mon, 9 Apr 2012 15:05:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.4/8.14.4/Submit) id q39F5TWC063975 for perforce@freebsd.org; Mon, 9 Apr 2012 15:05:29 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 9 Apr 2012 15:05:29 GMT Message-Id: <201204091505.q39F5TWC063975@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Precedence: bulk Cc: Subject: PERFORCE change 209303 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 09 Apr 2012 15:05:30 -0000 http://p4web.freebsd.org/@@209303?ac=10 Change 209303 by rwatson@rwatson_svr_ctsrd_mipsbuild on 2012/04/09 15:05:15 Tweak Terasic DE-4 8-element LED driver to number LEDs from 1..8 rather than 0..7 in order to match labels printed on the board. Affected files ... .. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/de4led/terasic_de4led.c#2 edit .. //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/de4led/terasic_de4led.h#2 edit Differences ... ==== //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/de4led/terasic_de4led.c#2 (text+ko) ==== @@ -63,56 +63,56 @@ } static void -led_0(void *arg, int onoff) +led_1(void *arg, int onoff) { led_update(arg, 0, onoff); } static void -led_1(void *arg, int onoff) +led_2(void *arg, int onoff) { led_update(arg, 1, onoff); } static void -led_2(void *arg, int onoff) +led_3(void *arg, int onoff) { led_update(arg, 2, onoff); } static void -led_3(void *arg, int onoff) +led_4(void *arg, int onoff) { led_update(arg, 3, onoff); } static void -led_4(void *arg, int onoff) +led_5(void *arg, int onoff) { led_update(arg, 4, onoff); } static void -led_5(void *arg, int onoff) +led_6(void *arg, int onoff) { led_update(arg, 5, onoff); } static void -led_6(void *arg, int onoff) +led_7(void *arg, int onoff) { led_update(arg, 6, onoff); } static void -led_7(void *arg, int onoff) +led_8(void *arg, int onoff) { led_update(arg, 7, onoff); @@ -135,14 +135,14 @@ /* * Register the LED array with led(4). */ - sc->tdl_leds[0] = led_create(led_0, sc, "de4led_0"); - sc->tdl_leds[1] = led_create(led_1, sc, "de4led_1"); - sc->tdl_leds[2] = led_create(led_2, sc, "de4led_2"); - sc->tdl_leds[3] = led_create(led_3, sc, "de4led_3"); - sc->tdl_leds[4] = led_create(led_4, sc, "de4led_4"); - sc->tdl_leds[5] = led_create(led_5, sc, "de4led_5"); - sc->tdl_leds[6] = led_create(led_6, sc, "de4led_6"); - sc->tdl_leds[7] = led_create(led_7, sc, "de4led_7"); + sc->tdl_leds[0] = led_create(led_1, sc, "de4led_1"); + sc->tdl_leds[1] = led_create(led_2, sc, "de4led_2"); + sc->tdl_leds[2] = led_create(led_3, sc, "de4led_3"); + sc->tdl_leds[3] = led_create(led_4, sc, "de4led_4"); + sc->tdl_leds[4] = led_create(led_5, sc, "de4led_5"); + sc->tdl_leds[5] = led_create(led_6, sc, "de4led_6"); + sc->tdl_leds[6] = led_create(led_7, sc, "de4led_7"); + sc->tdl_leds[7] = led_create(led_8, sc, "de4led_8"); } void ==== //depot/projects/ctsrd/beribsd/src/sys/dev/terasic/de4led/terasic_de4led.h#2 (text+ko) ==== @@ -51,9 +51,8 @@ /* * Setting and clearing LEDs. tdl_bits is in the bit order preferred for I/O. - * - * XXXRW: We may need to reverse the mapping of led(4)-level devices to - * tdl_bits if the numbering here doesn't match the numbering on the DE4. + * The LED elements are labelled 1..8 on the DE-4, so bit 0 is LED 1, and so + * on. */ #define TERASIC_DE4LED_CLEARBAR(sc) do { \ (sc)->tdl_bits = 0; \