diff --git a/avr/comproto_device.asm b/avr/comproto_device.asm
index d2d4afd..5d905d3 100644
--- a/avr/comproto_device.asm
+++ b/avr/comproto_device.asm
@@ -21,46 +21,32 @@
 ;
 ; IN:
 ; - R16: destination address
+; - X  : buffer to write to
 ; OUT:
-; - CFLAG: set if okay, clear otherwise
-; MODIFIED REGS: R6, R16, R17, R18, R20 (R3, R4, R15, R19, R21, X)
-
-CPRO_EnqueueDevice:
-  mov r6, r16
-
-  rcall COM_AllocBufferAndGetXY ; (r16, r17, r21)
-  brcc CPRO_EnqueueDevice_error
+; - nothing
+; REGS: R3, R4, R16, R17, R18, X (R19, R20, R21)
 
+CPRO_WriteDevice:
+  ldi r17, COM2_PAYLOAD_FLAGS_UID | (6<<COM2_PAYLOAD_FLAGS_SHIFT_NUM)
+  ldi r18, CPRO_CMD_DEVICE
   push xh
     push xl
-      mov r16, r6
-      ldi r17, CPRO_PAYLOAD_FLAGS_UID | (6<<CPRO_PAYLOAD_FLAGS_SHIFT_NUM)
-      ldi r18, CPRO_CMD_DEVICE
-      rcall cproBeginMsgWithVariablePayload  ; (R3, R4, R16, R17, R18, R19, R20, R21, X)
-      ldi r17, LOW(FW_TYPE)
+      rcall COM2_BeginMsgWithVariablePayload    ; (R3, R4, R16, R17, R18, R19, R20, R21, X)
+      lds r17, firmwareType
       st X+, r17                             ; 6: firmware type low
-      ldi r17, HIGH(FW_TYPE)
+      lds r17, firmwareType+1
       st X+, r17                             ; 7: firmware type high
-      ldi r17, FW_MAIN_VERSION_LOW
+      lds r17, firmwareVersion
       st X+, r17                             ; 8: version low
-      ldi r17, FW_MAIN_VERSION_HIGH
+      lds r17, firmwareVersion+1
       st X+, r17                             ; 9: version high
-      ldi r17, LOW(MODULES_MASK)
+      lds r17, firmwareModules
       st X+, r17                             ; 10: modules mask low
-      ldi r17, HIGH(MODULES_MASK)
+      lds r17, firmwareModules+1
       st X+, r17                             ; 11: modules mask low
     pop xl
   pop xh
-  rcall comCalcAndAddChecksumByte            ; (R16, R17, R18, R19, X)
-
-  ; mark buffer as enqueued with PRIO "normal" (slightly limited number of retries)
-  ldi r20, COM_BUFFER_PRIO_NORMAL
-  rcall COM_EnqueuePacket      ; (R15, R16)
-  brcc CPRO_EnqueueDevice_error
-  sec
-  ret
-CPRO_EnqueueDevice_error:
-  clc
+  rcall com2CalcAndAddChecksumByte             ; (R16, R17, R18, R19, X)
   ret