flashrom

flashrom@flashrom.org

9154 discussions

[PATCH] Convert gfxnvidia to msg_*
by Sean Nelson 09 Jan '10

09 Jan '10

Convert all messages in gfxnvidia.c to the new message infrastructure. Signed-off-by: Sean Nelson <audiohacked(a)gmail.com>

2 2

[commit] r850 - trunk
by svn＠flashrom.org 09 Jan '10

09 Jan '10

Author: snelson Date: 2010-01-10 00:54:05 +0100 (Sun, 10 Jan 2010) New Revision: 850 Modified: trunk/gfxnvidia.c Log: Convert all messages in gfxnvidia.c to the new message infrastructure. Signed-off-by: Sean Nelson <audiohacked(a)gmail.com> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/gfxnvidia.c =================================================================== --- trunk/gfxnvidia.c 2010-01-09 23:50:27 UTC (rev 849) +++ trunk/gfxnvidia.c 2010-01-09 23:54:05 UTC (rev 850) @@ -64,7 +64,7 @@ io_base_addr = pcidev_init(PCI_VENDOR_ID_NVIDIA, PCI_BASE_ADDRESS_0, gfx_nvidia, programmer_param); io_base_addr += 0x300000; - printf("Detected NVIDIA I/O base address: 0x%x.\n", io_base_addr); + msg_pinfo("Detected NVIDIA I/O base address: 0x%x.\n", io_base_addr); /* Allow access to flash interface (will disable screen). */ reg32 = pci_read_long(pcidev_dev, 0x50);

1 0

[PATCH] Convert satasii to msg_*
by Sean Nelson 09 Jan '10

09 Jan '10

Convert all messages in satasii.c to the new message infrastructure. Signed-off-by: Sean Nelson <audiohacked(a)gmail.com>

2 2

[commit] r849 - trunk
by svn＠flashrom.org 09 Jan '10

09 Jan '10

Author: snelson Date: 2010-01-10 00:50:27 +0100 (Sun, 10 Jan 2010) New Revision: 849 Modified: trunk/satasii.c Log: Convert all messages in satasii.c to the new message infrastructure. Signed-off-by: Sean Nelson <audiohacked(a)gmail.com> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/satasii.c =================================================================== --- trunk/satasii.c 2010-01-09 23:46:39 UTC (rev 848) +++ trunk/satasii.c 2010-01-09 23:50:27 UTC (rev 849) @@ -63,7 +63,7 @@ /* Check if ROM cycle are OK. */ if ((id != 0x0680) && (!(mmio_readl(sii_bar) & (1 << 26)))) - printf("Warning: Flash seems unconnected.\n"); + msg_pinfo("Warning: Flash seems unconnected.\n"); buses_supported = CHIP_BUSTYPE_PARALLEL;

1 0

[PATCH] Convert serial to msg_*
by Sean Nelson 09 Jan '10

09 Jan '10

Convert all messages in serial.c to the new message infrastructure. Signed-off-by: Sean Nelson <audiohacked(a)gmail.com>

2 2

[commit] r848 - trunk
by svn＠flashrom.org 09 Jan '10

09 Jan '10

Author: snelson Date: 2010-01-10 00:46:39 +0100 (Sun, 10 Jan 2010) New Revision: 848 Modified: trunk/serial.c Log: Convert all messages in serial.c to the new message infrastructure. Signed-off-by: Sean Nelson <audiohacked(a)gmail.com> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/serial.c =================================================================== --- trunk/serial.c 2010-01-09 23:34:45 UTC (rev 847) +++ trunk/serial.c 2010-01-09 23:46:39 UTC (rev 848) @@ -139,7 +139,7 @@ for (i = 0;; i++) { if (sp_baudtable[i].baud == 0) { close(fd); - fprintf(stderr, + msg_perr( "Error: cannot configure for baudrate %d\n", baud); exit(1); @@ -193,7 +193,7 @@ if (tmp == -1) return 1; if (!tmp) - printf_debug("Empty write\n"); + msg_pdbg("Empty write\n"); writecnt -= tmp; buf += tmp; } @@ -214,7 +214,7 @@ if (tmp == -1) return 1; if (!tmp) - printf_debug("Empty read\n"); + msg_pdbg("Empty read\n"); readcnt -= tmp; buf += tmp; }

1 0

[PATCH] Convert wbsio_spi to msg_*
by Sean Nelson 09 Jan '10

09 Jan '10

Convert all messages in wbsio_spi.c to the new message infrastructure. Signed-off-by: Sean Nelson <audiohacked(a)gmail.com>

2 2

[commit] r847 - trunk
by svn＠flashrom.org 09 Jan '10

09 Jan '10

Author: snelson Date: 2010-01-10 00:34:45 +0100 (Sun, 10 Jan 2010) New Revision: 847 Modified: trunk/wbsio_spi.c Log: Convert all messages in wbsio_spi.c to the new message infrastructure. Signed-off-by: Sean Nelson <audiohacked(a)gmail.com> Acked-by: Carl-Daniel Hailfinger <c-d.hailfinger.devel.2006(a)gmx.net> Modified: trunk/wbsio_spi.c =================================================================== --- trunk/wbsio_spi.c 2010-01-09 23:31:13 UTC (rev 846) +++ trunk/wbsio_spi.c 2010-01-09 23:34:45 UTC (rev 847) @@ -22,17 +22,6 @@ #include "flash.h" #include "spi.h" -/* Change this to #define if you want lowlevel debugging of commands - * sent to the Winbond W836xx SPI controller. - */ -#undef COMM_DEBUG - -#ifdef COMM_DEBUG -#define msg_comm_debug printf_debug -#else -#define msg_comm_debug(...) do {} while (0) -#endif - #define WBSIO_PORT1 0x2e #define WBSIO_PORT2 0x4e @@ -46,18 +35,18 @@ w836xx_ext_enter(port); id = sio_read(port, 0x20); if (id != 0xa0) { - fprintf(stderr, "\nW83627 not found at 0x%x, id=0x%02x want=0xa0.\n", port, id); + msg_perr("\nW83627 not found at 0x%x, id=0x%02x want=0xa0.\n", port, id); goto done; } if (0 == (sio_read(port, 0x24) & 2)) { - fprintf(stderr, "\nW83627 found at 0x%x, but SPI pins are not enabled. (CR[0x24] bit 1=0)\n", port); + msg_perr("\nW83627 found at 0x%x, but SPI pins are not enabled. (CR[0x24] bit 1=0)\n", port); goto done; } sio_write(port, 0x07, 0x06); if (0 == (sio_read(port, 0x30) & 1)) { - fprintf(stderr, "\nW83627 found at 0x%x, but SPI is not enabled. (LDN6[0x30] bit 0=0)\n", port); + msg_perr("\nW83627 found at 0x%x, but SPI is not enabled. (LDN6[0x30] bit 0=0)\n", port); goto done; } @@ -74,7 +63,7 @@ if (0 == (wbsio_spibase = wbsio_get_spibase(WBSIO_PORT2))) return 1; - msg_comm_debug("\nwbsio_spibase = 0x%x\n", wbsio_spibase); + msg_pspew("\nwbsio_spibase = 0x%x\n", wbsio_spibase); buses_supported |= CHIP_BUSTYPE_SPI; spi_controller = SPI_CONTROLLER_WBSIO; @@ -108,42 +97,42 @@ int i; uint8_t mode = 0; - msg_comm_debug("%s:", __func__); + msg_pspew("%s:", __func__); if (1 == writecnt && 0 == readcnt) { mode = 0x10; } else if (2 == writecnt && 0 == readcnt) { OUTB(writearr[1], wbsio_spibase + 4); - msg_comm_debug(" data=0x%02x", writearr[1]); + msg_pspew(" data=0x%02x", writearr[1]); mode = 0x20; } else if (1 == writecnt && 2 == readcnt) { mode = 0x30; } else if (4 == writecnt && 0 == readcnt) { - msg_comm_debug(" addr=0x%02x", (writearr[1] & 0x0f)); + msg_pspew(" addr=0x%02x", (writearr[1] & 0x0f)); for (i = 2; i < writecnt; i++) { OUTB(writearr[i], wbsio_spibase + i); - msg_comm_debug("%02x", writearr[i]); + msg_pspew("%02x", writearr[i]); } mode = 0x40 | (writearr[1] & 0x0f); } else if (5 == writecnt && 0 == readcnt) { - msg_comm_debug(" addr=0x%02x", (writearr[1] & 0x0f)); + msg_pspew(" addr=0x%02x", (writearr[1] & 0x0f)); for (i = 2; i < 4; i++) { OUTB(writearr[i], wbsio_spibase + i); - msg_comm_debug("%02x", writearr[i]); + msg_pspew("%02x", writearr[i]); } OUTB(writearr[i], wbsio_spibase + i); - msg_comm_debug(" data=0x%02x", writearr[i]); + msg_pspew(" data=0x%02x", writearr[i]); mode = 0x50 | (writearr[1] & 0x0f); } else if (8 == writecnt && 0 == readcnt) { - msg_comm_debug(" addr=0x%02x", (writearr[1] & 0x0f)); + msg_pspew(" addr=0x%02x", (writearr[1] & 0x0f)); for (i = 2; i < 4; i++) { OUTB(writearr[i], wbsio_spibase + i); - msg_comm_debug("%02x", writearr[i]); + msg_pspew("%02x", writearr[i]); } - msg_comm_debug(" data=0x"); + msg_pspew(" data=0x"); for (; i < writecnt; i++) { OUTB(writearr[i], wbsio_spibase + i); - msg_comm_debug("%02x", writearr[i]); + msg_pspew("%02x", writearr[i]); } mode = 0x60 | (writearr[1] & 0x0f); } else if (5 == writecnt && 4 == readcnt) { @@ -154,17 +143,17 @@ */ ; } else if (4 == writecnt && readcnt >= 1 && readcnt <= 4) { - msg_comm_debug(" addr=0x%02x", (writearr[1] & 0x0f)); + msg_pspew(" addr=0x%02x", (writearr[1] & 0x0f)); for (i = 2; i < writecnt; i++) { OUTB(writearr[i], wbsio_spibase + i); - msg_comm_debug("%02x", writearr[i]); + msg_pspew("%02x", writearr[i]); } mode = ((7 + readcnt) << 4) | (writearr[1] & 0x0f); } - msg_comm_debug(" cmd=%02x mode=%02x\n", writearr[0], mode); + msg_pspew(" cmd=%02x mode=%02x\n", writearr[0], mode); if (!mode) { - fprintf(stderr, "%s: unsupported command type wr=%d rd=%d\n", + msg_perr("%s: unsupported command type wr=%d rd=%d\n", __func__, writecnt, readcnt); /* Command type refers to the number of bytes read/written. */ return SPI_INVALID_LENGTH; @@ -177,12 +166,12 @@ if (!readcnt) return 0; - msg_comm_debug("%s: returning data =", __func__); + msg_pspew("%s: returning data =", __func__); for (i = 0; i < readcnt; i++) { readarr[i] = INB(wbsio_spibase + 4 + i); - msg_comm_debug(" 0x%02x", readarr[i]); + msg_pspew(" 0x%02x", readarr[i]); } - msg_comm_debug("\n"); + msg_pspew("\n"); return 0; } @@ -191,7 +180,7 @@ int size = flash->total_size * 1024; if (size > 1024 * 1024) { - fprintf(stderr, "%s: Winbond saved on 4 register bits so max chip size is 1024 KB!\n", __func__); + msg_perr("%s: Winbond saved on 4 register bits so max chip size is 1024 KB!\n", __func__); return 1; } @@ -203,7 +192,7 @@ int size = flash->total_size * 1024; if (size > 1024 * 1024) { - fprintf(stderr, "%s: Winbond saved on 4 register bits so max chip size is 1024 KB!\n", __func__); + msg_perr("%s: Winbond saved on 4 register bits so max chip size is 1024 KB!\n", __func__); return 1; }

1 0

Fix mess-up in commit 845
by Michael Karcher 09 Jan '10

09 Jan '10

commit 845 is wrong, as I deleted a wrong line when I wanted to remove debugging print code. This (hopefully obviously correct) patch fixes the issue. As a previous version (before adding the debugging statement) was already executed on the board, the missing OUTW was executed on the testers machine on an earlier flashrom run. Regards, Michael Karcher Index: board_enable.c =================================================================== --- board_enable.c (Revision 845) +++ board_enable.c (Arbeitskopie) @@ -967,7 +967,7 @@ base = pci_read_word(dev, 0x74); temp = INW(base + 0x68); temp &= ~(1 << 0); /* Make pin output? */ - printf_debug("changed to %04x\n",temp); + OUTW(temp, base + 0x68); temp = INW(base + 0x64); temp |= (1 << 0); /* Raise output? */

2 2

[commit] r846 - trunk
by svn＠flashrom.org 09 Jan '10

09 Jan '10

Author: mkarcher Date: 2010-01-10 00:31:13 +0100 (Sun, 10 Jan 2010) New Revision: 846 Modified: trunk/board_enable.c Log: commit 845 is wrong, as I deleted a wrong line when I wanted to remove debugging print code. This (hopefully obviously correct) patch fixes the issue. As a previous version (before adding the debugging statement) was already executed on the board, the missing OUTW was executed on the testers machine on an earlier flashrom run. Signed-off-by: Michael Karcher <flashrom(a)mkarcher.dialup.fu-berlin.de> Acked-by: Luc Verhaegen <libv(a)skynet.be> Modified: trunk/board_enable.c =================================================================== --- trunk/board_enable.c 2010-01-09 17:36:06 UTC (rev 845) +++ trunk/board_enable.c 2010-01-09 23:31:13 UTC (rev 846) @@ -967,7 +967,7 @@ base = pci_read_word(dev, 0x74); temp = INW(base + 0x68); temp &= ~(1 << 0); /* Make pin output? */ - printf_debug("changed to %04x\n",temp); + OUTW(temp, base + 0x68); temp = INW(base + 0x64); temp |= (1 << 0); /* Raise output? */

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

flashrom