X-Git-Url: http://developer.intra2net.com/git/?a=blobdiff_plain;f=ftdipp%2Fftdi.cpp;h=5e45dce3fd71a9f76d03c365ee25a5cc0507bd99;hb=2d790e377ad5f1c61b38436aa3d5a201c9184028;hp=de0735d7421bc2d6773f8f5685ced476a1eb3ae4;hpb=1bc78a0512f5909dcbe974a901f6ccd94c2a974b;p=libftdi

diff --git a/ftdipp/ftdi.cpp b/ftdipp/ftdi.cpp
index de0735d..5e45dce 100644
--- a/ftdipp/ftdi.cpp
+++ b/ftdipp/ftdi.cpp
@@ -27,6 +27,7 @@ This exception does not invalidate any other reasons why a work based
 on this file might be covered by the GNU General Public License.
 */
 #include "ftdi.hpp"
+#include "ftdi_i.h"
 #include "ftdi.h"
 
 namespace Ftdi
@@ -271,16 +272,6 @@ int Context::set_error_char(unsigned char errorch, unsigned char enable)
     return ftdi_set_error_char(d->ftdi, errorch, enable);
 }
 
-int Context::bitbang_enable(unsigned char bitmask)
-{
-    return ftdi_set_bitmode(d->ftdi, bitmask, BITMODE_BITBANG);
-}
-
-int Context::bitbang_disable()
-{
-    return ftdi_disable_bitbang(d->ftdi);
-}
-
 int Context::set_bitmode(unsigned char bitmask, unsigned char mode)
 {
     return ftdi_set_bitmode(d->ftdi, bitmask, mode);
@@ -291,6 +282,11 @@ int Context::set_bitmode(unsigned char bitmask, enum ftdi_mpsse_mode mode)
     return ftdi_set_bitmode(d->ftdi, bitmask, mode);
 }
 
+int Context::bitbang_disable()
+{
+    return ftdi_disable_bitbang(d->ftdi);
+}
+
 int Context::read_pins(unsigned char *pins)
 {
     return ftdi_read_pins(d->ftdi, pins);
@@ -393,14 +389,9 @@ Eeprom::~Eeprom()
 {
 }
 
-void Eeprom::init_defaults()
-{
-    return ftdi_eeprom_initdefaults(d->context);
-}
-
-void Eeprom::set_size(int size)
+int Eeprom::init_defaults(char* manufacturer, char *product, char * serial)
 {
-    return ftdi_eeprom_setsize(d->context, &d->eeprom, size);
+    return ftdi_eeprom_initdefaults(d->context, manufacturer, product, serial);
 }
 
 int Eeprom::chip_id(unsigned int *chipid)
@@ -410,17 +401,17 @@ int Eeprom::chip_id(unsigned int *chipid)
 
 int Eeprom::build(unsigned char *output)
 {
-    return ftdi_eeprom_build(d->context, output);
+    return ftdi_eeprom_build(d->context);
 }
 
 int Eeprom::read(unsigned char *eeprom)
 {
-    return ftdi_read_eeprom(d->context, eeprom);
+    return ftdi_read_eeprom(d->context);
 }
 
 int Eeprom::write(unsigned char *eeprom)
 {
-    return ftdi_write_eeprom(d->context, eeprom);
+    return ftdi_write_eeprom(d->context);
 }
 
 int Eeprom::read_location(int eeprom_addr, unsigned short *eeprom_val)