mirror of https://github.com/ARMmbed/mbed-os.git
				
				
				
			fix merge conflixt
							parent
							
								
									c9f8ca46ff
								
							
						
					
					
						commit
						16bb7e5f04
					
				| 
						 | 
					@ -223,11 +223,6 @@ void CordioHCIDriver::handle_reset_sequence(uint8_t *pMsg)
 | 
				
			||||||
            }   break;
 | 
					            }   break;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            case HCI_OPCODE_LE_WRITE_DEF_DATA_LEN:
 | 
					            case HCI_OPCODE_LE_WRITE_DEF_DATA_LEN:
 | 
				
			||||||
                /* send next command in sequence */
 | 
					 | 
				
			||||||
                HciReadLocalVerInfoCmd();
 | 
					 | 
				
			||||||
                break;
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
            case HCI_OPCODE_READ_LOCAL_VER_INFO:
 | 
					 | 
				
			||||||
                if (hciCoreCb.extResetSeq) {
 | 
					                if (hciCoreCb.extResetSeq) {
 | 
				
			||||||
                    /* send first extended command */
 | 
					                    /* send first extended command */
 | 
				
			||||||
                    HciReadLocalVerInfoCmd();
 | 
					                    HciReadLocalVerInfoCmd();
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue