GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Quick 'indent' run on ectool with some additional manual cosmetic fixes. 

Signed-off-by: Uwe Hermann <uwe@hermann-uwe.de>
Acked-by: Uwe Hermann <uwe@hermann-uwe.de>



git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4174 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Uwe Hermann 2009-04-22 12:28:14 +00:00
parent 0408bdd240
commit 257ae3f520
4 changed files with 50 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
util/ectool/ec.c
View File

@ -5,8 +5,7 @@
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as * modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; version 2 of * published by the Free Software Foundation; version 2 of the License.
* the License.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * 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 * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
* MA 02110-1301 USA
*/ */
#include <stdio.h> #include <stdio.h>
@ -41,7 +39,7 @@ int send_ec_command(uint8_t command)
} }
if (!timeout) { if (!timeout) {
printf("Timeout while sending command 0x%02x to EC!\n", printf("Timeout while sending command 0x%02x to EC!\n",
command); command);
// return -1; // return -1;
} }
@ -54,14 +52,13 @@ int send_ec_data(uint8_t data)
int timeout; int timeout;
timeout = 0x7ff; 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); usleep(10);
if ((timeout & 0xff) == 0) if ((timeout & 0xff) == 0)
debug("."); debug(".");
} }
if (!timeout) { if (!timeout) {
printf("Timeout while sending data 0x%02x to EC!\n", printf("Timeout while sending data 0x%02x to EC!\n", data);
data);
// return -1; // return -1;
} }
@ -83,7 +80,7 @@ uint8_t recv_ec_data(void)
uint8_t data; uint8_t data;
timeout = 0x7fff; timeout = 0x7fff;
while (--timeout) { // Wait for OBF = 1 while (--timeout) { // Wait for OBF = 1
if (inb(EC_SC) & EC_OBF) { if (inb(EC_SC) & EC_OBF) {
break; break;
} }
@ -114,6 +111,6 @@ int ec_write(uint8_t addr, uint8_t data)
{ {
send_ec_command(0x81); send_ec_command(0x81);
send_ec_data(addr); send_ec_data(addr);
return send_ec_data(data); return send_ec_data(data);
} }

35
util/ectool/ec.h
View File

@ -5,8 +5,7 @@
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as * modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; version 2 of * published by the Free Software Foundation; version 2 of the License.
* the License.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * 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 * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
* MA 02110-1301 USA
*/ */
#ifndef _EC_H #ifndef _EC_H
#define _EC_H #define _EC_H
#include <stdint.h> #include <stdint.h>
#define EC_DATA 0x62 #define EC_DATA 0x62
#define EC_SC 0x66 #define EC_SC 0x66
/* EC_SC input */ /* EC_SC input */
#define EC_SMI_EVT (1 << 6) // 1: SMI event pending #define EC_SMI_EVT (1 << 6) // 1: SMI event pending
#define EC_SCI_EVT (1 << 5) // 1: SCI event pending #define EC_SCI_EVT (1 << 5) // 1: SCI event pending
#define EC_BURST (1 << 4) // controller is in burst mode #define EC_BURST (1 << 4) // controller is in burst mode
#define EC_CMD (1 << 3) // 1: byte in data register is command #define EC_CMD (1 << 3) // 1: byte in data register is command
// 0: byte in data register is data // 0: byte in data register is data
#define EC_IBF (1 << 1) // 1: input buffer full (data ready for ec) #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_OBF (1 << 0) // 1: output buffer full (data ready for host)
/* EC_SC output */ /* EC_SC output */
#define RD_EC 0x80 // Read Embedded Controller #define RD_EC 0x80 // Read Embedded Controller
#define WR_EC 0x81 // Write Embedded Controller #define WR_EC 0x81 // Write Embedded Controller
#define BE_EC 0x82 // Burst Enable Embedded Controller #define BE_EC 0x82 // Burst Enable Embedded Controller
#define BD_EC 0x83 // Burst Disable Embedded Controller #define BD_EC 0x83 // Burst Disable Embedded Controller
#define QR_EC 0x84 // Query Embedded Controller #define QR_EC 0x84 // Query Embedded Controller
int send_ec_command(uint8_t command); int send_ec_command(uint8_t command);
int send_ec_data(uint8_t data); int send_ec_data(uint8_t data);
int send_ec_data_nowait(uint8_t data); int send_ec_data_nowait(uint8_t data);
uint8_t recv_ec_data(void); uint8_t recv_ec_data(void);
uint8_t ec_read(uint8_t addr); uint8_t ec_read(uint8_t addr);
#endif
#endif

39
util/ectool/ectool.c
View File

@ -5,8 +5,7 @@
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as * modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; version 2 of * published by the Free Software Foundation; version 2 of the License.
* the License.
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * 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 * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
* MA 02110-1301 USA
*/ */
#include <stdio.h> #include <stdio.h>
@ -34,25 +32,25 @@ void print_version(void)
printf("ectool v%s -- ", ECTOOL_VERSION); printf("ectool v%s -- ", ECTOOL_VERSION);
printf("Copyright (C) 2008-2009 coresystems GmbH\n\n"); printf("Copyright (C) 2008-2009 coresystems GmbH\n\n");
printf( printf(
"This program is free software: you can redistribute it and/or modify\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" "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" "the Free Software Foundation, version 2 of the License.\n\n"
"This program is distributed in the hope that it will be useful,\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" "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n" "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
"GNU General Public License for more details.\n\n" "GNU General Public License for more details.\n\n"
"You should have received a copy of the GNU General Public License\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"); "along with this program. If not, see <http://www.gnu.org/licenses/>.\n\n");
} }
void print_usage(const char *name) void print_usage(const char *name)
{ {
printf("usage: %s [-vh?V]\n", name); printf("usage: %s [-vh?V]\n", name);
printf("\n" printf("\n"
" -v | --version: print the version\n" " -v | --version: print the version\n"
" -h | --help: print this help\n\n" " -h | --help: print this help\n\n"
" -V | --verbose: print debug information\n" " -V | --verbose: print debug information\n"
"\n"); "\n");
exit(1); exit(1);
} }
@ -70,7 +68,7 @@ int main(int argc, char *argv[])
}; };
while ((opt = getopt_long(argc, argv, "vh?V", while ((opt = getopt_long(argc, argv, "vh?V",
long_options, &option_index)) != EOF) { long_options, &option_index)) != EOF) {
switch (opt) { switch (opt) {
case 'v': case 'v':
print_version(); print_version();
@ -94,11 +92,12 @@ int main(int argc, char *argv[])
} }
printf("EC RAM:\n"); printf("EC RAM:\n");
for (i=0; i < 0x100; i++) { for (i = 0; i < 0x100; i++) {
if ((i % 0x10) == 0) if ((i % 0x10) == 0)
printf ("\n%02x: ", i); printf("\n%02x: ", i);
printf("%02x ", ec_read(i)); printf("%02x ", ec_read(i));
} }
printf("\n\n"); printf("\n\n");
return 0; return 0;
} }