Make #include guard naming consistent

[openocd] / src / pld / xilinx_bit.h

diff --git a/src/pld/xilinx_bit.h b/src/pld/xilinx_bit.h
index 505957ab8ae9120d64acb7333a98c0659289ae66..1a35c3be225df9453ee2802349fe732a34bf59ca 100644 (file)
--- a/src/pld/xilinx_bit.h
+++ b/src/pld/xilinx_bit.h
@@ -13,26 +13,22 @@
  *   GNU General Public License for more details.                          *
  *                                                                         *
  *   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.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
-#ifndef XILINX_BIT_H
-#define XILINX_BIT_H
 
-#include "types.h"
+#ifndef OPENOCD_PLD_XILINX_BIT_H
+#define OPENOCD_PLD_XILINX_BIT_H
 
-typedef struct xilinx_bit_file_s
-{
-       u8 unknown_header[13];
-       u8 *source_file;
-       u8 *part_name;
-       u8 *date;
-       u8 *time;
-       u32 length;
-       u8 *data;
-} xilinx_bit_file_t;
+struct xilinx_bit_file {
+       uint8_t unknown_header[13];
+       uint8_t *source_file;
+       uint8_t *part_name;
+       uint8_t *date;
+       uint8_t *time;
+       uint32_t length;
+       uint8_t *data;
+};
 
-int xilinx_read_bit_file(xilinx_bit_file_t *bit_file, char *filename);
+int xilinx_read_bit_file(struct xilinx_bit_file *bit_file, const char *filename);
 
-#endif /* XILINX_BIT_H */
+#endif /* OPENOCD_PLD_XILINX_BIT_H */