X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvpp-api%2Fvapi%2Fvapi_c_gen.py;h=4b7da6a1f15b0612a5ca1d75d88df4f80eadf339;hb=2de1f15;hp=ef6e2663cf4061f30fa528185e461b89b434e522;hpb=dc15be2ca7c51772b00e4c5548934a35aa7e4add;p=vpp.git diff --git a/src/vpp-api/vapi/vapi_c_gen.py b/src/vpp-api/vapi/vapi_c_gen.py index ef6e2663cf4..4b7da6a1f15 100755 --- a/src/vpp-api/vapi/vapi_c_gen.py +++ b/src/vpp-api/vapi/vapi_c_gen.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3 +#!/usr/bin/env python2 import argparse import os @@ -15,7 +15,8 @@ class CField(Field): field_type, array_len=None, nelem_field=None): - super().__init__(field_name, field_type, array_len, nelem_field) + super(CField, self).__init__( + field_name, field_type, array_len, nelem_field) def get_c_def(self): if self.len is not None: @@ -67,7 +68,7 @@ class CField(Field): class CStruct(Struct): def __init__(self, name, fields): - super().__init__(name, fields) + super(CStruct, self).__init__(name, fields) def get_c_def(self): return "\n".join([ @@ -92,7 +93,7 @@ class CSimpleType (SimpleType): } def __init__(self, name): - super().__init__(name) + super(CSimpleType, self).__init__(name) def get_c_name(self): return self.name @@ -122,7 +123,7 @@ class CSimpleType (SimpleType): class CStructType (StructType, CStruct): def __init__(self, definition, typedict, field_class): - super().__init__(definition, typedict, field_class) + super(CStructType, self).__init__(definition, typedict, field_class) def get_c_name(self): return "vapi_type_%s" % self.name @@ -173,8 +174,9 @@ class CStructType (StructType, CStruct): class CMessage (Message): def __init__(self, logger, definition, typedict, struct_type_class, simple_type_class, field_class): - super().__init__(logger, definition, typedict, struct_type_class, - simple_type_class, field_class) + super(CMessage, self).__init__(logger, definition, typedict, + struct_type_class, simple_type_class, + field_class) self.payload_members = [ " %s" % p.get_c_def() for p in self.fields @@ -502,11 +504,11 @@ class CMessage (Message): ' offsetof(%s, context),' % self.header.get_c_name() if has_context else ' 0,', (' offsetof(%s, payload),' % self.get_c_name()) - if self.has_payload() else ' ~0,', + if self.has_payload() else ' INVALID_MSG_ID,', ' sizeof(%s),' % self.get_c_name(), ' (generic_swap_fn_t)%s,' % self.get_swap_to_be_func_name(), ' (generic_swap_fn_t)%s,' % self.get_swap_to_host_func_name(), - ' ~0,', + ' INVALID_MSG_ID,', ' };', '', ' %s = vapi_register_msg(&%s);' %