@@ -35,7 +35,6 @@ def __init__(self, pins,
3535 with_cdc = True ,
3636 with_microsoft_os_1_0 = False , # Set to True for interface 0,
3737 # or pass a list() of interfaces
38- force_contiguous_blockram = False ,
3938 bufferize_ep_in = True ,
4039 custom_ep = [],
4140 ** kwargs ):
@@ -65,7 +64,6 @@ def __init__(self, pins,
6564 self .control_ep_handlers = []
6665 self .with_cdc = with_cdc
6766 self .with_microsoft_os_1_0 = with_microsoft_os_1_0
68- self .force_contiguous_blockram = force_contiguous_blockram
6967 self .bufferize_ep_in = bufferize_ep_in
7068
7169 self .kwargs = kwargs
@@ -122,17 +120,6 @@ def create_descriptors(self):
122120
123121 def add_microsoft_os_1_0 (self , descriptors ):
124122 """ Add Microsoft OS 1.0 descriptors for Windows compatibility. """
125-
126- if self .force_contiguous_blockram :
127- # This is a workaround for LUNA GetDescriptorHandlerBlock
128- # that only supports contiguous indexes for its ROM layout.
129- # We create fake descriptors as padding, to force BSRAM allocation
130- # for designs where building a non contiguous descriptor in
131- # LUTRAM is not an option (too many resources wasted)
132- # but we can spare some more BSRAM blocks.
133- while descriptors ._next_string_index != 0xee :
134- descriptors .get_index_for_string (str (descriptors ._next_string_index ))
135-
136123 descriptors .add_descriptor (get_string_descriptor ("MSFT100\xee " ), index = 0xee )
137124
138125 msft_descriptors = MicrosoftOS10DescriptorCollection ()
@@ -178,7 +165,7 @@ def elaborate(self, platform):
178165 descriptors ,
179166 # Windows compatible descriptors cannot be build in block ram
180167 # because MSFT string at index 0xee is not contiguous.
181- avoid_blockram = self . with_microsoft_os_1_0 and not self . force_contiguous_blockram ,
168+ avoid_blockram = False ,
182169 )
183170
184171 # Add optional custom requests handlers (vendor)
0 commit comments