ports/rp2: Clean up some unused vestigial code

nickovs · nickovs · commit 2ff81f0759a3 · 2021-08-11T21:27:34.000-06:00
diff --git a/ports/rp2/rp2_dma.c b/ports/rp2/rp2_dma.c
@@ -101,18 +101,6 @@ STATIC uint32_t rp2_dma_register_value_from_obj(mp_obj_t o, int reg_type) {
         }
     }
 
-    if (mp_obj_is_type(o, &rp2_state_machine_type)) {
-        if (reg_type == REG_TYPE_ADDR_READ) {
-            // Return the address of the RX fifo
-            return 0; // FIX ME
-        } else if (reg_type == REG_TYPE_ADDR_WRITE) {
-            // Return the address of the TX fifo
-            return 0; // FIX ME
-        } else {
-            mp_raise_ValueError(MP_ERROR_TEXT("StateMachine only allowed for addresses"));
-        }
-    }
-
     // DMAConfigs can cast as integers; we don't want them as counts or addresses
     if (reg_type != REG_TYPE_CONF && mp_obj_is_type(o, &rp2_dma_config_type)) {
         mp_raise_ValueError(MP_ERROR_TEXT("DMAConfig only allowed for config"));
@@ -327,8 +315,6 @@ STATIC void rp2_dma_attr(mp_obj_t self_in, qstr attr_in, mp_obj_t *dest) {
             rp2_dma_error_if_closed(self);
             uint32_t busy = dma_channel_is_busy(self->channel);
             dest[0] = mp_obj_new_bool((mp_int_t)busy);
-        } else if (attr_in == MP_QSTR_reg_addr) {
-            dest[0] = mp_obj_new_int_from_uint((mp_uint_t)reg_block);
         } else if (attr_in == MP_QSTR_default_config) {
             // Get the default config for _this_ channel, i.e. with chaining disabled.
             rp2_dma_config_obj_t *conf = m_new_obj(rp2_dma_config_obj_t);
@@ -358,7 +344,7 @@ STATIC void rp2_dma_attr(mp_obj_t self_in, qstr attr_in, mp_obj_t *dest) {
             reg_view->items = dma_channel_hw_addr(self->channel);
             dest[0] = reg_view;
         } else {
-            // If Micropython classes support attributes then the locals dict is not searched.
+            // If a Micropython class supports attributes then the locals dict is not searched.
             // We do it manually here.
             mp_map_t *locals_map = (mp_map_t *)&rp2_dma_locals_dict.map;
             mp_map_elem_t *elem = mp_map_lookup(locals_map, MP_OBJ_NEW_QSTR(attr_in), MP_MAP_LOOKUP);
@@ -424,7 +410,7 @@ STATIC mp_obj_t rp2_dma_setup(size_t n_args, const mp_obj_t *pos_args, mp_map_t
         { MP_QSTR_read,         MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
         { MP_QSTR_write,        MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
         { MP_QSTR_count,        MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
-        { MP_QSTR_config,         MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
+        { MP_QSTR_config,       MP_ARG_KW_ONLY | MP_ARG_OBJ, {.u_obj = MP_OBJ_NULL} },
         { MP_QSTR_trigger,      MP_ARG_KW_ONLY | MP_ARG_BOOL, {.u_bool = false} },
     };
 
