From db013098e76fe0b583ea9702758ecb933dc0a0ce Mon Sep 17 00:00:00 2001 From: Rutger Hofman Date: Tue, 9 Jun 2009 15:13:37 +0000 Subject: [PATCH] Don't use // comments in the public .h files. Maybe a library client wants to set -ansi or whatever git-svn-id: https://urjtag.svn.sourceforge.net/svnroot/urjtag/trunk@1648 b68d4a1b-bc3d-0410-92ed-d4ac073336b7 --- urjtag/include/urjtag/bitmask.h | 4 +- urjtag/include/urjtag/bsdl.h | 4 +- urjtag/include/urjtag/bus_driver.h | 66 +++++++++++++++--------------- urjtag/include/urjtag/cable.h | 10 ++--- urjtag/include/urjtag/gettext.h | 2 +- urjtag/include/urjtag/pod.h | 18 ++++---- 6 files changed, 52 insertions(+), 52 deletions(-) diff --git a/urjtag/include/urjtag/bitmask.h b/urjtag/include/urjtag/bitmask.h index 40498c6a..982e748d 100644 --- a/urjtag/include/urjtag/bitmask.h +++ b/urjtag/include/urjtag/bitmask.h @@ -32,8 +32,8 @@ * */ -// @@@@ RFHH candidate to move to internal include file, and -// @@@@ RFHH the definition of URJ_BIT(b) should go into types.h +/* @@@@ RFHH candidate to move to internal include file, and */ +/* @@@@ RFHH the definition of URJ_BIT(b) should go into types.h */ #ifndef URJ_BITMASK_H #define URJ_BITMASK_H diff --git a/urjtag/include/urjtag/bsdl.h b/urjtag/include/urjtag/bsdl.h index 9a4360a2..ac9cd861 100644 --- a/urjtag/include/urjtag/bsdl.h +++ b/urjtag/include/urjtag/bsdl.h @@ -42,7 +42,7 @@ urj_bsdl_globs_t; bsdl.debug = 0; \ } while (0) -// @@@@ RFHH ToDo: let urj_bsdl_read_file also return URJ_STATUS_... +/* @@@@ RFHH ToDo: let urj_bsdl_read_file also return URJ_STATUS_... */ /** * @return * < 0 : Error occured, parse/syntax problems or out of memory @@ -51,7 +51,7 @@ urj_bsdl_globs_t; */ int urj_bsdl_read_file (urj_chain_t *, const char *, int, const char *); void urj_bsdl_set_path (urj_chain_t *, const char *); -// @@@@ RFHH ToDo: let urj_bsdl_scan_files also return URJ_STATUS_... +/* @@@@ RFHH ToDo: let urj_bsdl_scan_files also return URJ_STATUS_... */ /** * @return * < 0 : Error occured, parse/syntax problems or out of memory diff --git a/urjtag/include/urjtag/bus_driver.h b/urjtag/include/urjtag/bus_driver.h index e143e8fd..b71942a0 100644 --- a/urjtag/include/urjtag/bus_driver.h +++ b/urjtag/include/urjtag/bus_driver.h @@ -51,35 +51,35 @@ urj_bus_area_t; typedef enum URJ_BUS_PARAM_KEY { - URJ_BUS_PARAM_KEY_MUX, // bool mpc5200 - // avr32: mode = OCD | HSBC | HSBU | x8 | x16 | x32 avr32 - URJ_BUS_PARAM_KEY_OCD, // bool avr32 - URJ_BUS_PARAM_KEY_HSBC, // bool avr32 - URJ_BUS_PARAM_KEY_HSBU, // bool avr32 - URJ_BUS_PARAM_KEY_X8, // bool avr32 - URJ_BUS_PARAM_KEY_X16, // bool avr32 - URJ_BUS_PARAM_KEY_X32, // bool avr32 - URJ_BUS_PARAM_KEY_WIDTH, // 0=auto 8 16 32 64 - // aliased as x8 x16 x32 bool avr32 - // 8 32 64 mpc824 - // aliased as AMODE prototype - URJ_BUS_PARAM_KEY_OPCODE, // string fjmem - URJ_BUS_PARAM_KEY_LEN, // ulong fjmem - URJ_BUS_PARAM_KEY_AMODE, // alias for WIDTH: 0=auto 8 16 32 prototype - URJ_BUS_PARAM_KEY_ALSB, // string (= signal name) prototype - URJ_BUS_PARAM_KEY_AMSB, // string (= signal name) prototype - URJ_BUS_PARAM_KEY_DLSB, // string (= signal name) prototype - URJ_BUS_PARAM_KEY_DMSB, // string (= signal name) prototype - URJ_BUS_PARAM_KEY_CS, // string (= signal name) prototype - URJ_BUS_PARAM_KEY_NCS, // string (= signal name) prototype - URJ_BUS_PARAM_KEY_OE, // string (= signal name) prototype - URJ_BUS_PARAM_KEY_NOE, // string (= signal name) prototype - URJ_BUS_PARAM_KEY_WE, // string (= signal name) prototype - URJ_BUS_PARAM_KEY_NWE, // string (= signal name) prototype - URJ_BUS_PARAM_KEY_REVBITS, // bool mpc824 - URJ_BUS_PARAM_KEY_HELP, // bool mpc824 - URJ_BUS_PARAM_KEY_DBGaDDR, // bool mpc824 - URJ_BUS_PARAM_KEY_DBGdATA, // bool mpc824 + URJ_BUS_PARAM_KEY_MUX, /* bool mpc5200 */ + /* avr32: mode = OCD | HSBC | HSBU | x8 | x16 | x32 avr32 */ + URJ_BUS_PARAM_KEY_OCD, /* bool avr32 */ + URJ_BUS_PARAM_KEY_HSBC, /* bool avr32 */ + URJ_BUS_PARAM_KEY_HSBU, /* bool avr32 */ + URJ_BUS_PARAM_KEY_X8, /* bool avr32 */ + URJ_BUS_PARAM_KEY_X16, /* bool avr32 */ + URJ_BUS_PARAM_KEY_X32, /* bool avr32 */ + URJ_BUS_PARAM_KEY_WIDTH, /* 0=auto 8 16 32 64 */ + /* aliased as x8 x16 x32 bool avr32 */ + /* 8 32 64 mpc824 */ + /* aliased as AMODE prototype */ + URJ_BUS_PARAM_KEY_OPCODE, /* string fjmem */ + URJ_BUS_PARAM_KEY_LEN, /* ulong fjmem */ + URJ_BUS_PARAM_KEY_AMODE, /* alias for WIDTH: 0=auto 8 16 32 prototype */ + URJ_BUS_PARAM_KEY_ALSB, /* string (= signal name) prototype */ + URJ_BUS_PARAM_KEY_AMSB, /* string (= signal name) prototype */ + URJ_BUS_PARAM_KEY_DLSB, /* string (= signal name) prototype */ + URJ_BUS_PARAM_KEY_DMSB, /* string (= signal name) prototype */ + URJ_BUS_PARAM_KEY_CS, /* string (= signal name) prototype */ + URJ_BUS_PARAM_KEY_NCS, /* string (= signal name) prototype */ + URJ_BUS_PARAM_KEY_OE, /* string (= signal name) prototype */ + URJ_BUS_PARAM_KEY_NOE, /* string (= signal name) prototype */ + URJ_BUS_PARAM_KEY_WE, /* string (= signal name) prototype */ + URJ_BUS_PARAM_KEY_NWE, /* string (= signal name) prototype */ + URJ_BUS_PARAM_KEY_REVBITS, /* bool mpc824 */ + URJ_BUS_PARAM_KEY_HELP, /* bool mpc824 */ + URJ_BUS_PARAM_KEY_DBGaDDR, /* bool mpc824 */ + URJ_BUS_PARAM_KEY_DBGdATA, /* bool mpc824 */ } urj_bus_param_key_t; @@ -97,13 +97,13 @@ struct urj_bus_driver int (*area) (urj_bus_t *bus, uint32_t adr, urj_bus_area_t *area); /** @return URJ_STATUS_OK on success; URJ_STATUS_FAIL on error */ int (*read_start) (urj_bus_t *bus, uint32_t adr); - // @@@@ RFHH need to return status + /* @@@@ RFHH need to return status */ uint32_t (*read_next) (urj_bus_t *bus, uint32_t adr); - // @@@@ RFHH need to return status + /* @@@@ RFHH need to return status */ uint32_t (*read_end) (urj_bus_t *bus); - // @@@@ RFHH need to return status + /* @@@@ RFHH need to return status */ uint32_t (*read) (urj_bus_t *bus, uint32_t adr); - // @@@@ RFHH need to return status + /* @@@@ RFHH need to return status */ void (*write) (urj_bus_t *bus, uint32_t adr, uint32_t data); int (*init) (urj_bus_t *bus); }; diff --git a/urjtag/include/urjtag/cable.h b/urjtag/include/urjtag/cable.h index 982a5f02..bf03f251 100644 --- a/urjtag/include/urjtag/cable.h +++ b/urjtag/include/urjtag/cable.h @@ -54,11 +54,11 @@ urj_cable_device_type_t; typedef enum URJ_CABLE_PARAM_KEY { - URJ_CABLE_PARAM_KEY_PID, // lu generic_usbconn - URJ_CABLE_PARAM_KEY_VID, // lu generic_usbconn - URJ_CABLE_PARAM_KEY_DESC, // string generic_usbconn - URJ_CABLE_PARAM_KEY_DRIVER, // string generic_usbconn - URJ_CABLE_PARAM_KEY_BITMAP, // string wiggler + URJ_CABLE_PARAM_KEY_PID, /* lu generic_usbconn */ + URJ_CABLE_PARAM_KEY_VID, /* lu generic_usbconn */ + URJ_CABLE_PARAM_KEY_DESC, /* string generic_usbconn */ + URJ_CABLE_PARAM_KEY_DRIVER, /* string generic_usbconn */ + URJ_CABLE_PARAM_KEY_BITMAP, /* string wiggler */ } urj_cable_param_key_t; diff --git a/urjtag/include/urjtag/gettext.h b/urjtag/include/urjtag/gettext.h index 6ca116a4..1ff52c33 100644 --- a/urjtag/include/urjtag/gettext.h +++ b/urjtag/include/urjtag/gettext.h @@ -16,7 +16,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -// @@@@ RFHH this has better be an internal include file +/* @@@@ RFHH this has better be an internal include file */ #ifndef _LIBGETTEXT_H #define _LIBGETTEXT_H 1 diff --git a/urjtag/include/urjtag/pod.h b/urjtag/include/urjtag/pod.h index 00868e42..eda3f73d 100644 --- a/urjtag/include/urjtag/pod.h +++ b/urjtag/include/urjtag/pod.h @@ -26,15 +26,15 @@ typedef enum urj_pod_sigsel { - URJ_POD_CS_NONE = 0, // no/invalid signal - URJ_POD_CS_TDI = (1 << 0), // out: JTAG/SPI data in - URJ_POD_CS_TCK = (1 << 1), // out: JTAG/SPI clock - URJ_POD_CS_TMS = (1 << 2), // out: JTAG test mode select/SPI slave select - URJ_POD_CS_TRST = (1 << 3), // out: JTAG TAP reset - URJ_POD_CS_RESET = (1 << 4), // out: system reset - URJ_POD_CS_SCK = (1 << 5), // out: I2C clock (not yet used) - URJ_POD_CS_SDA = (1 << 6), // inout: I2C data (not yet used) - URJ_POD_CS_SS = (1 << 7), // out: SPI slave select (not yet used) + URJ_POD_CS_NONE = 0, /* no/invalid signal */ + URJ_POD_CS_TDI = (1 << 0), /* out: JTAG/SPI data in */ + URJ_POD_CS_TCK = (1 << 1), /* out: JTAG/SPI clock */ + URJ_POD_CS_TMS = (1 << 2), /* out: JTAG test mode select/SPI slave select */ + URJ_POD_CS_TRST = (1 << 3), /* out: JTAG TAP reset */ + URJ_POD_CS_RESET = (1 << 4), /* out: system reset */ + URJ_POD_CS_SCK = (1 << 5), /* out: I2C clock (not yet used) */ + URJ_POD_CS_SDA = (1 << 6), /* inout: I2C data (not yet used) */ + URJ_POD_CS_SS = (1 << 7), /* out: SPI slave select (not yet used) */ } urj_pod_sigsel_t;