summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--util/ectool/Makefile8
-rw-r--r--util/ectool/ec.c19
-rw-r--r--util/ectool/ec.h35
-rw-r--r--util/ectool/ectool.c41
4 files changed, 50 insertions, 53 deletions
diff --git a/util/ectool/Makefile b/util/ectool/Makefile
index 7e92f68e85..d799cee77f 100644
--- a/util/ectool/Makefile
+++ b/util/ectool/Makefile
@@ -1,9 +1,9 @@
#
# Makefile for ectool
#
-# Copyright (C) 2009 by coresystems GmbH
-# written by Stefan Reinauer <stepan@coresystems.de>
-#
+# Copyright (C) 2009 by coresystems GmbH
+# written by Stefan Reinauer <stepan@coresystems.de>
+#
# 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 @@ all: ectool
ectool: ec.o ectool.o
$(CC) $(CFLAGS) -o $@ $^
-
+
clean:
rm *.o ectool
diff --git a/util/ectool/ec.c b/util/ectool/ec.c
index 9fa81258b7..56e9a61905 100644
--- a/util/ectool/ec.c
+++ b/util/ectool/ec.c
@@ -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 @@ int send_ec_command(uint8_t command)
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 send_ec_data(uint8_t data)
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 recv_ec_data(void)
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 @@ int ec_write(uint8_t addr, uint8_t data)
{
send_ec_command(0x81);
send_ec_data(addr);
+
return send_ec_data(data);
}
-
diff --git a/util/ectool/ec.h b/util/ectool/ec.h
index dde1ba313a..b06816de45 100644
--- a/util/ectool/ec.h
+++ b/util/ectool/ec.h
@@ -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
+#endif
diff --git a/util/ectool/ectool.c b/util/ectool/ectool.c
index 6c1441ec1c..91d42fe02d 100644
--- a/util/ectool/ectool.c
+++ b/util/ectool/ectool.c
@@ -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 @@ void print_version(void)
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 @@ int main(int argc, char *argv[])
};
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 @@ int main(int argc, char *argv[])
}
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;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-18 03:05:54 +0000