Author: uwe Date: 2009-04-22 14:28:14 +0200 (Wed, 22 Apr 2009) New Revision: 4174
Modified: trunk/util/ectool/Makefile trunk/util/ectool/ec.c trunk/util/ectool/ec.h trunk/util/ectool/ectool.c Log: Quick 'indent' run on ectool with some additional manual cosmetic fixes. Signed-off-by: Uwe Hermann <[email protected]> Acked-by: Uwe Hermann <[email protected]> Modified: trunk/util/ectool/Makefile =================================================================== --- trunk/util/ectool/Makefile 2009-04-22 12:14:39 UTC (rev 4173) +++ trunk/util/ectool/Makefile 2009-04-22 12:28:14 UTC (rev 4174) @@ -1,9 +1,9 @@ # # Makefile for ectool # -# Copyright (C) 2009 by coresystems GmbH -# written by Stefan Reinauer <[email protected]> -# +# Copyright (C) 2009 by coresystems GmbH +# written by Stefan Reinauer <[email protected]> +# # 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 @@ -26,7 +26,7 @@ ectool: ec.o ectool.o $(CC) $(CFLAGS) -o $@ $^ - + clean: rm *.o ectool Modified: trunk/util/ectool/ec.c =================================================================== --- trunk/util/ectool/ec.c 2009-04-22 12:14:39 UTC (rev 4173) +++ trunk/util/ectool/ec.c 2009-04-22 12:28:14 UTC (rev 4174) @@ -5,8 +5,7 @@ * * 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; version 2 of - * the License. + * published by the Free Software Foundation; version 2 of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -15,8 +14,7 @@ * * 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., 51 Franklin St, Fifth Floor, Boston, - * MA 02110-1301 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include <stdio.h> @@ -40,8 +38,8 @@ debug("."); } if (!timeout) { - printf("Timeout while sending command 0x%02x to EC!\n", - command); + printf("Timeout while sending command 0x%02x to EC!\n", + command); // return -1; } @@ -54,14 +52,13 @@ int timeout; timeout = 0x7ff; - while ((inb(EC_SC) & EC_IBF) && --timeout) { // wait for IBF = 0 + while ((inb(EC_SC) & EC_IBF) && --timeout) { // wait for IBF = 0 usleep(10); if ((timeout & 0xff) == 0) debug("."); } if (!timeout) { - printf("Timeout while sending data 0x%02x to EC!\n", - data); + printf("Timeout while sending data 0x%02x to EC!\n", data); // return -1; } @@ -83,7 +80,7 @@ uint8_t data; timeout = 0x7fff; - while (--timeout) { // Wait for OBF = 1 + while (--timeout) { // Wait for OBF = 1 if (inb(EC_SC) & EC_OBF) { break; } @@ -114,6 +111,6 @@ { send_ec_command(0x81); send_ec_data(addr); + return send_ec_data(data); } - Modified: trunk/util/ectool/ec.h =================================================================== --- trunk/util/ectool/ec.h 2009-04-22 12:14:39 UTC (rev 4173) +++ trunk/util/ectool/ec.h 2009-04-22 12:28:14 UTC (rev 4174) @@ -5,8 +5,7 @@ * * 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; version 2 of - * the License. + * published by the Free Software Foundation; version 2 of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -15,35 +14,37 @@ * * 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., 51 Franklin St, Fifth Floor, Boston, - * MA 02110-1301 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef _EC_H #define _EC_H + #include <stdint.h> + #define EC_DATA 0x62 #define EC_SC 0x66 /* EC_SC input */ -#define EC_SMI_EVT (1 << 6) // 1: SMI event pending -#define EC_SCI_EVT (1 << 5) // 1: SCI event pending -#define EC_BURST (1 << 4) // controller is in burst mode -#define EC_CMD (1 << 3) // 1: byte in data register is command - // 0: byte in data register is data -#define EC_IBF (1 << 1) // 1: input buffer full (data ready for ec) -#define EC_OBF (1 << 0) // 1: output buffer full (data ready for host) +#define EC_SMI_EVT (1 << 6) // 1: SMI event pending +#define EC_SCI_EVT (1 << 5) // 1: SCI event pending +#define EC_BURST (1 << 4) // controller is in burst mode +#define EC_CMD (1 << 3) // 1: byte in data register is command + // 0: byte in data register is data +#define EC_IBF (1 << 1) // 1: input buffer full (data ready for ec) +#define EC_OBF (1 << 0) // 1: output buffer full (data ready for host) + /* EC_SC output */ -#define RD_EC 0x80 // Read Embedded Controller -#define WR_EC 0x81 // Write Embedded Controller -#define BE_EC 0x82 // Burst Enable Embedded Controller -#define BD_EC 0x83 // Burst Disable Embedded Controller -#define QR_EC 0x84 // Query Embedded Controller +#define RD_EC 0x80 // Read Embedded Controller +#define WR_EC 0x81 // Write Embedded Controller +#define BE_EC 0x82 // Burst Enable Embedded Controller +#define BD_EC 0x83 // Burst Disable Embedded Controller +#define QR_EC 0x84 // Query Embedded Controller int send_ec_command(uint8_t command); int send_ec_data(uint8_t data); int send_ec_data_nowait(uint8_t data); uint8_t recv_ec_data(void); uint8_t ec_read(uint8_t addr); + #endif - Modified: trunk/util/ectool/ectool.c =================================================================== --- trunk/util/ectool/ectool.c 2009-04-22 12:14:39 UTC (rev 4173) +++ trunk/util/ectool/ectool.c 2009-04-22 12:28:14 UTC (rev 4174) @@ -5,8 +5,7 @@ * * 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; version 2 of - * the License. + * published by the Free Software Foundation; version 2 of the License. * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of @@ -15,8 +14,7 @@ * * 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., 51 Franklin St, Fifth Floor, Boston, - * MA 02110-1301 USA + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include <stdio.h> @@ -34,25 +32,25 @@ printf("ectool v%s -- ", ECTOOL_VERSION); printf("Copyright (C) 2008-2009 coresystems GmbH\n\n"); printf( - "This program is free software: you can redistribute it and/or modify\n" - "it under the terms of the GNU General Public License as published by\n" - "the Free Software Foundation, version 2 of the License.\n\n" - "This program is distributed in the hope that it will be useful,\n" - "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" - "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" - "GNU General Public License for more details.\n\n" - "You should have received a copy of the GNU General Public License\n" - "along with this program. If not, see <http://www.gnu.org/licenses/>.\n\n"); + "This program is free software: you can redistribute it and/or modify\n" + "it under the terms of the GNU General Public License as published by\n" + "the Free Software Foundation, version 2 of the License.\n\n" + "This program is distributed in the hope that it will be useful,\n" + "but WITHOUT ANY WARRANTY; without even the implied warranty of\n" + "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" + "GNU General Public License for more details.\n\n" + "You should have received a copy of the GNU General Public License\n" + "along with this program. If not, see <http://www.gnu.org/licenses/>.\n\n"); } void print_usage(const char *name) { printf("usage: %s [-vh?V]\n", name); printf("\n" - " -v | --version: print the version\n" - " -h | --help: print this help\n\n" - " -V | --verbose: print debug information\n" - "\n"); + " -v | --version: print the version\n" + " -h | --help: print this help\n\n" + " -V | --verbose: print debug information\n" + "\n"); exit(1); } @@ -70,7 +68,7 @@ }; while ((opt = getopt_long(argc, argv, "vh?V", - long_options, &option_index)) != EOF) { + long_options, &option_index)) != EOF) { switch (opt) { case 'v': print_version(); @@ -94,11 +92,12 @@ } printf("EC RAM:\n"); - for (i=0; i < 0x100; i++) { - if ((i % 0x10) == 0) - printf ("\n%02x: ", i); + for (i = 0; i < 0x100; i++) { + if ((i % 0x10) == 0) + printf("\n%02x: ", i); printf("%02x ", ec_read(i)); } printf("\n\n"); + return 0; } -- coreboot mailing list: [email protected] http://www.coreboot.org/mailman/listinfo/coreboot
